aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-173-5/+12
|\
| * update notifications if a notification area remains openMario Vavti2017-10-181-0/+7
| * don't translate 'guest:' since it is part of a urlzotlabs2017-10-161-1/+1
| * ensure guests hve a unique (non-existent) url so that network discovery on re...zotlabs2017-10-161-1/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-161-1/+1
| |\
| * | mod_register - don't re-use the password, force them to type it in twice each...zotlabs2017-10-161-3/+3
| * | regression in zot site info after zot6 workzotlabs2017-10-161-4/+6
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-1613-33/+104
|\ \ \ | | |/ | |/|
| * | fix typos in commentFelix Wolfsteller2017-10-161-1/+1
| |/
| * documentation updates. I've been sitting on these for quite some time waiting...zotlabs2017-10-152-1/+13
| * was unable to make the modal login dialog work on the channel page with a cov...zotlabs2017-10-143-11/+44
| * template not hiddenzotlabs2017-10-131-1/+1
| * create an actual logout module instead of relying on internal variableszotlabs2017-10-122-5/+16
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-121-3/+19
| |\
| * | sort out the notification idszotlabs2017-10-124-15/+22
| * | typozotlabs2017-10-111-1/+2
| * | add local_channel as a comanche condition variablezotlabs2017-10-111-0/+4
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-1111-46/+76
| |\ \
| * | | the template is needed for the old-style notificationszotlabs2017-10-111-0/+3
* | | | regression in zot site info after zot6 workzotlabs2017-10-161-4/+6
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-121-3/+19
|\ \ \ \ | | |_|/ | |/| |
| * | | remove redundant classesMario Vavti2017-10-121-2/+2
| * | | missing login and register linksMario Vavti2017-10-121-1/+17
| | |/ | |/|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-1120-60/+200
|\| |
| * | z-index issue and some icons. rename notifications-btn-1 to notifications-btnMario Vavti2017-10-114-6/+10
| * | only show pubs notifications if discovery_tab != disabledMario Vavti2017-10-112-15/+19
| * | move affinity slider lower on screens < 767px to not collide with the page me...Mario Vavti2017-10-112-3/+13
| * | remove region nav entry in network.pdl - it is not neededMario Vavti2017-10-111-2/+0
| * | nav_set_selected() for apps and apporder. restrict apporder to local_channel(...Mario Vavti2017-10-112-19/+26
| * | bring nav pinned apps to navbar_defaultMario Vavti2017-10-112-1/+8
| |/
| * bring back some nav stuff (notifications) for alternate navbars; still some t...zotlabs2017-10-111-0/+40
| * for federated forums we need to keep track of what protocols are available to...zotlabs2017-10-101-0/+16
| * on failed auth due to unverified email, tell the person why and remind them t...zotlabs2017-10-101-2/+5
| * re-order the navbar preferences - 1. profile_uid, 2. local_channel, 3, site, ...zotlabs2017-10-101-2/+4
| * rename view/tpl/nav.tpl to navbar_default.tpl so that all navbar selection co...zotlabs2017-10-104-4/+4
| * re-implement single deliveryzotlabs2017-10-102-3/+29
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-1014-277/+83
| |\
| * | pdledit usability improvementszotlabs2017-10-102-3/+26
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-1019-332/+134
|\ \ \ | | |/ | |/|
| * | css fixesMario Vavti2017-10-103-4/+7
| * | versionMario Vavti2017-10-101-1/+1
| * | remove notifications code from nav and go live with new notificationsMario Vavti2017-10-106-212/+18
| * | remove left_align modeMario Vavti2017-10-105-24/+3
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-106-55/+51
| |\|
| | * more custom navbar workzotlabs2017-10-093-53/+40
| | * typozotlabs2017-10-091-1/+1
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-0929-69/+80
| | |\
| | * | purify user-supplied filenames in some cases. Probably not needed but it's th...zotlabs2017-10-093-2/+11
| * | | new notification fixesMario Vavti2017-10-103-42/+60
| | |/ | |/|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-0937-84/+436
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 13:38:36 +0000