aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-083-5/+11
|\
| * better detection of when to show the feature button and document nav mode ↵Mario Vavti2017-02-081-1/+4
| | | | | | | | for app_render()
| * do not show feature button if the app is shared. css fixesMario Vavti2017-02-083-5/+8
| |
* | fix immediate issue with multiple login forms until I can figure out an ↵zotlabs2017-02-083-10/+4
|/ | | | elegant way to "popup" the modal login form already on the page. We still may need this fix for the actual login module which should always be callable and present a login form even if the nav is completely borked.
* open permission tab by default - when you're creating permission categorieszotlabs2017-02-071-1/+1
|
* initial permcat creation ability, in /settings/permcats; functional permcat ↵zotlabs2017-02-073-1/+164
| | | | creation for testing but still needs a lot of UX work before promoting the ability
* 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
| | | | to define new (personal) ones.
* 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 ↵zotlabs2017-02-062-67/+29
| | | | suggestions
* bring back view links for all notification types (esp: network, channel) for ↵zotlabs2017-02-063-12/+7
| | | | easy access
* 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 ↵zotlabs2017-02-061-4/+10
| |/ |/| | | | | already. This messes up the null arg detection in mod_network.
* | 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
| | | | | |