Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 ↵ | zotlabs | 2016-11-15 | 2 | -128/+117 |
| | | | | channel info and permissions, return the owner permissions with the normal permission check (keeping all permission fetching in one place), rename the 'channel' variable to 'owner' in several places to identify this channel role more clearly as to the way it is being used in this module, update the deprecated call to proc_run (include/notifier) and make several notice messages translatable. | ||||
* | 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 ↵ | zotlabs | 2016-11-15 | 4 | -17/+29 |
| | | | | changes to provide a consistent UI with the rest of the app. | ||||
* | 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 |
|\ | | | | | Wiki | ||||
| * | 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 ↵ | Andrew Manning | 2016-11-14 | 3 | -29/+29 |
| | | | | | | | | | | | | in wiki list | ||||
| * | | 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 | ||||
| | * | | 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 ↵ | zotlabs | 2016-11-14 | 1 | -0/+4 |
|/ | | | | view_contacts is not allowed | ||||
* | 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 ↵ | zotlabs | 2016-11-13 | 1 | -2/+12 |
| | | | | queries | ||||
* | zidify wiki content | zotlabs | 2016-11-13 | 2 | -2/+33 |
| | |||||
* | Merge pull request #583 from anaqreon/wiki | zotlabs | 2016-11-13 | 1 | -2/+6 |
|\ | | | | | Move focus to Ace editor when switching to editor tab | ||||
| * | 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 ↵ | zotlabs | 2016-11-12 | 2 | -205/+225 |
| | | | | | | | | refetched after having expired. We'll accomplish this by limiting notifications to items posted within the last month. | ||||
* | | Merge pull request #582 from anaqreon/wiki | zotlabs | 2016-11-13 | 3 | -36/+61 |
|\ \ | | | | | | | Revised wiki controls | ||||
| | * | Bring Ace editor into focus when Edit tab is clicked to allow immediate text ↵ | Andrew Manning | 2016-11-12 | 1 | -2/+6 |
| |/ | | | | | | | entry. | ||||
| * | Removed wiki list dropdown menus, moving the download and delete icons to ↵ | Andrew Manning | 2016-11-12 | 1 | -14/+6 |
| | | | | | | | | beside the open wiki link. | ||||
| * | Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved ↵ | Andrew Manning | 2016-11-12 | 2 | -20/+51 |
| | | | | | | | | page tools in there as well as new page and new wiki | ||||
| * | 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 ↵ | zotlabs | 2016-11-10 | 1 | -0/+4 |
| | | | | filename(1)(1)(1).ext | ||||
* | Some minor tweaks to zotsh.py, document that it needs the twitter_api plugin ↵ | zotlabs | 2016-11-10 | 6 | -5/+7 |
| | | | | on the first hop since we no longer provide the twitter api by default | ||||
* | deprecate/remove get_channel_by_nick() which is just a less generalised ↵ | zotlabs | 2016-11-08 | 6 | -28/+26 |
| | | | | variant of channelx_by_nick() | ||||
* | more api work | zotlabs | 2016-11-08 | 2 | -171/+4 |
| | |||||
* | more api re-org | zotlabs | 2016-11-08 | 2 | -38/+44 |
| | |||||
* | a bit more background work to support private mail preview | zotlabs | 2016-11-08 | 1 | -3/+17 |
| | |||||
* | typo when consolidating icons | zotlabs | 2016-11-08 | 1 | -1/+1 |
| | |||||
* | move twitter api to addon; there's still a bit of cleanup remaining, mostly ↵ | zotlabs | 2016-11-08 | 2 | -1591/+40 |
| | | | | dealing with abstracting the authentication calls and separating out the twitter authentication structure from the zot api. | ||||
* | use a single icon | zotlabs | 2016-11-08 | 1 | -2/+2 |
| |