aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ \ \ \ \
* | | | | | | remove blugrid schema until somebody cares to fix itMario Vavti2017-08-012-543/+0
| |_|_|/ / / |/| | | | |
* | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-08-015-29/+31
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-318-31/+26
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| |
| * | | | typozotlabs2017-07-301-1/+1
| | | | |
| * | | | modify connection edit display for channels with no address/webbiezotlabs2017-07-304-15/+18
| | | | |
| * | | | ensure we can work around the $is_http var in include/follow - this is left ↵zotlabs2017-07-301-14/+13
| | | | | | | | | | | | | | | | | | | | over from when the only non-webfinger connections we could make were RSS/Atom feeds.
* | | | | correct the logic for configs in app requirementgit-marijus2017-08-012-7/+26
| |/ / / |/| | |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-08-017-31/+25
|\ \ \ \ | | |/ / | |/| |
| * | | improve file_activity() a littlegit-marijus2017-07-313-29/+9
| | | |
| * | | db update to add index for item.obj_typegit-marijus2017-07-314-2/+16
| |/ /
* / / less badge more iconMario Vavti2017-08-011-0/+1
|/ /
* | Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-312-3/+16
|\ \
| * | provide a better "is_commentable" default for OStatus conversations that ↵zotlabs2017-07-301-1/+12
| | | | | | | | | | | | were fetched on the fly
| * | add options flag to bb_to_markdown so we can distinguish between diaspora ↵zotlabs2017-07-301-2/+4
| | | | | | | | | | | | | | | | | | use and other use and therefore filter and adjust content selectively
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-298-21/+40
| |\ \
* | | | disable file notifications on initial upload for now - it can behave funky ↵git-marijus2017-07-312-4/+4
| | | | | | | | | | | | | | | | when uploading multiple small files at once
* | | | implement system configs as app requirement and add the pubstream appgit-marijus2017-07-312-4/+16
| | | |
* | | | fix a bug where if multiple channels uploaded the same file to the same ↵git-marijus2017-07-301-2/+4
| | | | | | | | | | | | | | | | folder, the uploaded file would end up with an incremental number added to the filename for each upload even if the file did not exist yet in the channels folder
* | | | ltrim $display_path in attach_store() to be consistent with attach_mkdir() ↵git-marijus2017-07-302-2/+4
| | | | | | | | | | | | | | | | and go to created folder after successfully creating one
* | | | another syntax errorgit-marijus2017-07-301-1/+1
| | | |
* | | | do not include ACTIVITY_OBJ_FILE obj_type in the ping/something querygit-marijus2017-07-301-2/+5
| | | |
* | | | no need for jquery heregit-marijus2017-07-302-2/+8
| | | |