aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #589 from anaqreon/wiki-guigit-marijus2016-11-173-70/+124
|\ | | | | Active wiki highlighting, move wiki edit panel into wiki list
| * Highlight active wiki in list in preparation for removing active wiki name ↵Andrew Manning2016-11-172-2/+14
| | | | | | | | from content section header to make room for page list viewer
| * 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
|/
* 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 ↵zotlabs2016-11-152-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 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 ↵zotlabs2016-11-154-17/+29
| | | | changes to provide a consistent UI with the rest of the app.
* 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
|\ | | | | Wiki
| * 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 ↵Andrew Manning2016-11-143-29/+29
| | | | | | | | | | | | in wiki list
| * | 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 strings
| | * | 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 ↵zotlabs2016-11-141-0/+4
|/ | | | view_contacts is not allowed
* 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 ↵zotlabs2016-11-131-2/+12
| | | | queries
* zidify wiki contentzotlabs2016-11-132-2/+33
|
* Merge pull request #583 from anaqreon/wikizotlabs2016-11-131-2/+6
|\ | | | | Move focus to Ace editor when switching to editor tab
| * 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 ↵zotlabs2016-11-122-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/wikizotlabs2016-11-133-36/+61
|\ \ | | | | | | Revised wiki controls
| | * Bring Ace editor into focus when Edit tab is clicked to allow immediate text ↵Andrew Manning2016-11-121-2/+6
| |/ | | | | | | entry.
| * Removed wiki list dropdown menus, moving the download and delete icons to ↵Andrew Manning2016-11-121-14/+6
| | | | | | | | beside the open wiki link.
| * Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved ↵Andrew Manning2016-11-122-20/+51
| | | | | | | | page tools in there as well as new page and new wiki
| * 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 ↵zotlabs2016-11-101-0/+4
| | | | filename(1)(1)(1).ext
* Some minor tweaks to zotsh.py, document that it needs the twitter_api plugin ↵zotlabs2016-11-106-5/+7
| | | | on the first hop since we no longer provide the twitter api by default
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 21:20:09 +0000