aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-103-0/+455
|\
| * Merge pull request #410 from anaqreon/wikihubzilla2016-06-103-0/+455
| |\
| | * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-092-5/+9
| | |\
| | * | Revised permissions checks across API and enabled collaborative editing using...Andrew Manning2016-06-081-79/+60
| | * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-085-1/+424
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-074-53/+258
| | |\ \ \
| | * | | | Hide page history viewer when viewing sandboxAndrew Manning2016-06-051-1/+4
| | * | | | Custom commit message available. Improved history viewer and feedback from re...Andrew Manning2016-06-051-1/+10
| | * | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-051-1/+1
| | |\ \ \ \
| | * | | | | Basic page reversion implemented. The revert button on the history view repla...Andrew Manning2016-06-051-0/+35
| | * | | | | Page deletion implemented. Hide the delete button and disallow for Home page.Andrew Manning2016-06-041-4/+51
| | * | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-041-3/+3
| | |\ \ \ \ \
| | * | | | | | Wiki and page filenames are abstracted from their displayed names. Special ch...Andrew Manning2016-06-041-20/+22
| | * | | | | | Created three distinct names for wiki and page that are suitable for URL, HTM...Andrew Manning2016-06-041-6/+10
| | * | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-043-6/+68
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-0248-392/+479
| | |\ \ \ \ \ \ \
| | * | | | | | | | Major corrections to access control and page construction.Andrew Manning2016-06-022-102/+110
| | * | | | | | | | Created page history widget to dynamically fetch and display the git commit h...Andrew Manning2016-05-301-3/+33
| | * | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-301-1/+1
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Replaced wiki item record object field with ActivityStreams information. Wiki...Andrew Manning2016-05-301-6/+12
| | * | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-291-2/+2
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed bug in access control. Hide new wiki/page buttons if not channel owner.Andrew Manning2016-05-291-2/+0
| | * | | | | | | | | | Remove Parsedown library files and remove references.Andrew Manning2016-05-291-2/+0
| | * | | | | | | | | | Only show wiki delete control if channel ownerAndrew Manning2016-05-291-0/+1
| | * | | | | | | | | | Hide page controls when not owner. Fixed some serious access control issues.Andrew Manning2016-05-291-22/+27
| | * | | | | | | | | | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for p...Andrew Manning2016-05-291-5/+9
| | * | | | | | | | | | Home page create with new wiki. URL redirects here when no page given. Fixed ...Andrew Manning2016-05-291-3/+17
| | * | | | | | | | | | Git commit made for the page edits when the page is saved.Andrew Manning2016-05-292-2/+22
| | * | | | | | | | | | Wiki pages can be saved.Andrew Manning2016-05-281-4/+40
| | * | | | | | | | | | Show page content by default. Hide page controls where appropriate. Fix sandb...Andrew Manning2016-05-281-2/+10
| | * | | | | | | | | | Page content is loaded from the file on diskAndrew Manning2016-05-281-3/+11
| | * | | | | | | | | | Wiki page list links work. File content is not yet loaded into the editor. Re...Andrew Manning2016-05-281-6/+4
| | * | | | | | | | | | Wiki page list is fetched and the page widget is updatedAndrew Manning2016-05-281-4/+16
| | * | | | | | | | | | Add new page to wiki and redirect to editor page.Andrew Manning2016-05-271-7/+52
| | * | | | | | | | | | Check if wiki exists and redirect if it does notAndrew Manning2016-05-271-1/+6
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-2773-517/+2333
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Delete wiki (in progress)Andrew Manning2016-05-241-7/+45
| | * | | | | | | | | | | List of wikis populates with links according to observer permissions.Andrew Manning2016-05-211-0/+15
| | * | | | | | | | | | | Successful new wiki git repo and item table recordAndrew Manning2016-05-212-11/+23
| | * | | | | | | | | | | Trying to fix wiki branch starting fresh from devAndrew Manning2016-05-211-0/+113
* | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-104-19/+25
|\| | | | | | | | | | | |
| * | | | | | | | | | | | foreach: invalid argumentredmatrix2016-06-092-14/+16
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | namespace issue with openid reverse authredmatrix2016-06-091-4/+4
| * | | | | | | | | | | allow an exclusion for transmitting hidden file activities. There may be a be...redmatrix2016-06-091-1/+5
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-086-10/+429
|\| | | | | | | | | |
| * | | | | | | | | | Finish the config familyredmatrix2016-06-075-1/+424
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | 'recent photos' query was buggered, also fix issue #163 by adding configurabl...redmatrix2016-06-071-9/+5
* | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-071-43/+63
|\| | | | | | | | |
| * | | | | | | | | rename admin/users to admin/accounts, provide sortable columns in account and...redmatrix2016-06-061-43/+63
* | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-062-1/+190
|\| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 01:54:02 +0000