aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* atokens - we only need one permission columnzotlabs2017-02-073-6/+10
* move permcat initialisation to zlibzotlabs2017-02-072-45/+48
* provide a few system defined permcats; will require a permission editor page ...zotlabs2017-02-073-0/+23
* move permcat library functions to Zlibzotlabs2017-02-072-44/+71
* Merge branch 'abroles' into devzotlabs2017-02-075-8/+100
|\
| * more background work for permcat supportzotlabs2017-02-075-8/+100
* | nitszotlabs2017-02-071-2/+2
|/
* sort the appsMario Vavti2017-02-071-0/+2
* default to manual conversation updatesMario Vavti2017-02-072-2/+4
* update readme; probably not finished with this yet so feel free to make sugge...zotlabs2017-02-062-67/+29
* bring back view links for all notification types (esp: network, channel) for ...zotlabs2017-02-063-12/+7
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-062-2/+8
|\
| * also take care of the collapsed state appsMario Vavti2017-02-061-1/+7
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-02-062-284/+231
| |\
| * | only check for modeMario Vavti2017-02-061-1/+1
* | | don't add zid to app links if they're on this system and we're logged in alre...zotlabs2017-02-061-4/+10
| |/ |/|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-0644-413/+403
|\|
| * move icon stuff back to app_render() and send navapps through app_render()Mario Vavti2017-02-068-22/+22
| * fix wiki and chat .apdMario Vavti2017-02-062-2/+2
| * make sure we do not remove other categories on app un-featureMario Vavti2017-02-061-2/+2
| * minor fixesMario Vavti2017-02-062-6/+6
| * import system apps on initial loadMario Vavti2017-02-062-9/+7
| * update templatesMario Vavti2017-02-063-44/+51
| * add profile appMario Vavti2017-02-061-0/+6
| * remove profile appMario Vavti2017-02-061-6/+0
| * update appsMario Vavti2017-02-061-0/+6
| * update appsMario Vavti2017-02-0624-31/+56
| * parse icons in get_system_apps()Mario Vavti2017-02-061-0/+3
| * merge devMario Vavti2017-02-0610-59/+101
| |\
| * | allow featuring of apps in /apps and update some more apd filesMario Vavti2017-02-047-18/+13
| * | merge devMario Vavti2017-02-041-1996/+1965
| |\ \
| * | | update some apps and refine navapps.tplMario Vavti2017-02-0312-19/+45
| * | | check for app-icons in app_list() instead of app_render()Mario Vavti2017-02-034-6/+8
| * | | do not hide button - just gray it outMario Vavti2017-02-032-3/+3
| * | | hide notifications button if there are noneMario Vavti2017-02-032-1/+9
| * | | use openClose() for nav-loginMario Vavti2017-02-031-1/+1
| * | | Merge branch 'dev' into wip-app-binMario Vavti2017-02-0318-240/+75
| |\ \ \
| * | | | whitespace cleanupMario Vavti2017-02-021-172/+161
| * | | | provide separate collased menus for apps and notificationsMario Vavti2017-02-023-11/+26
| * | | | Merge branch 'dev' into wip-app-binMario Vavti2017-02-020-0/+0
| |\ \ \ \
| * | | | | use bootstrap dropdown for loginMario Vavti2017-02-025-52/+15
| * | | | | move channel manager up in the menuMario Vavti2017-02-022-7/+4
| * | | | | remove apps from usermenuMario Vavti2017-02-023-20/+23
| * | | | | do not use style in templateMario Vavti2017-02-022-7/+7
| * | | | | do not use data-toggle on the badge and use fixed with for iconsMario Vavti2017-02-021-11/+11
| * | | | | dropdown menus should be restricted in height in normal view but not in colla...Mario Vavti2017-02-022-3/+7
| * | | | | remove badge hover effectMario Vavti2017-02-021-11/+0
| * | | | | really fix badge positionsMario Vavti2017-02-022-5/+3
| * | | | | resolve merge conflictMario Vavti2017-02-0216-166/+161
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' into wip-app-binMario Vavti2017-02-011-0/+4
| |\ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 15:32:28 +0000