| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-07-30 | 1 | -1/+1 |
|\ |
|
| * | missing quotes on string in network update_unseen | zotlabs | 2017-07-29 | 1 | -1/+1 |
* | | implement file notification on initial upload and rename get_parent_cloudpath... | git-marijus | 2017-07-29 | 5 | -19/+26 |
* | | close the apps-menu if the notifications-menu is open and vice versa | git-marijus | 2017-07-29 | 3 | -2/+14 |
|/ |
|
* | make pubs notification available on small screens | git-marijus | 2017-07-29 | 1 | -2/+2 |
* | provide public stream notification also for not authenticated viewers | git-marijus | 2017-07-29 | 2 | -3/+8 |
* | switch back to filter by ACTIVITY_OBJ_FILE for marking items read in /network... | git-marijus | 2017-07-29 | 1 | -2/+2 |
* | fix notifications - item_notshown is set for likes, etc. | zotlabs | 2017-07-29 | 1 | -2/+3 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-28 | 11 | -17/+110 |
|\ |
|
| * | filter by item_notshown instead of obj_type | git-marijus | 2017-07-28 | 2 | -5/+4 |
| * | do not show obj_type ACTIVITY_OBJ_FILE under activity notifications and do no... | git-marijus | 2017-07-28 | 2 | -3/+6 |
| * | initial notifications support for new shared files and new (since initial sit... | git-marijus | 2017-07-28 | 9 | -11/+102 |
| * | version 2.7 | git-marijus | 2017-07-28 | 1 | -1/+1 |
| * | default to static updates if not local channel | git-marijus | 2017-07-27 | 2 | -2/+2 |
| * | remove borders from navbar toggler | git-marijus | 2017-07-27 | 1 | -1/+1 |
| * | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-07-27 | 12 | -220/+512 |
| |\ |
|
* | | | 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 used... | git-marijus | 2017-07-25 | 2 | -14/+14 |
| * | 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 if... | git-marijus | 2017-07-22 | 2 | -2/+4 |
| * | 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 |