Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | string update | zotlabs | 2017-02-17 | 1 | -405/+415 |
| | |||||
* | add the generic-icons-nav class | Mario Vavti | 2017-02-17 | 1 | -10/+10 |
| | |||||
* | add register button for collapsed state | Mario Vavti | 2017-02-17 | 2 | -11/+16 |
| | |||||
* | fixed width icons for item dropdown | Mario Vavti | 2017-02-17 | 1 | -10/+10 |
| | |||||
* | css fixes and rename link to full docs to help since its app is also called help | Mario Vavti | 2017-02-17 | 2 | -3/+3 |
| | |||||
* | strip possible quotes from attribute_contains() haystacks | zotlabs | 2017-02-15 | 1 | -1/+3 |
| | |||||
* | typo | zotlabs | 2017-02-15 | 1 | -1/+1 |
| | |||||
* | provide HTTP header parser which honours continuation lines and despite the ↵ | zotlabs | 2017-02-14 | 2 | -5/+46 |
| | | | | fact that continuation lines have been deprecated - as they still exist in the wild. | ||||
* | util/pconfig - don't enumerate empty arrays, mod_acl - add more comments | zotlabs | 2017-02-13 | 2 | -10/+26 |
| | |||||
* | Merge pull request #676 from anaqreon/doco | zotlabs | 2017-02-14 | 27 | -999/+388 |
|\ | | | | | Doco | ||||
| * | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-02-13 | 24 | -3665/+4067 |
| |\ | |/ |/| | |||||
* | | Merge pull request #675 from mjfriaza/dev | zotlabs | 2017-02-14 | 9 | -2699/+2902 |
|\ \ | | | | | | | Updated the Spanish translation | ||||
| * | | Fix 'settings/channel' page in Spanish contextual help | Manuel Jiménez Friaza | 2017-02-13 | 1 | -24/+24 |
| | | | |||||
| * | | Updated the Spanish contextual help | Manuel Jiménez Friaza | 2017-02-13 | 7 | -0/+150 |
| | | | |||||
| * | | Updated the Spanish translation | Manuel Jiménez Friaza | 2017-02-13 | 2 | -2699/+2752 |
|/ / | |||||
* | | be consistent with the name | zotlabs | 2017-02-12 | 1 | -1/+1 |
| | | |||||
* | | add default permcat to channel settings form | zotlabs | 2017-02-12 | 2 | -1/+22 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-02-12 | 4 | -19/+30 |
|\ \ | |||||
| * | | css fix | Mario Vavti | 2017-02-12 | 1 | -1/+1 |
| | | | |||||
* | | | testing and bug fixes virtual profile groups | zotlabs | 2017-02-12 | 3 | -4/+49 |
| | | | |||||
* | | | Create virtual privacy groups for private profile member lists | zotlabs | 2017-02-12 | 9 | -961/+1094 |
| | | | |||||
| | * | Integrated more content and deleted the original locations where applicable. | Andrew Manning | 2017-02-13 | 13 | -838/+180 |
| | | | |||||
| | * | Some more work converting api_zot to bbcode. This page needs some serious ↵ | Andrew Manning | 2017-02-12 | 1 | -4/+4 |
| | | | | | | | | | | | | formatting work. | ||||
| | * | Reformat code of conduct for developers and integrate. | Andrew Manning | 2017-02-12 | 7 | -179/+470 |
| | | | |||||
| | * | Deleting original help content pages that have been integrated into the new doco | Andrew Manning | 2017-02-12 | 11 | -293/+49 |
| |/ | |||||
| * | Merge pull request #671 from anaqreon/webimport | zotlabs | 2017-02-12 | 1 | -14/+18 |
| |\ | | | | | | | Fix webpage element import tool | ||||
| | * | remove logger lines | Andrew Manning | 2017-02-11 | 2 | -2/+0 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/dev' into webimport | Andrew Manning | 2017-02-11 | 2 | -4/+11 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #670 from anaqreon/doco | zotlabs | 2017-02-12 | 2 | -4/+11 |
|/| | | | | | | | | Scroll to doco links with anchor references when there is a ?zid parameter | ||||
| * | | Update Zot protocol link | Andrew Manning | 2017-02-11 | 1 | -1/+1 |
| | | | |||||
| * | | Scroll to doco links with anchor references when there is a ?zid parameter. | Andrew Manning | 2017-02-11 | 1 | -3/+10 |
|/ / | |||||
| * | Webpage import tool works again after setting iconfig properly and following ↵ | Andrew Manning | 2017-02-11 | 2 | -14/+20 |
|/ | | | | the Impel class function example. More testing is needed. | ||||
* | whitespace | Mario Vavti | 2017-02-10 | 1 | -1/+0 |
| | |||||
* | do not use modal-sm class | Mario Vavti | 2017-02-10 | 1 | -1/+1 |
| | |||||
* | add a login button for collapsed state and refine login modal | Mario Vavti | 2017-02-10 | 3 | -5/+15 |
| | |||||
* | more permissions optimisations | zotlabs | 2017-02-09 | 6 | -36/+63 |
| | |||||
* | use profile_store_lowlevel() when creating additional profiles | zotlabs | 2017-02-09 | 1 | -9/+10 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-02-09 | 1 | -4/+6 |
|\ | |||||
| * | wrap resizing in document ready function | Mario Vavti | 2017-02-09 | 1 | -4/+6 |
| | | |||||
* | | more work on permcats and consolidating calls that try to discover connect ↵ | zotlabs | 2017-02-09 | 7 | -116/+232 |
|/ | | | | permissions, also create lowlevel store functions for abook and profile - since these currently may have issues with sql strict mode. | ||||
* | minor theming and whitespace | zotlabs | 2017-02-08 | 4 | -1/+7 |
| | |||||
* | bringer - all basic functionality is implemented | zotlabs | 2017-02-08 | 8 | -24/+107 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-02-08 | 3 | -5/+11 |
|\ | |||||
| * | better detection of when to show the feature button and document nav mode ↵ | Mario Vavti | 2017-02-08 | 1 | -1/+4 |
| | | | | | | | | for app_render() | ||||
| * | do not show feature button if the app is shared. css fixes | Mario Vavti | 2017-02-08 | 3 | -5/+8 |
| | | |||||
* | | fix immediate issue with multiple login forms until I can figure out an ↵ | zotlabs | 2017-02-08 | 3 | -10/+4 |
|/ | | | | elegant way to "popup" the modal login form already on the page. We still may need this fix for the actual login module which should always be callable and present a login form even if the nav is completely borked. | ||||
* | open permission tab by default - when you're creating permission categories | zotlabs | 2017-02-07 | 1 | -1/+1 |
| | |||||
* | initial permcat creation ability, in /settings/permcats; functional permcat ↵ | zotlabs | 2017-02-07 | 3 | -1/+164 |
| | | | | creation for testing but still needs a lot of UX work before promoting the ability | ||||
* | atokens - we only need one permission column | zotlabs | 2017-02-07 | 3 | -6/+10 |
| | |||||
* | move permcat initialisation to zlib | zotlabs | 2017-02-07 | 2 | -45/+48 |
| |