| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | regression in zot site info after zot6 work | zotlabs | 2017-10-16 | 1 | -4/+6 |
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-16 | 13 | -33/+104 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | fix typos in comment | Felix Wolfsteller | 2017-10-16 | 1 | -1/+1 |
| |/ / |
|
| * | | documentation updates. I've been sitting on these for quite some time waiting... | zotlabs | 2017-10-15 | 2 | -1/+13 |
| * | | was unable to make the modal login dialog work on the channel page with a cov... | zotlabs | 2017-10-14 | 3 | -11/+44 |
| * | | template not hidden | zotlabs | 2017-10-13 | 1 | -1/+1 |
| * | | create an actual logout module instead of relying on internal variables | zotlabs | 2017-10-12 | 2 | -5/+16 |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-12 | 1 | -3/+19 |
| |\ \ |
|
| * | | | sort out the notification ids | zotlabs | 2017-10-12 | 4 | -15/+22 |
| * | | | typo | zotlabs | 2017-10-11 | 1 | -1/+2 |
| * | | | add local_channel as a comanche condition variable | zotlabs | 2017-10-11 | 1 | -0/+4 |
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-11 | 11 | -46/+76 |
| |\ \ \ |
|
| * | | | | the template is needed for the old-style notifications | zotlabs | 2017-10-11 | 1 | -0/+3 |
* | | | | | regression in zot site info after zot6 work | zotlabs | 2017-10-16 | 1 | -4/+6 |
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-12 | 1 | -3/+19 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | remove redundant classes | Mario Vavti | 2017-10-12 | 1 | -2/+2 |
| * | | | | missing login and register links | Mario Vavti | 2017-10-12 | 1 | -1/+17 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-11 | 20 | -60/+200 |
|\| | | |
|
| * | | | z-index issue and some icons. rename notifications-btn-1 to notifications-btn | Mario Vavti | 2017-10-11 | 4 | -6/+10 |
| * | | | only show pubs notifications if discovery_tab != disabled | Mario Vavti | 2017-10-11 | 2 | -15/+19 |
| * | | | move affinity slider lower on screens < 767px to not collide with the page me... | Mario Vavti | 2017-10-11 | 2 | -3/+13 |
| * | | | remove region nav entry in network.pdl - it is not needed | Mario Vavti | 2017-10-11 | 1 | -2/+0 |
| * | | | nav_set_selected() for apps and apporder. restrict apporder to local_channel(... | Mario Vavti | 2017-10-11 | 2 | -19/+26 |
| * | | | bring nav pinned apps to navbar_default | Mario Vavti | 2017-10-11 | 2 | -1/+8 |
| |/ / |
|
| * | | bring back some nav stuff (notifications) for alternate navbars; still some t... | zotlabs | 2017-10-11 | 1 | -0/+40 |
| * | | for federated forums we need to keep track of what protocols are available to... | zotlabs | 2017-10-10 | 1 | -0/+16 |
| * | | on failed auth due to unverified email, tell the person why and remind them t... | zotlabs | 2017-10-10 | 1 | -2/+5 |
| * | | re-order the navbar preferences - 1. profile_uid, 2. local_channel, 3, site, ... | zotlabs | 2017-10-10 | 1 | -2/+4 |
| * | | rename view/tpl/nav.tpl to navbar_default.tpl so that all navbar selection co... | zotlabs | 2017-10-10 | 4 | -4/+4 |
| * | | re-implement single delivery | zotlabs | 2017-10-10 | 2 | -3/+29 |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-10 | 14 | -277/+83 |
| |\ \ |
|
| * | | | pdledit usability improvements | zotlabs | 2017-10-10 | 2 | -3/+26 |
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-10 | 19 | -332/+134 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | css fixes | Mario Vavti | 2017-10-10 | 3 | -4/+7 |
| * | | | version | Mario Vavti | 2017-10-10 | 1 | -1/+1 |
| * | | | remove notifications code from nav and go live with new notifications | Mario Vavti | 2017-10-10 | 6 | -212/+18 |
| * | | | remove left_align mode | Mario Vavti | 2017-10-10 | 5 | -24/+3 |
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-10 | 6 | -55/+51 |
| |\| | |
|
| | * | | more custom navbar work | zotlabs | 2017-10-09 | 3 | -53/+40 |
| | * | | typo | zotlabs | 2017-10-09 | 1 | -1/+1 |
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-09 | 29 | -69/+80 |
| | |\ \ |
|
| | * | | | purify user-supplied filenames in some cases. Probably not needed but it's th... | zotlabs | 2017-10-09 | 3 | -2/+11 |
| * | | | | new notification fixes | Mario Vavti | 2017-10-10 | 3 | -42/+60 |
| | |/ /
| |/| | |
|
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-10-09 | 37 | -84/+436 |
|\| | | |
|
| * | | | feed untranslated appnames to nav_set_selected() and query for the active app... | Mario Vavti | 2017-10-09 | 23 | -37/+39 |
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-10-09 | 11 | -15/+356 |
| |\| | |
|
| | * | | ability to pin apps to the navbar when using named navbars | zotlabs | 2017-10-08 | 4 | -2/+26 |
| | * | | check write_storage permission in /display | zotlabs | 2017-10-08 | 1 | -1/+1 |
| | * | | alternate navbar layouts | zotlabs | 2017-10-08 | 7 | -12/+325 |
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-10-08 | 10 | -39/+54 |
| | |\ \ |
|