aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
| |\ \
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-262-3/+3
|\| | | | |/ / |/| |
| * | move the active app code to include/nav.php - it is only relevant theregit-marijus2017-07-262-3/+3
* | | issue with OStatus comments being propagated downstreamzotlabs2017-07-261-0/+15
* | | remove activitypub components from corezotlabs2017-07-261-182/+0
* | | more work on signature algorithm choicezotlabs2017-07-261-12/+16
* | | improve the formatting of shares when converting from bbcode to markdownzotlabs2017-07-261-0/+69
* | | start to implement the code needed for verifying variable signature algorithmszotlabs2017-07-251-15/+31
* | | consolidate duplicated codezotlabs2017-07-251-208/+59
* | | sync key changes to cloneszotlabs2017-07-252-6/+111
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-2521-46/+61
|\| |
| * | version 2.5.10git-marijus2017-07-251-1/+1
| * | make local channel (not our own) nav menus appear similar to what we are used...git-marijus2017-07-252-14/+14
| * | add text-dark class to cat tagsinputgit-marijus2017-07-221-1/+1
| * | show the right conversation active and do not show any conversation active if...git-marijus2017-07-222-2/+4
| * | Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-225-8/+67
| |\ \
| * | | indicate the selected channel in the dropdown menu and minor css fixesgit-marijus2017-07-223-16/+4
| * | | more nav_set_selectedgit-marijus2017-07-2214-12/+37
* | | | make signing methods variable and signablezotlabs2017-07-253-2/+13
* | | | new field names did not get savedzotlabs2017-07-241-2/+2
* | | | provide a keychange operation to rebase an identity on a new keypairzotlabs2017-07-247-2/+405
* | | | suppress fopen errors from davzotlabs2017-07-231-1/+1
| |/ / |/| |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-2119-35/+35
|\| |