aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix CSS for help page content list in sidebar.www-data2017-08-032-0/+9
* Merge pull request #834 from mjfriaza/devgit-marijus2017-08-022-2291/+2341
|\
| * 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 o...zotlabs2017-07-301-14/+13
* | | | | 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 were...zotlabs2017-07-301-1/+12
| * | add options flag to bb_to_markdown so we can distinguish between diaspora use...zotlabs2017-07-301-2/+4
| * | 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 wh...git-marijus2017-07-312-4/+4
* | | | 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 folde...git-marijus2017-07-301-2/+4
* | | | ltrim $display_path in attach_store() to be consistent with attach_mkdir() an...git-marijus2017-07-302-2/+4
* | | | 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
* | | | Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-301-1/+1
|\| | | | |/ / |/| |
| * | missing quotes on string in network update_unseenzotlabs2017-07-291-1/+1
* | | implement file notification on initial upload and rename get_parent_cloudpath...git-marijus2017-07-295-19/+26
* | | close the apps-menu if the notifications-menu is open and vice versagit-marijus2017-07-293-2/+14
|/ /
* | make pubs notification available on small screensgit-marijus2017-07-291-2/+2
* | provide public stream notification also for not authenticated viewersgit-marijus2017-07-292-3/+8
* | switch back to filter by ACTIVITY_OBJ_FILE for marking items read in /network...git-marijus2017-07-291-2/+2
* | fix notifications - item_notshown is set for likes, etc.zotlabs2017-07-291-2/+3
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-2811-17/+110
|\ \
| * | filter by item_notshown instead of obj_typegit-marijus2017-07-282-5/+4
| * | do not show obj_type ACTIVITY_OBJ_FILE under activity notifications and do no...git-marijus2017-07-282-3/+6
| * | initial notifications support for new shared files and new (since initial sit...git-marijus2017-07-289-11/+102
| * | version 2.7git-marijus2017-07-281-1/+1
| * | default to static updates if not local channelgit-marijus2017-07-272-2/+2
| * | remove borders from navbar togglergit-marijus2017-07-271-1/+1
| * | Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-2712-220/+512
| |\ \