Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge dev | Mario Vavti | 2017-02-04 | 1 | -1996/+1965 |
|\ | |||||
| * | string update | zotlabs | 2017-02-03 | 1 | -1996/+1965 |
| | | |||||
| * | use openClose() for nav-login | Mario Vavti | 2017-02-03 | 1 | -1/+1 |
| | | |||||
* | | update some apps and refine navapps.tpl | Mario Vavti | 2017-02-03 | 12 | -19/+45 |
| | | |||||
* | | check for app-icons in app_list() instead of app_render() | Mario Vavti | 2017-02-03 | 4 | -6/+8 |
| | | |||||
* | | do not hide button - just gray it out | Mario Vavti | 2017-02-03 | 2 | -3/+3 |
| | | |||||
* | | hide notifications button if there are none | Mario Vavti | 2017-02-03 | 2 | -1/+9 |
| | | |||||
* | | use openClose() for nav-login | Mario Vavti | 2017-02-03 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into wip-app-bin | Mario Vavti | 2017-02-03 | 18 | -240/+75 |
|\| | |||||
| * | rename bb2diaspora.php to markdown.php | zotlabs | 2017-02-02 | 4 | -4/+4 |
| | | |||||
| * | unused since 2012 | zotlabs | 2017-02-02 | 1 | -84/+0 |
| | | |||||
| * | move firefox social api configuration to plugin | zotlabs | 2017-02-02 | 4 | -76/+25 |
| | | |||||
| * | move rsd service to twitter_api plugin | zotlabs | 2017-02-02 | 3 | -33/+0 |
| | | |||||
| * | build_pagehead hook added | zotlabs | 2017-02-02 | 1 | -0/+2 |
| | | |||||
| * | move opensearch to plugins | zotlabs | 2017-02-02 | 7 | -43/+44 |
| | | |||||
* | | whitespace cleanup | Mario Vavti | 2017-02-02 | 1 | -172/+161 |
| | | |||||
* | | provide separate collased menus for apps and notifications | Mario Vavti | 2017-02-02 | 3 | -11/+26 |
| | | |||||
* | | Merge branch 'dev' into wip-app-bin | Mario Vavti | 2017-02-02 | 0 | -0/+0 |
|\| | |||||
| * | cherry-pick nav-login changes | Mario Vavti | 2017-02-02 | 5 | -53/+15 |
| | | |||||
* | | use bootstrap dropdown for login | Mario Vavti | 2017-02-02 | 5 | -52/+15 |
| | | |||||
* | | move channel manager up in the menu | Mario Vavti | 2017-02-02 | 2 | -7/+4 |
| | | |||||
* | | remove apps from usermenu | Mario Vavti | 2017-02-02 | 3 | -20/+23 |
| | | |||||
* | | do not use style in template | Mario Vavti | 2017-02-02 | 2 | -7/+7 |
| | | |||||
* | | do not use data-toggle on the badge and use fixed with for icons | Mario Vavti | 2017-02-02 | 1 | -11/+11 |
| | | |||||
* | | dropdown menus should be restricted in height in normal view but not in ↵ | Mario Vavti | 2017-02-02 | 2 | -3/+7 |
| | | | | | | | | collapsed view | ||||
* | | remove badge hover effect | Mario Vavti | 2017-02-02 | 1 | -11/+0 |
| | | |||||
* | | really fix badge positions | Mario Vavti | 2017-02-02 | 2 | -5/+3 |
| | | |||||
* | | resolve merge conflict | Mario Vavti | 2017-02-02 | 16 | -166/+161 |
|\| | |||||
| * | move dreamhost hack to plugin | zotlabs | 2017-02-01 | 1 | -15/+10 |
| | | |||||
| * | drug dealers have users | zotlabs | 2017-02-01 | 1 | -5/+5 |
| | | |||||
| * | tested extensible permissions by adding wiki permissions. Discovered a ↵ | zotlabs | 2017-02-01 | 5 | -25/+59 |
| | | | | | | | | couple of issues that needed attention in the process. | ||||
| * | Merge pull request #664 from anaqreon/doco | zotlabs | 2017-02-02 | 5 | -104/+69 |
| |\ | | | | | | | Doco updates | ||||
| | * | Remove old tags and mentions doco pages | Andrew Manning | 2017-02-01 | 2 | -99/+0 |
| | | | |||||
| | * | Remove dead links | Andrew Manning | 2017-02-01 | 1 | -2/+2 |
| | | | |||||
| | * | Integrate tags and mentions page doco into member guide. Fix bug when ↵ | Andrew Manning | 2017-02-01 | 2 | -4/+68 |
| | | | | | | | | | | | | loading page with section link. Change URL when scrolling to stay current with viewed section to facilitate easy help page link sharing. | ||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-02-01 | 6 | -17/+18 |
| | |\ | | |/ | |/| | |||||
| * | | fix a few style issues with nav login panel | zotlabs | 2017-02-01 | 6 | -17/+18 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-02-01 | 12 | -708/+682 |
| | |\ | | |/ | |/| | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-01-31 | 24 | -101/+166 |
| | |\ | |||||
| | * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-01-30 | 3 | -4/+55 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-01-29 | 14 | -234/+324 |
| | |\ \ \ | |||||
| | * | | | | Link to Guest Access Tokens doco in context help. | Andrew Manning | 2017-01-29 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'dev' into wip-app-bin | Mario Vavti | 2017-02-01 | 1 | -0/+4 |
|\| | | | | | |||||
| * | | | | | bookmarks missing from tags and mentions doc | zotlabs | 2017-02-01 | 1 | -0/+4 |
| | | | | | | |||||
* | | | | | | fix notifications badge positioning and rendering of submenus in collapsed mode | Mario Vavti | 2017-02-01 | 3 | -35/+36 |
| | | | | | | |||||
* | | | | | | nav dropdown-menu overrides | Mario Vavti | 2017-02-01 | 1 | -7/+0 |
| | | | | | | |||||
* | | | | | | remove experimental_app_bin config conditional | Mario Vavti | 2017-02-01 | 2 | -151/+19 |
| | | | | | | |||||
* | | | | | | more work on app-bin | Mario Vavti | 2017-02-01 | 4 | -26/+88 |
|/ / / / / | |||||
* | | | | | superfluous whitespace cleanup | zotlabs | 2017-01-31 | 3 | -352/+359 |
| | | | | | |||||
* | | | | | move diaspora account import to the diaspora plugin | zotlabs | 2017-01-31 | 2 | -186/+40 |
| | | | | |