Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | 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. | ||||
* | | 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 |
|/ | |||||
* | 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 |
| | |||||
* | provide a few system defined permcats; will require a permission editor page ↵ | zotlabs | 2017-02-07 | 3 | -0/+23 |
| | | | | to define new (personal) ones. | ||||
* | move permcat library functions to Zlib | zotlabs | 2017-02-07 | 2 | -44/+71 |
| | |||||
* | Merge branch 'abroles' into dev | zotlabs | 2017-02-07 | 5 | -8/+100 |
|\ | |||||
| * | more background work for permcat support | zotlabs | 2017-02-07 | 5 | -8/+100 |
| | | |||||
* | | nits | zotlabs | 2017-02-07 | 1 | -2/+2 |
|/ | |||||
* | sort the apps | Mario Vavti | 2017-02-07 | 1 | -0/+2 |
| | |||||
* | default to manual conversation updates | Mario Vavti | 2017-02-07 | 2 | -2/+4 |
| | |||||
* | update readme; probably not finished with this yet so feel free to make ↵ | zotlabs | 2017-02-06 | 2 | -67/+29 |
| | | | | suggestions | ||||
* | bring back view links for all notification types (esp: network, channel) for ↵ | zotlabs | 2017-02-06 | 3 | -12/+7 |
| | | | | easy access | ||||
* | 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 |
| | |