Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | 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 | |
|/ / / / / / / | ||||||
* | | | | | | | cleanup | zotlabs | 2017-02-04 | 3 | -11/+15 | |
| | | | | | | | ||||||
* | | | | | | | more work on nav-modal | zotlabs | 2017-02-03 | 4 | -31/+39 | |
| | | | | | | | ||||||
* | | | | | | | trying nav-login as modal | zotlabs | 2017-02-03 | 1 | -7/+20 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | string update | zotlabs | 2017-02-03 | 1 | -1996/+1965 | |
| | | | | | | ||||||
* | | | | | | use openClose() for nav-login | Mario Vavti | 2017-02-03 | 1 | -1/+1 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | 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 | |
| |_|_|/ |/| | | | ||||||
* | | | | cherry-pick nav-login changes | Mario Vavti | 2017-02-02 | 5 | -53/+15 | |
| |_|/ |/| | | ||||||
* | | | 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 | |
| |\ \ | |/ / |/| | | ||||||
* | | | bookmarks missing from tags and mentions doc | zotlabs | 2017-02-01 | 1 | -0/+4 | |
| |/ |/| | ||||||
* | | 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 | |
| | | ||||||
* | | channel export - use a selected list of functional data categories to ↵ | zotlabs | 2017-01-31 | 9 | -171/+280 | |
| | | | | | | | | export; this allows one to export single data sets instead of always exporting everything we know about | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2017-01-31 | 24 | -101/+166 | |
| |\ | |/ |/| | ||||||
* | | hide featured app category in the app category widget | Mario Vavti | 2017-01-31 | 3 | -3/+4 | |
| | |