aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* configure ace with setOptions, get rid of redundant scrollbarsMario Vavti2016-11-171-7/+16
* 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
| |\
| * | Moved delete wiki button into new edit wiki form, opened by edit wiki icon in...Andrew Manning2016-11-143-29/+29
| * | Moved new wiki and new page buttons to widgetsAndrew Manning2016-11-143-348/+391
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-142-582/+612
|\ \ \ | | |/ | |/|
| * | Merge pull request #584 from phellmes/devzotlabs2016-11-152-582/+612
| |\ \
| | * | Update DE translation stringsphellmes2016-11-142-582/+612
* | | | API: add GET api/z/1.0/abookzotlabs2016-11-141-0/+19
|/ / /
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2016-11-142-6/+8
|\| |
| * | show wiki controls only to owner and whitespace fixesMario Vavti2016-11-142-6/+8
| |/
* / SECURITY: public calendar leaks connection information (birthdays) when view_...zotlabs2016-11-141-0/+4
|/
* api: allow group member list to use a group name or idzotlabs2016-11-131-14/+16
* move all the zid related stuff to one filezotlabs2016-11-136-225/+233
* provide 'per-page' caching for is_matrix_url() results to reduce duplicate qu...zotlabs2016-11-131-2/+12
* zidify wiki contentzotlabs2016-11-132-2/+33
* Merge pull request #583 from anaqreon/wikizotlabs2016-11-131-2/+6
|\
| * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-11-122-205/+225
| |\ | |/ |/|
* | don't send notification for posts/comments on old conversations that were ref...zotlabs2016-11-122-205/+225
* | Merge pull request #582 from anaqreon/wikizotlabs2016-11-133-36/+61
|\ \
| | * Bring Ace editor into focus when Edit tab is clicked to allow immediate text ...Andrew Manning2016-11-121-2/+6
| |/
| * Removed wiki list dropdown menus, moving the download and delete icons to bes...Andrew Manning2016-11-121-14/+6
| * Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved pag...Andrew Manning2016-11-122-20/+51
| * Move save button to tab barAndrew Manning2016-11-121-3/+5
| * Wiki control dropdown menu improvementAndrew Manning2016-11-121-9/+9
|/
* attach_rename: flaw in duplicate filename detection resulted in filename(1)(1...zotlabs2016-11-101-0/+4
* Some minor tweaks to zotsh.py, document that it needs the twitter_api plugin ...zotlabs2016-11-106-5/+7
* deprecate/remove get_channel_by_nick() which is just a less generalised varia...zotlabs2016-11-086-28/+26
* more api workzotlabs2016-11-082-171/+4
* more api re-orgzotlabs2016-11-082-38/+44
* a bit more background work to support private mail previewzotlabs2016-11-081-3/+17
* typo when consolidating iconszotlabs2016-11-081-1/+1
* move twitter api to addon; there's still a bit of cleanup remaining, mostly d...zotlabs2016-11-082-1591/+40
* use a single iconzotlabs2016-11-081-2/+2