aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\| |
| * | feed untranslated appnames to nav_set_selected() and query for the active app...Mario Vavti2017-10-0923-37/+39
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-0911-15/+356
| |\|
| | * ability to pin apps to the navbar when using named navbarszotlabs2017-10-084-2/+26
| | * check write_storage permission in /displayzotlabs2017-10-081-1/+1
| | * alternate navbar layoutszotlabs2017-10-087-12/+325
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-0810-39/+54
| | |\
| | * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-0857-60/+493
| | |\ \
| | * | | navbar controls now functionally hidden with too low z-index when cover_photo...zotlabs2017-10-071-0/+4
| * | | | new notification changes - use sticky_kit instead of position fixedMario Vavti2017-10-097-24/+37
| * | | | more new notifications fixesMario Vavti2017-10-094-30/+26
| | |_|/ | |/| |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-0810-39/+54
|\| | |
| * | | more fixesMario Vavti2017-10-083-3/+6
| * | | new notification fixesMario Vavti2017-10-088-38/+50
| | |/ | |/|
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-10-0868-80/+575
|\| |
| * | experimental new notifications - needs pconfig experimental_notif set to 1 fo...Mario Vavti2017-10-0851-23/+383
| * | pubstream single view fixesMario Vavti2017-10-071-3/+15
| * | provide single post view for pubstream and rewrite llink to point to /pubstre...Mario Vavti2017-10-072-24/+45
| * | fix filestorage spinnerMario Vavti2017-10-071-1/+1
| * | no need to move $modrated check upMario Vavti2017-10-062-3/+4