aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\|
| * more nav_set_selected appsgit-marijus2017-07-216-6/+9
| * provide a mechanism to mark apps active in the bingit-marijus2017-07-2113-29/+26
* | begin the tedious process of mapping activities between AS1, zot, and AS2zotlabs2017-07-201-0/+49
* | allow wildcard tag searches in search module alsozotlabs2017-07-201-2/+3
* | allow wildcard tag and category searcheszotlabs2017-07-203-6/+15
|/
* more css fixesgit-marijus2017-07-201-6/+6
* css fixgit-marijus2017-07-201-1/+1
* implement update_feed_itemzotlabs2017-07-191-3/+12
* hubzilla issue #832zotlabs2017-07-194-3/+8
* provide optional salmon signatures for AP entitieszotlabs2017-07-182-5/+18
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-1812-157/+130
|\
| * some fixes for the bs-default schemagit-marijus2017-07-182-15/+12
| * Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-183-12/+149
| |\
| * | issue #827 provide backward compatibility for album links generated in earlie...git-marijus2017-07-182-1/+10
| * | some love for the installergit-marijus2017-07-178-139/+116
* | | ability to use a portion of the message-id to display a message wasn't honour...zotlabs2017-07-181-2/+2
* | | related to hubzilla issue #831 - system.last_expire_day was not being set cor...zotlabs2017-07-181-1/+1
* | | some corrections to AS encoding based on the current spec (some of this work ...zotlabs2017-07-171-7/+22