Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-02-06 | 2 | -2/+8 |
|\ | |||||
| * | also take care of the collapsed state apps | Mario Vavti | 2017-02-06 | 1 | -1/+7 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-02-06 | 2 | -284/+231 |
| |\ | |||||
| * | | only check for mode | Mario Vavti | 2017-02-06 | 1 | -1/+1 |
| | | | |||||
* | | | don't add zid to app links if they're on this system and we're logged in ↵ | zotlabs | 2017-02-06 | 1 | -4/+10 |
| |/ |/| | | | | | already. This messes up the null arg detection in mod_network. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-02-06 | 44 | -413/+403 |
|\| | |||||
| * | move icon stuff back to app_render() and send navapps through app_render() | Mario Vavti | 2017-02-06 | 8 | -22/+22 |
| | | |||||
| * | fix wiki and chat .apd | Mario Vavti | 2017-02-06 | 2 | -2/+2 |
| | | |||||
| * | make sure we do not remove other categories on app un-feature | Mario Vavti | 2017-02-06 | 1 | -2/+2 |
| | | |||||
| * | minor fixes | Mario Vavti | 2017-02-06 | 2 | -6/+6 |
| | | |||||
| * | import system apps on initial load | Mario Vavti | 2017-02-06 | 2 | -9/+7 |
| | | |||||
| * | update templates | Mario Vavti | 2017-02-06 | 3 | -44/+51 |
| | | |||||
| * | add profile app | Mario Vavti | 2017-02-06 | 1 | -0/+6 |
| | | |||||
| * | remove profile app | Mario Vavti | 2017-02-06 | 1 | -6/+0 |
| | | |||||
| * | update apps | Mario Vavti | 2017-02-06 | 1 | -0/+6 |
| | | |||||
| * | update apps | Mario Vavti | 2017-02-06 | 24 | -31/+56 |
| | | |||||
| * | parse icons in get_system_apps() | Mario Vavti | 2017-02-06 | 1 | -0/+3 |
| | | |||||
| * | merge dev | Mario Vavti | 2017-02-06 | 10 | -59/+101 |
| |\ | |||||
| * | | allow featuring of apps in /apps and update some more apd files | Mario Vavti | 2017-02-04 | 7 | -18/+13 |
| | | | |||||
| * | | merge dev | Mario Vavti | 2017-02-04 | 1 | -1996/+1965 |
| |\ \ | |||||
| * | | | 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 |
| |\ \ \ | |||||
| * | | | | 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 |
| |\ \ \ \ | |||||
| * | | | | | 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 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'dev' into wip-app-bin | Mario Vavti | 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 |
| | | | | | | | | |||||
* | | | | | | | | import - get rid of 'step system', we should be able to process any import ↵ | zotlabs | 2017-02-05 | 1 | -258/+210 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file at any time. | ||||
* | | | | | | | | make channel move an option (in addition to cloning) | zotlabs | 2017-02-05 | 2 | -30/+25 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | remove per-page login css (home, login); add support for alternative ↵ | zotlabs | 2017-02-05 | 3 | -11/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | markdown mention format | ||||
* | | | | | | | nav_login element width was page dependent. Put this in theme css | zotlabs | 2017-02-05 | 2 | -19/+16 |
| | | | | | | | |||||
* | | | | | | | better theming of rmagic page | zotlabs | 2017-02-05 | 2 | -19/+14 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #666 from einervonvielen/dehydrated_for_dev | zotlabs | 2017-02-06 | 1 | -6/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | The script letsencrypt.sh was replaced by dehydrated. | ||||
| * | | | | | | | The script letsencrypt.sh was replaced by dehydrated. | Einer von Vielen | 2017-02-05 | 1 | -6/+6 |
|/ / / / / / / |