aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * do not show channel manager and nav channel select if we are in a delegate ↵git-marijus2017-08-101-4/+8
| | | | | | | | | | | | session
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devgit-marijus2017-08-109-20/+22
| | |\
| | * | update changeloggit-marijus2017-08-091-0/+1
| | | |
| * | | create cdav principal also on client access and remove redundant pconfig ↵Mario Vavti2017-08-102-6/+12
| | |/ | |/| | | | | | | check in authentication process
| * | merge red/master into devMario Vavti2017-08-109-20/+22
| |/
| * App::get_channel() does not return the right channel if we are not looking ↵git-marijus2017-08-091-7/+1
| | | | | | | | at our own channel. fix issue #841
* | include the mastodon summary in the postzotlabs2017-08-101-2/+2
| |
* | when following, allow [network]follow_address syntax to connect with a ↵zotlabs2017-08-102-7/+20
| | | | | | | | specific network for multi-protocol services
* | some doco fixes and other real minor stuff to improve logreading abilityzotlabs2017-08-095-14/+15
| |
* | libxml errorszotlabs2017-08-094-6/+7
|/
* only show upload button to those with write_storage permissionzotlabs2017-08-082-0/+3
|
* support upload of files and attachments into comments. This has some ↵zotlabs2017-08-085-0/+49
| | | | repercussions when it comes to post permissions since the commenter will not know the distribution of the post. Basically the files will be uploaded with the commenter's default ACL. Most of the time this will do the right thing.
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-081-1/+95
|\
| * changeloggit-marijus2017-08-081-1/+95
| |
* | remove some no longer used images/iconszotlabs2017-08-0711-0/+0
|/
* ostatus feed was missing commentszotlabs2017-08-062-9/+5
|
* Merge pull request #838 from phellmes/devgit-marijus2017-08-062-2361/+2411
|\ | | | | Update DE translation strings (also for 2.6RC)
| * Update DE translation stringsphellmes2017-08-052-2361/+2411
| |
* | Merge pull request #839 from anaqreon/docogit-marijus2017-08-062-0/+9
|\ \ | | | | | | Fix CSS for help page content list in sidebar.
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into docoAndrew Manning2017-08-0520-52/+81
| |\|
| * | Fix CSS for help page content list in sidebar.www-data2017-08-032-0/+9
| | |
* | | make config requirements in apps more universal - provide key and valuegit-marijus2017-08-062-8/+6
| | |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devgit-marijus2017-08-065-0/+198
|\ \ \
| * | | allow channel address to be changedzotlabs2017-08-044-0/+195
| | | |
| * | | auto preview mail on media insertion alsozotlabs2017-08-031-0/+3
| | |/ | |/|
* / | consolidate disable_discover_tab config if it was not yet set to either 1 or ↵git-marijus2017-08-067-12/+15
|/ / | | | | | | 0 in DB
* | Merge remote-tracking branch 'mike/master' into devgit-marijus2017-08-0315-22/+52
|\ \
| * | some bb-to-markdown issueszotlabs2017-08-031-5/+2
| | |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-022-2291/+2341
| |\|
| * | minor activitypub rendering stuffzotlabs2017-08-022-2/+2
| | |
| * | plugin hook for update_unseenzotlabs2017-08-015-13/+38
| | |
| * | add auto post preview to 'select photo from albums'zotlabs2017-08-011-0/+1
| | |
| * | auto preview comments also on media/link addzotlabs2017-08-011-0/+1
| | |
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-019-7419/+6834
| |\ \
| * | | auto preview when inserting a media item or embed into a post. Since this ↵zotlabs2017-08-016-2/+8
| | | | | | | | | | | | | | | | unanticipated action could be alarming (some might think the post was actually submitted), also provide a visible preview indicator within the previewed content. Remove the css for the old striped background image which hasn't been available for previewed content for a year or two.
* | | | missing observer hashgit-marijus2017-08-031-1/+1
| | | |
* | | | fix issue #836 - missing opening form taggit-marijus2017-08-031-0/+1
| | | |
* | | | fix attachment upload for private mailgit-marijus2017-08-032-28/+26
| | | |
* | | | return preview also if we have no attachmentgit-marijus2017-08-031-1/+1
| |_|/ |/| |
* | | Merge pull request #834 from mjfriaza/devgit-marijus2017-08-022-2291/+2341
|\ \ \ | |_|/ |/| | Updated the Spanish translation
| * | Updated the Spanish translationManuel Jiménez Friaza2017-08-022-2291/+2341
| | |
* | | css fixgit-marijus2017-08-021-0/+1
| | |
* | | do not show pubs notifications for items with ACTIVITY_OBJ_FILE obj_typegit-marijus2017-08-011-1/+3
| | |
* | | finally fix recursive attachments permissionsgit-marijus2017-08-011-54/+79
| | |
* | | use small line-height only for larger screensgit-marijus2017-08-011-1/+1
| | |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-08-011-6813/+6724
|\ \ \
| * | | stringsMario Vavti2017-08-011-6813/+6724
| | | |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-08-012-7/+26
| |\ \ \
| * \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-08-011-0/+1
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2017-07-315-29/+31
| |\ \ \ \ \