aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | |
| * | | | | 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 ↵Mario Vavti2017-02-022-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | collapsed view
| * | | | | 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
| |\ \ \ \ \ \
| * | | | | | | fix notifications badge positioning and rendering of submenus in collapsed modeMario Vavti2017-02-013-35/+36
| | | | | | | |
| * | | | | | | nav dropdown-menu overridesMario Vavti2017-02-011-7/+0
| | | | | | | |
| * | | | | | | remove experimental_app_bin config conditionalMario Vavti2017-02-012-151/+19
| | | | | | | |
| * | | | | | | more work on app-binMario Vavti2017-02-014-26/+88
| | | | | | | |
* | | | | | | | import - get rid of 'step system', we should be able to process any import ↵zotlabs2017-02-051-258/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file at any time.
* | | | | | | | make channel move an option (in addition to cloning)zotlabs2017-02-052-30/+25
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | remove per-page login css (home, login); add support for alternative ↵zotlabs2017-02-053-11/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | markdown mention format
* | | | | | | nav_login element width was page dependent. Put this in theme csszotlabs2017-02-052-19/+16
| | | | | | |
* | | | | | | better theming of rmagic pagezotlabs2017-02-052-19/+14
| | | | | | |
* | | | | | | Merge pull request #666 from einervonvielen/dehydrated_for_devzotlabs2017-02-061-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | The script letsencrypt.sh was replaced by dehydrated.
| * | | | | | | The script letsencrypt.sh was replaced by dehydrated.Einer von Vielen2017-02-051-6/+6
|/ / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 11:23:30 +0000