aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
| |\ \ \ \ \ \
| * | | | | | | 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 fi...zotlabs2017-02-051-258/+210
* | | | | | | | 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 markdown...zotlabs2017-02-053-11/+36
* | | | | | | 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.Einer von Vielen2017-02-051-6/+6
|/ / / / / / /
* | | | | | | cleanupzotlabs2017-02-043-11/+15
* | | | | | | more work on nav-modalzotlabs2017-02-034-31/+39
* | | | | | | trying nav-login as modalzotlabs2017-02-031-7/+20
| |_|_|_|_|/ |/| | | | |
* | | | | | string updatezotlabs2017-02-031-1996/+1965
* | | | | | use openClose() for nav-loginMario Vavti2017-02-031-1/+1
| |_|_|_|/ |/| | | |
* | | | | rename bb2diaspora.php to markdown.phpzotlabs2017-02-024-4/+4
* | | | | unused since 2012zotlabs2017-02-021-84/+0
* | | | | move firefox social api configuration to pluginzotlabs2017-02-024-76/+25
* | | | | move rsd service to twitter_api pluginzotlabs2017-02-023-33/+0
* | | | | build_pagehead hook addedzotlabs2017-02-021-0/+2
* | | | | move opensearch to pluginszotlabs2017-02-027-43/+44
| |_|_|/ |/| | |
* | | | cherry-pick nav-login changesMario Vavti2017-02-025-53/+15
| |_|/ |/| |
* | | move dreamhost hack to pluginzotlabs2017-02-011-15/+10
* | | drug dealers have userszotlabs2017-02-011-5/+5
* | | tested extensible permissions by adding wiki permissions. Discovered a couple...zotlabs2017-02-015-25/+59
* | | Merge pull request #664 from anaqreon/docozotlabs2017-02-025-104/+69
|\ \ \
| * | | Remove old tags and mentions doco pagesAndrew Manning2017-02-012-99/+0