aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
| * | | 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
| |\ \ | |/ / |/| |
* | | bookmarks missing from tags and mentions doczotlabs2017-02-011-0/+4
| |/ |/|
* | superfluous whitespace cleanupzotlabs2017-01-313-352/+359
* | move diaspora account import to the diaspora pluginzotlabs2017-01-312-186/+40
* | channel export - use a selected list of functional data categories to export;...zotlabs2017-01-319-171/+280
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-01-3124-101/+166
| |\ | |/ |/|
* | hide featured app category in the app category widgetMario Vavti2017-01-313-3/+4
* | fix typosMario Vavti2017-01-313-3/+3
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-306-8/+73
|\ \
| * | provide a feature/unfeature app buttonMario Vavti2017-01-304-5/+34
* | | consolidate hubloc storagezotlabs2017-01-3018-95/+130
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2017-01-303-4/+55
| | |\ | | |/ | |/|
| * | Merge pull request #662 from anaqreon/affinity-settingszotlabs2017-01-302-3/+39
|/| |
| * | Remove unrelated chatroom panel stuff that was included accidentallyAndrew Manning2017-01-291-69/+0
| * | Merge remote-tracking branch 'upstream/dev' into affinity-settingsAndrew Manning2017-01-2914-234/+324
| |\ \
| * | | Add affinity slider tool settings for min and max defaults in settings/featuredAndrew Manning2017-01-292-3/+108