aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵git-marijus2017-07-252-14/+14
| | | | | | | | used from remote channels
| * add text-dark class to cat tagsinputgit-marijus2017-07-221-1/+1
| |
| * show the right conversation active and do not show any conversation active ↵git-marijus2017-07-222-2/+4
| | | | | | | | if we compose a new one
| * 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 ↵git-marijus2017-07-182-1/+10
| | | | | | | | | | | | earlier times before the ambiguity of photo album names was solved. This may provide incorrect results if two or more photo albums with the same basename exist in different directories of the file tree; but there is no easy way to solve that ambiguity - which is why the link format changed.
| * | 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 ↵zotlabs2017-07-181-2/+2
| | | | | | | | | | | | honoured in all cases.
* | | related to hubzilla issue #831 - system.last_expire_day was not being set ↵zotlabs2017-07-181-1/+1
| | | | | | | | | | | | correctly, causing cron_daily to run more frequently than desired.
* | | some corrections to AS encoding based on the current spec (some of this work ↵zotlabs2017-07-171-7/+22
| | | | | | | | | | | | was completed long before the spec settled).
* | | activitypub, cont.zotlabs2017-07-173-15/+60
| | |
* | | Merge branch 'bug827'zotlabs2017-07-171-3/+4
|\ \ \ | |_|/ |/| |
| * | fix typozotlabs2017-07-171-3/+4
| | |
* | | provide content-type matching ability for activitypubzotlabs2017-07-171-0/+38
|/ /
* | fix for bug 827 to provide partial backward compatibility with album names ↵zotlabs2017-07-171-0/+9
| | | | | | | | | | | | in photo items from < hubzilla 2.4 this will only work part of the time - which is why the behaviour was changed
* | activitystreams converters updated to recent speczotlabs2017-07-171-12/+14
| |
* | mis-attributed profile photo when Mastodon comment author has no profile photozotlabs2017-07-161-0/+11
| |
* | initial activitystreams2 parserzotlabs2017-07-161-0/+86
|/
* Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-163-3/+22
|\
| * deal with mastodon privacy scopes - mark private and block commenting since ↵zotlabs2017-07-151-1/+20
| | | | | | | | we refuse to send private activities through the public OStatus connector.