aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge devMario Vavti2017-02-041-1996/+1965
|\
| * string updatezotlabs2017-02-031-1996/+1965
| * use openClose() for nav-loginMario Vavti2017-02-031-1/+1
* | 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
|\|
| * 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
* | 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
|\|
| * cherry-pick nav-login changesMario Vavti2017-02-025-53/+15
* | 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
|\|
| * 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
| | * Remove dead linksAndrew Manning2017-02-011-2/+2
| | * Integrate tags and mentions page doco into member guide. Fix bug when loading...Andrew Manning2017-02-012-4/+68
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-02-016-17/+18
| | |\ | | |/ | |/|
| * | fix a few style issues with nav login panelzotlabs2017-02-016-17/+18
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-02-0112-708/+682
| | |\ | | |/ | |/|
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-01-3124-101/+166
| | |\
| | * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-01-303-4/+55
| | |\ \
| | * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-01-2914-234/+324
| | |\ \ \
| | * | | | Link to Guest Access Tokens doco in context help.Andrew Manning2017-01-291-1/+1
* | | | | | Merge branch 'dev' into wip-app-binMario Vavti2017-02-011-0/+4
|\| | | | |
| * | | | | bookmarks missing from tags and mentions doczotlabs2017-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
|/ / / / /
* | | | | superfluous whitespace cleanupzotlabs2017-01-313-352/+359
* | | | | move diaspora account import to the diaspora pluginzotlabs2017-01-312-186/+40
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 12:43:21 +0000