Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-26 | 2 | -3/+3 |
|\ | |||||
| * | move the active app code to include/nav.php - it is only relevant there | git-marijus | 2017-07-26 | 2 | -3/+3 |
| | | |||||
* | | issue with OStatus comments being propagated downstream | zotlabs | 2017-07-26 | 1 | -0/+15 |
| | | |||||
* | | remove activitypub components from core | zotlabs | 2017-07-26 | 1 | -182/+0 |
| | | |||||
* | | more work on signature algorithm choice | zotlabs | 2017-07-26 | 1 | -12/+16 |
| | | |||||
* | | improve the formatting of shares when converting from bbcode to markdown | zotlabs | 2017-07-26 | 1 | -0/+69 |
| | | |||||
* | | start to implement the code needed for verifying variable signature algorithms | zotlabs | 2017-07-25 | 1 | -15/+31 |
| | | |||||
* | | consolidate duplicated code | zotlabs | 2017-07-25 | 1 | -208/+59 |
| | | |||||
* | | sync key changes to clones | zotlabs | 2017-07-25 | 2 | -6/+111 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-25 | 21 | -46/+61 |
|\| | |||||
| * | version 2.5.10 | git-marijus | 2017-07-25 | 1 | -1/+1 |
| | | |||||
| * | make local channel (not our own) nav menus appear similar to what we are ↵ | git-marijus | 2017-07-25 | 2 | -14/+14 |
| | | | | | | | | used from remote channels | ||||
| * | add text-dark class to cat tagsinput | git-marijus | 2017-07-22 | 1 | -1/+1 |
| | | |||||
| * | show the right conversation active and do not show any conversation active ↵ | git-marijus | 2017-07-22 | 2 | -2/+4 |
| | | | | | | | | if we compose a new one | ||||
| * | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-07-22 | 5 | -8/+67 |
| |\ | |||||
| * | | indicate the selected channel in the dropdown menu and minor css fixes | git-marijus | 2017-07-22 | 3 | -16/+4 |
| | | | |||||
| * | | more nav_set_selected | git-marijus | 2017-07-22 | 14 | -12/+37 |
| | | | |||||
* | | | make signing methods variable and signable | zotlabs | 2017-07-25 | 3 | -2/+13 |
| | | | |||||
* | | | new field names did not get saved | zotlabs | 2017-07-24 | 1 | -2/+2 |
| | | | |||||
* | | | provide a keychange operation to rebase an identity on a new keypair | zotlabs | 2017-07-24 | 7 | -2/+405 |
| | | | |||||
* | | | suppress fopen errors from dav | zotlabs | 2017-07-23 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-21 | 19 | -35/+35 |
|\| | |||||
| * | more nav_set_selected apps | git-marijus | 2017-07-21 | 6 | -6/+9 |
| | | |||||
| * | provide a mechanism to mark apps active in the bin | git-marijus | 2017-07-21 | 13 | -29/+26 |
| | | |||||
* | | begin the tedious process of mapping activities between AS1, zot, and AS2 | zotlabs | 2017-07-20 | 1 | -0/+49 |
| | | |||||
* | | allow wildcard tag searches in search module also | zotlabs | 2017-07-20 | 1 | -2/+3 |
| | | |||||
* | | allow wildcard tag and category searches | zotlabs | 2017-07-20 | 3 | -6/+15 |
|/ | |||||
* | more css fixes | git-marijus | 2017-07-20 | 1 | -6/+6 |
| | |||||
* | css fix | git-marijus | 2017-07-20 | 1 | -1/+1 |
| | |||||
* | implement update_feed_item | zotlabs | 2017-07-19 | 1 | -3/+12 |
| | |||||
* | hubzilla issue #832 | zotlabs | 2017-07-19 | 4 | -3/+8 |
| | |||||
* | provide optional salmon signatures for AP entities | zotlabs | 2017-07-18 | 2 | -5/+18 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-18 | 12 | -157/+130 |
|\ | |||||
| * | some fixes for the bs-default schema | git-marijus | 2017-07-18 | 2 | -15/+12 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-07-18 | 3 | -12/+149 |
| |\ | |||||
| * | | issue #827 provide backward compatibility for album links generated in ↵ | git-marijus | 2017-07-18 | 2 | -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 installer | git-marijus | 2017-07-17 | 8 | -139/+116 |
| | | | |||||
* | | | ability to use a portion of the message-id to display a message wasn't ↵ | zotlabs | 2017-07-18 | 1 | -2/+2 |
| | | | | | | | | | | | | honoured in all cases. | ||||
* | | | related to hubzilla issue #831 - system.last_expire_day was not being set ↵ | zotlabs | 2017-07-18 | 1 | -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 ↵ | zotlabs | 2017-07-17 | 1 | -7/+22 |
| | | | | | | | | | | | | was completed long before the spec settled). | ||||
* | | | activitypub, cont. | zotlabs | 2017-07-17 | 3 | -15/+60 |
| | | | |||||
* | | | Merge branch 'bug827' | zotlabs | 2017-07-17 | 1 | -3/+4 |
|\ \ \ | |_|/ |/| | | |||||
| * | | fix typo | zotlabs | 2017-07-17 | 1 | -3/+4 |
| | | | |||||
* | | | provide content-type matching ability for activitypub | zotlabs | 2017-07-17 | 1 | -0/+38 |
|/ / | |||||
* | | fix for bug 827 to provide partial backward compatibility with album names ↵ | zotlabs | 2017-07-17 | 1 | -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 spec | zotlabs | 2017-07-17 | 1 | -12/+14 |
| | | |||||
* | | mis-attributed profile photo when Mastodon comment author has no profile photo | zotlabs | 2017-07-16 | 1 | -0/+11 |
| | | |||||
* | | initial activitystreams2 parser | zotlabs | 2017-07-16 | 1 | -0/+86 |
|/ | |||||
* | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-07-16 | 3 | -3/+22 |
|\ | |||||
| * | deal with mastodon privacy scopes - mark private and block commenting since ↵ | zotlabs | 2017-07-15 | 1 | -1/+20 |
| | | | | | | | | we refuse to send private activities through the public OStatus connector. |