| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #589 from anaqreon/wiki-gui | git-marijus | 2016-11-17 | 3 | -70/+124 |
|\ |
|
| * | Highlight active wiki in list in preparation for removing active wiki name fr... | Andrew Manning | 2016-11-17 | 2 | -2/+14 |
| * | Merge remote-tracking branch 'upstream/dev' into wiki-gui | Andrew Manning | 2016-11-17 | 1 | -7/+16 |
| |\
| |/
|/| |
|
* | | remove redundant comma | Mario Vavti | 2016-11-17 | 1 | -1/+1 |
* | | configure ace with setOptions, get rid of redundant scrollbars | Mario Vavti | 2016-11-17 | 1 | -7/+16 |
| * | Hide edit dialog if new wiki dialog opens | Andrew Manning | 2016-11-16 | 1 | -1/+1 |
| * | Create wiki edit dialogs directly underneath the wiki name in the wiki list | Andrew Manning | 2016-11-16 | 2 | -42/+43 |
| * | Move new wiki dialog directly underneath new wiki button in wiki list widget | Andrew Manning | 2016-11-16 | 3 | -54/+95 |
|/ |
|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-16 | 3 | -10/+26 |
|\ |
|
| * | only turn [] and [x] into checkboxes if it is found inside a checklist | Mario Vavti | 2016-11-16 | 1 | -4/+15 |
| * | remove print margin and set wrap mode to free | Mario Vavti | 2016-11-16 | 1 | -0/+2 |
| * | remove redundant function call | Mario Vavti | 2016-11-16 | 1 | -4/+3 |
| * | use modal-lg instead of width 80% | Mario Vavti | 2016-11-16 | 1 | -2/+1 |
| * | minor wiki changes | Mario Vavti | 2016-11-16 | 2 | -2/+7 |
* | | use item from DB for return value | zotlabs | 2016-11-16 | 2 | -2/+1 |
* | | export issue | zotlabs | 2016-11-16 | 1 | -1/+1 |
|/ |
|
* | wiki: simplify permission model, reduce duplicate calls to get the same chann... | zotlabs | 2016-11-15 | 2 | -128/+117 |
* | still a bit of wiki permission weirdness, this should catch the major ones | zotlabs | 2016-11-15 | 3 | -8/+4 |
* | use same icon with rest of app | zotlabs | 2016-11-15 | 1 | -1/+1 |
* | wiki: permissions issues, untranslated strings in templates and some minor ch... | zotlabs | 2016-11-15 | 4 | -17/+29 |
* | xchan_fetch() returns a simplified structure | zotlabs | 2016-11-14 | 1 | -3/+3 |
* | update api perm_allowed to return all perms if no perm specified | zotlabs | 2016-11-14 | 1 | -5/+16 |
* | API: add GET /api/z/1.0/perm_allowed | zotlabs | 2016-11-14 | 1 | -0/+24 |
* | API: add GET /api/z/1.0/abconfig | zotlabs | 2016-11-14 | 1 | -0/+17 |
* | Merge pull request #585 from anaqreon/wiki | zotlabs | 2016-11-15 | 4 | -356/+397 |
|\ |
|
| * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-11-14 | 4 | -583/+617 |
| |\ |
|
| * | | Moved delete wiki button into new edit wiki form, opened by edit wiki icon in... | Andrew Manning | 2016-11-14 | 3 | -29/+29 |
| * | | Moved new wiki and new page buttons to widgets | Andrew Manning | 2016-11-14 | 3 | -348/+391 |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-14 | 2 | -582/+612 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge pull request #584 from phellmes/dev | zotlabs | 2016-11-15 | 2 | -582/+612 |
| |\ \ |
|
| | * | | Update DE translation strings | phellmes | 2016-11-14 | 2 | -582/+612 |
* | | | | API: add GET api/z/1.0/abook | zotlabs | 2016-11-14 | 1 | -0/+19 |
|/ / / |
|
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2016-11-14 | 2 | -6/+8 |
|\| | |
|
| * | | show wiki controls only to owner and whitespace fixes | Mario Vavti | 2016-11-14 | 2 | -6/+8 |
| |/ |
|
* / | SECURITY: public calendar leaks connection information (birthdays) when view_... | zotlabs | 2016-11-14 | 1 | -0/+4 |
|/ |
|
* | api: allow group member list to use a group name or id | zotlabs | 2016-11-13 | 1 | -14/+16 |
* | move all the zid related stuff to one file | zotlabs | 2016-11-13 | 6 | -225/+233 |
* | provide 'per-page' caching for is_matrix_url() results to reduce duplicate qu... | zotlabs | 2016-11-13 | 1 | -2/+12 |
* | zidify wiki content | zotlabs | 2016-11-13 | 2 | -2/+33 |
* | Merge pull request #583 from anaqreon/wiki | zotlabs | 2016-11-13 | 1 | -2/+6 |
|\ |
|
| * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-11-12 | 2 | -205/+225 |
| |\
| |/
|/| |
|
* | | don't send notification for posts/comments on old conversations that were ref... | zotlabs | 2016-11-12 | 2 | -205/+225 |
* | | Merge pull request #582 from anaqreon/wiki | zotlabs | 2016-11-13 | 3 | -36/+61 |
|\ \ |
|
| | * | Bring Ace editor into focus when Edit tab is clicked to allow immediate text ... | Andrew Manning | 2016-11-12 | 1 | -2/+6 |
| |/ |
|
| * | Removed wiki list dropdown menus, moving the download and delete icons to bes... | Andrew Manning | 2016-11-12 | 1 | -14/+6 |
| * | Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved pag... | Andrew Manning | 2016-11-12 | 2 | -20/+51 |
| * | Move save button to tab bar | Andrew Manning | 2016-11-12 | 1 | -3/+5 |
| * | Wiki control dropdown menu improvement | Andrew Manning | 2016-11-12 | 1 | -9/+9 |
|/ |
|
* | attach_rename: flaw in duplicate filename detection resulted in filename(1)(1... | zotlabs | 2016-11-10 | 1 | -0/+4 |
* | Some minor tweaks to zotsh.py, document that it needs the twitter_api plugin ... | zotlabs | 2016-11-10 | 6 | -5/+7 |