aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* util/pconfig - don't enumerate empty arrays, mod_acl - add more commentszotlabs2017-02-132-10/+26
* Merge pull request #676 from anaqreon/docozotlabs2017-02-1427-999/+388
|\
| * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-02-1324-3665/+4067
| |\ | |/ |/|
* | Merge pull request #675 from mjfriaza/devzotlabs2017-02-149-2699/+2902
|\ \
| * | Fix 'settings/channel' page in Spanish contextual helpManuel Jiménez Friaza2017-02-131-24/+24
| * | Updated the Spanish contextual helpManuel Jiménez Friaza2017-02-137-0/+150
| * | Updated the Spanish translationManuel Jiménez Friaza2017-02-132-2699/+2752
|/ /
* | be consistent with the namezotlabs2017-02-121-1/+1
* | add default permcat to channel settings formzotlabs2017-02-122-1/+22
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-02-124-19/+30
|\ \
| * | css fixMario Vavti2017-02-121-1/+1
* | | testing and bug fixes virtual profile groupszotlabs2017-02-123-4/+49
* | | Create virtual privacy groups for private profile member listszotlabs2017-02-129-961/+1094
| | * 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 for...Andrew Manning2017-02-121-4/+4
| | * 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
| |\
| | * 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
|/| |
| * | 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
|/
* 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 pe...zotlabs2017-02-097-116/+232
|/
* 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 for...Mario Vavti2017-02-081-1/+4
| * 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 elega...zotlabs2017-02-083-10/+4
|/
* open permission tab by default - when you're creating permission categorieszotlabs2017-02-071-1/+1
* initial permcat creation ability, in /settings/permcats; functional permcat c...zotlabs2017-02-073-1/+164
* 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
* 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 sugge...zotlabs2017-02-062-67/+29
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 21:18:31 +0000