aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-193-6176/+10026
|\
| * Merge pull request #592 from mjfriaza/devzotlabs2016-11-193-6176/+10026
| |\
| | * Fixed a grammatical concordance error at file connedit in Spanish contextual ...Manuel Jiménez Friaza2016-11-191-1/+1
| | * Updated the Spanish translationManuel Jiménez Friaza2016-11-192-6175/+10025
* | | redmatrix is no longer considered a supported platform and will not be listed...zotlabs2016-11-193-5/+11
|/ /
* | string updatezotlabs2016-11-181-2773/+2827
* | Merge pull request #591 from anaqreon/wiki-guizotlabs2016-11-196-55/+83
|\ \
| * | Hide all content if no wiki is selected except for a message saying to choose...Andrew Manning2016-11-182-3/+9
| * | Move page list back out to the side menu, but with the new page form below th...Andrew Manning2016-11-186-41/+49
| * | Wiki pages display in tab to the left of the edit pane tab. Home is always fi...Andrew Manning2016-11-182-6/+9
| * | Merge branch 'dev' into wiki-guiAndrew Manning2016-11-183-8/+4
| |\ \ | |/ / |/| |
* | | revert simple checkboxMario Vavti2016-11-184-10/+3
* | | add a simple checkbox template for use in widgetsMario Vavti2016-11-183-7/+10
| |/ |/|
| * move commit message and save button into edit pane. Change page list tab labe...Andrew Manning2016-11-182-19/+20
| * Remove page widget completely. Render the page list in a tab alongside Histor...Andrew Manning2016-11-172-16/+26
|/
* dba_pdo: return false on q() DB error like the old driver didzotlabs2016-11-171-1/+1
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-178-85/+152
|\
| * Merge pull request #590 from encyclomundi/devzotlabs2016-11-184-1/+5
| |\
| | * added member OpenID member URLYour Name2016-11-171-1/+1
| | * added Guest Access TokenYour Name2016-11-171-0/+1
| | * Added observer.webnameYour Name2016-11-171-0/+1
| | * Minor Change: add Guest Access Token permission option.Your Name2016-11-171-0/+2
| * | wiki list fixesMario Vavti2016-11-173-54/+54
| |/
| * Merge pull request #589 from anaqreon/wiki-guigit-marijus2016-11-173-70/+124
| |\
| | * Highlight active wiki in list in preparation for removing active wiki name fr...Andrew Manning2016-11-172-2/+14
| | * Merge remote-tracking branch 'upstream/dev' into wiki-guiAndrew Manning2016-11-171-7/+16
| | |\ | | |/ | |/|
| * | remove redundant commaMario Vavti2016-11-171-1/+1
| * | configure ace with setOptions, get rid of redundant scrollbarsMario Vavti2016-11-171-7/+16
| | * Hide edit dialog if new wiki dialog opensAndrew Manning2016-11-161-1/+1
| | * Create wiki edit dialogs directly underneath the wiki name in the wiki listAndrew Manning2016-11-162-42/+43
| | * Move new wiki dialog directly underneath new wiki button in wiki list widgetAndrew Manning2016-11-163-54/+95
| |/
* / issue #588, change 'Bug Report' app to 'Report Bug'zotlabs2016-11-174-21/+14
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-163-10/+26
|\
| * only turn [] and [x] into checkboxes if it is found inside a checklistMario Vavti2016-11-161-4/+15
| * remove print margin and set wrap mode to freeMario Vavti2016-11-161-0/+2
| * remove redundant function callMario Vavti2016-11-161-4/+3
| * use modal-lg instead of width 80%Mario Vavti2016-11-161-2/+1
| * minor wiki changesMario Vavti2016-11-162-2/+7
* | use item from DB for return valuezotlabs2016-11-162-2/+1
* | export issuezotlabs2016-11-161-1/+1
|/
* wiki: simplify permission model, reduce duplicate calls to get the same chann...zotlabs2016-11-152-128/+117
* still a bit of wiki permission weirdness, this should catch the major oneszotlabs2016-11-153-8/+4
* use same icon with rest of appzotlabs2016-11-151-1/+1
* wiki: permissions issues, untranslated strings in templates and some minor ch...zotlabs2016-11-154-17/+29
* xchan_fetch() returns a simplified structurezotlabs2016-11-141-3/+3
* update api perm_allowed to return all perms if no perm specifiedzotlabs2016-11-141-5/+16
* API: add GET /api/z/1.0/perm_allowedzotlabs2016-11-141-0/+24
* API: add GET /api/z/1.0/abconfigzotlabs2016-11-141-0/+17
* Merge pull request #585 from anaqreon/wikizotlabs2016-11-154-356/+397
|\
| * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-11-144-583/+617
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 15:32:09 +0000