aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-10354-18/+1687
|\
| * changelog updateredmatrix2016-06-101-0/+2
| |
| * Merge pull request #410 from anaqreon/wikihubzilla2016-06-10353-18/+1685
| |\ | | | | | | Wiki module: first iteration
| | * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-095-21/+21
| | |\
| | * | Revised permissions checks across API and enabled collaborative editing ↵Andrew Manning2016-06-082-81/+71
| | | | | | | | | | | | | | | | using the write_pages per-channel permission.
| | * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-088-372/+449
| | |\ \
| | * | | Javascript only allows saving a page if the content has changed.Andrew Manning2016-06-071-2/+11
| | | | |
| | * | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-0713-252/+315
| | |\ \ \
| | * | | | Hide page history viewer when viewing sandboxAndrew Manning2016-06-052-3/+6
| | | | | |
| | * | | | Remove debugging logger statementsAndrew Manning2016-06-052-4/+0
| | | | | |
| | * | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-055-5772/+5649
| | |\ \ \ \
| | * | | | | Custom commit message available. Improved history viewer and feedback from ↵Andrew Manning2016-06-053-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | revert buttons.
| | * | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-057-21/+27
| | |\ \ \ \ \
| | * | | | | | Basic page reversion implemented. The revert button on the history view ↵Andrew Manning2016-06-054-3/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replaces the editor text but does not save the page.
| | * | | | | | Page deletion implemented. Hide the delete button and disallow for Home page.Andrew Manning2016-06-043-8/+99
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-041-3/+3
| | |\ \ \ \ \ \
| | * | | | | | | Wiki and page filenames are abstracted from their displayed names. Special ↵Andrew Manning2016-06-046-48/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | characters do not seem to break things.
| | * | | | | | | Created three distinct names for wiki and page that are suitable for URL, ↵Andrew Manning2016-06-042-20/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTML, and raw display. Implemented in new wiki POST activity only so far.
| | * | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-041844-458/+517
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-02428-56247/+1158
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Major corrections to access control and page construction.Andrew Manning2016-06-027-120/+135
| | | | | | | | | | |
| | * | | | | | | | | Created page history widget to dynamically fetch and display the git commit ↵Andrew Manning2016-05-305-10/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | history for wiki pages.
| | * | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-301-1/+1
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Replaced wiki item record object field with ActivityStreams information. ↵Andrew Manning2016-05-304-72/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki git repo path is stored in iconfig instead.
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-294-4/+6
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed bug in access control. Hide new wiki/page buttons if not channel owner.Andrew Manning2016-05-293-7/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Remove Parsedown library files and remove references.Andrew Manning2016-05-29113-2702/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Only show wiki delete control if channel ownerAndrew Manning2016-05-294-7/+16
| | | | | | | | | | | | |
| | * | | | | | | | | | | 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 ↵Andrew Manning2016-05-295-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proper inline code rendering. Stopped using Parsedown even though Markdown is slower, hence extra delay when previewing pages.
| | * | | | | | | | | | | Fixed bug where page file was not loaded because of urlencoding/urldecodingAndrew Manning2016-05-291-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Home page create with new wiki. URL redirects here when no page given. Fixed ↵Andrew Manning2016-05-292-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug with author in wiki item table record.
| | * | | | | | | | | | | Git commit made for the page edits when the page is saved.Andrew Manning2016-05-293-5/+62
| | | | | | | | | | | | |
| | * | | | | | | | | | | Wiki pages can be saved.Andrew Manning2016-05-283-6/+83
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-285-2123/+2151
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Show page content by default. Hide page controls where appropriate. Fix ↵Andrew Manning2016-05-282-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sandbox text format.
| | * | | | | | | | | | | | Page content is loaded from the file on diskAndrew Manning2016-05-283-4/+35
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Wiki page list links work. File content is not yet loaded into the editor. ↵Andrew Manning2016-05-284-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some logger calls.
| | * | | | | | | | | | | | Wiki page list is fetched and the page widget is updatedAndrew Manning2016-05-285-15/+81
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Add new page to wiki and redirect to editor page.Andrew Manning2016-05-273-13/+120
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Check if wiki exists and redirect if it does notAndrew Manning2016-05-272-1/+19
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Wiki deletion worksAndrew Manning2016-05-272-6/+12
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-27152-5312/+4411
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Delete wiki (in progress)Andrew Manning2016-05-244-19/+89
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | List of wikis populates with links according to observer permissions.Andrew Manning2016-05-215-13/+39
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Successful new wiki git repo and item table recordAndrew Manning2016-05-215-82/+103
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Forgot some templatesAndrew Manning2016-05-212-0/+21
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Trying to fix wiki branch starting fresh from devAndrew Manning2016-05-21454-0/+3459
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-1010-3504/+3553
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | strings updateredmatrix2016-06-101-3447/+3449
| | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 12:05:17 +0000