aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Integrated more content and deleted the original locations where applicable.Andrew Manning2017-02-1313-838/+180
|
* Some more work converting api_zot to bbcode. This page needs some serious ↵Andrew Manning2017-02-121-4/+4
| | | | formatting work.
* Reformat code of conduct for developers and integrate.Andrew Manning2017-02-127-179/+470
|
* Deleting original help content pages that have been integrated into the new docoAndrew Manning2017-02-1211-293/+49
|
* Merge pull request #671 from anaqreon/webimportzotlabs2017-02-121-14/+18
|\ | | | | Fix webpage element import tool
| * remove logger linesAndrew Manning2017-02-112-2/+0
| |
| * Merge remote-tracking branch 'upstream/dev' into webimportAndrew Manning2017-02-112-4/+11
| |\ | |/ |/|
* | Merge pull request #670 from anaqreon/docozotlabs2017-02-122-4/+11
|\ \ | | | | | | Scroll to doco links with anchor references when there is a ?zid parameter
| * | Update Zot protocol linkAndrew Manning2017-02-111-1/+1
| | |
| * | Scroll to doco links with anchor references when there is a ?zid parameter.Andrew Manning2017-02-111-3/+10
|/ /
| * Webpage import tool works again after setting iconfig properly and following ↵Andrew Manning2017-02-112-14/+20
|/ | | | the Impel class function example. More testing is needed.
* whitespaceMario Vavti2017-02-101-1/+0
|
* do not use modal-sm classMario Vavti2017-02-101-1/+1
|
* add a login button for collapsed state and refine login modalMario Vavti2017-02-103-5/+15
|
* more permissions optimisationszotlabs2017-02-096-36/+63
|
* use profile_store_lowlevel() when creating additional profileszotlabs2017-02-091-9/+10
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-091-4/+6
|\
| * wrap resizing in document ready functionMario Vavti2017-02-091-4/+6
| |
* | more work on permcats and consolidating calls that try to discover connect ↵zotlabs2017-02-097-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 whitespacezotlabs2017-02-084-1/+7
|
* bringer - all basic functionality is implementedzotlabs2017-02-088-24/+107
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-083-5/+11
|\
| * better detection of when to show the feature button and document nav mode ↵Mario Vavti2017-02-081-1/+4
| | | | | | | | for app_render()
| * do not show feature button if the app is shared. css fixesMario Vavti2017-02-083-5/+8
| |
* | fix immediate issue with multiple login forms until I can figure out an ↵zotlabs2017-02-083-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 categorieszotlabs2017-02-071-1/+1
|
* initial permcat creation ability, in /settings/permcats; functional permcat ↵zotlabs2017-02-073-1/+164
| | | | creation for testing but still needs a lot of UX work before promoting the ability
* atokens - we only need one permission columnzotlabs2017-02-073-6/+10
|
* move permcat initialisation to zlibzotlabs2017-02-072-45/+48
|
* provide a few system defined permcats; will require a permission editor page ↵zotlabs2017-02-073-0/+23
| | | | to define new (personal) ones.
* move permcat library functions to Zlibzotlabs2017-02-072-44/+71
|
* Merge branch 'abroles' into devzotlabs2017-02-075-8/+100
|\
| * more background work for permcat supportzotlabs2017-02-075-8/+100
| |
* | nitszotlabs2017-02-071-2/+2
|/
* sort the appsMario Vavti2017-02-071-0/+2
|
* default to manual conversation updatesMario Vavti2017-02-072-2/+4
|
* update readme; probably not finished with this yet so feel free to make ↵zotlabs2017-02-062-67/+29
| | | | suggestions
* bring back view links for all notification types (esp: network, channel) for ↵zotlabs2017-02-063-12/+7
| | | | easy access
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-062-2/+8
|\
| * also take care of the collapsed state appsMario Vavti2017-02-061-1/+7
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-02-062-284/+231
| |\
| * | only check for modeMario Vavti2017-02-061-1/+1
| | |
* | | don't add zid to app links if they're on this system and we're logged in ↵zotlabs2017-02-061-4/+10
| |/ |/| | | | | already. This messes up the null arg detection in mod_network.
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-0644-413/+403
|\|
| * move icon stuff back to app_render() and send navapps through app_render()Mario Vavti2017-02-068-22/+22
| |
| * fix wiki and chat .apdMario Vavti2017-02-062-2/+2
| |
| * make sure we do not remove other categories on app un-featureMario Vavti2017-02-061-2/+2
| |
| * minor fixesMario Vavti2017-02-062-6/+6
| |
| * import system apps on initial loadMario Vavti2017-02-062-9/+7
| |
| * update templatesMario Vavti2017-02-063-44/+51
| |