aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-121-3/+19
|\
| * remove redundant classesMario Vavti2017-10-121-2/+2
| * missing login and register linksMario Vavti2017-10-121-1/+17
* | sort out the notification idszotlabs2017-10-123-14/+20
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-118-12/+33
|\|
| * 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-111-0/+2
| * 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
| * bring nav pinned apps to navbar_defaultMario Vavti2017-10-112-1/+8
* | the template is needed for the old-style notificationszotlabs2017-10-111-0/+3
|/
* rename view/tpl/nav.tpl to navbar_default.tpl so that all navbar selection co...zotlabs2017-10-101-0/+0
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-1010-209/+67
|\
| * css fixesMario Vavti2017-10-103-4/+7
| * remove notifications code from nav and go live with new notificationsMario Vavti2017-10-103-145/+3
| * remove left_align modeMario Vavti2017-10-105-24/+3
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-103-53/+40
| |\
| * | new notification fixesMario Vavti2017-10-103-42/+60
* | | pdledit usability improvementszotlabs2017-10-101-0/+3
| |/ |/|
* | more custom navbar workzotlabs2017-10-093-53/+40
|/
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-095-3/+302
|\
| * ability to pin apps to the navbar when using named navbarszotlabs2017-10-082-0/+8
| * alternate navbar layoutszotlabs2017-10-083-3/+290
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-087-24/+39
| |\
| * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-0849-21/+229
| |\ \
| * | | 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-095-16/+19
* | | | more new notifications fixesMario Vavti2017-10-094-30/+26
| |_|/ |/| |
* | | more fixesMario Vavti2017-10-081-0/+3
* | | new notification fixesMario Vavti2017-10-086-24/+36
| |/ |/|
* | experimental new notifications - needs pconfig experimental_notif set to 1 fo...Mario Vavti2017-10-0848-17/+221
* | fix filestorage spinnerMario Vavti2017-10-071-1/+1
* | introduce public stream notificationsMario Vavti2017-10-061-3/+7
|/
* update some old spinners which were causing js issueszotlabs2017-10-055-14/+14
* Experimental alternate channel_menu navigation. To use, "util/config system.c...zotlabs2017-10-052-3/+15
* introduce shared files notificationsMario Vavti2017-10-042-8/+16
* bring back notifications for account approvalsMario Vavti2017-10-042-4/+15
* some basic work on mod commonMario Vavti2017-10-031-11/+13
* move common connections widget to left asideMario Vavti2017-10-032-28/+13
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-031-1/+2
|\
| * Hubzilla issue #866 allow navbar to be used when cover photo is displayed - a...zotlabs2017-10-021-1/+2
* | whitespaceMario Vavti2017-10-021-3/+3
* | wiki: show save button and commit input field in all tabs if there is unsaved...Mario Vavti2017-10-021-25/+37
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-013-22/+20
|\
| * Merge pull request #863 from mjfriaza/devgit-marijus2017-10-012-11/+11
| |\
| | * Fixed the Spanish translationManuel Jiménez Friaza2017-10-012-11/+11
| * | fix profile edit dropdown for multiple profilesMario Vavti2017-10-011-11/+9
* | | use imagick converter for large photoszotlabs2017-09-301-0/+1
|/ /
* | remove double remote login button and slightly change appearenceMario Vavti2017-09-282-2/+2
* | Merge pull request #860 from waitman/patch-2git-marijus2017-09-281-0/+1
|\ \