aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-162-0/+40
|\
| * show month view in full height in fullscreen viewMario Vavti2016-06-162-0/+40
| |
* | mrge branch 'dev' into sabre32Mario Vavti2016-06-162-0/+8
|\|
| * fix scrollbarsMario Vavti2016-06-162-0/+8
| |
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-162-1/+41
|\|
| * Merge pull request #422 from anaqreon/wikihubzilla2016-06-161-1/+40
| |\ | | | | | | Wiki rename page feature added. Bug fixes related to git commits.
| | * Rename page feature added. Fixed bug in git commit function and other minor ↵Andrew Manning2016-06-151-1/+40
| | | | | | | | | | | | fixes.
| * | provide syntax based [colour] highlighting on code blocks for popular ↵redmatrix2016-06-151-0/+1
| |/ | | | | | | languages. I'm not happy with the line height on the list elements but couldn't see where this was defaulted. This uses the syntax [code=xxx]some code snippet[/code], where xxx represents a code/language style - with about 18 builtins.
* | css fixMario Vavti2016-06-141-0/+1
| |
* | css fixesMario Vavti2016-06-131-1/+4
| |
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-133-0/+118
|\|
| * Move javascript functions back to jot-header.tplAndrew Manning2016-06-122-84/+83
| |
| * Photo embed button with album browser works in new post editor.Andrew Manning2016-06-124-84/+91
| |
| * Merge remote-tracking branch 'upstream/dev' into embedphotosAndrew Manning2016-06-1212-9060/+9371
| |\
| * | Stashing changes. Not a functional state.Andrew Manning2016-06-092-0/+112
| | |
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-116-9051/+9048
|\ \ \ | | |/ | |/|
| * | css fixesMario Vavti2016-06-112-10/+1
| | |
| * | es_ES and NL string for 1.8RC. Hopefully I'm doing it right.jeroenpraat2016-06-114-9041/+9047
| | |
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-106-1/+331
|\| |
| * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-091-16/+0
| |\ \
| * | | 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-073-5/+5
| |\ \ \ | | | |/ | | |/|
| * | | Hide page history viewer when viewing sandboxAndrew Manning2016-06-051-2/+2
| | | |
| * | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-054-5772/+5642
| |\ \ \
| * | | | Custom commit message available. Improved history viewer and feedback from ↵Andrew Manning2016-06-052-6/+22
| | | | | | | | | | | | | | | | | | | | revert buttons.
| * | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-051-0/+5
| |\ \ \ \
| * | | | | Basic page reversion implemented. The revert button on the history view ↵Andrew Manning2016-06-052-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | 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-041-4/+30
| | | | | |
| * | | | | Wiki and page filenames are abstracted from their displayed names. Special ↵Andrew Manning2016-06-043-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | characters do not seem to break things.
| * | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-043-69/+94
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-026-22/+31
| |\ \ \ \ \ \
| * | | | | | | Major corrections to access control and page construction.Andrew Manning2016-06-021-0/+2
| | | | | | | |
| * | | | | | | Created page history widget to dynamically fetch and display the git commit ↵Andrew Manning2016-05-302-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | history for wiki pages.
| * | | | | | | Replaced wiki item record object field with ActivityStreams information. ↵Andrew Manning2016-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki git repo path is stored in iconfig instead.
| * | | | | | | Fixed bug in access control. Hide new wiki/page buttons if not channel owner.Andrew Manning2016-05-291-0/+2
| | | | | | | |
| * | | | | | | Only show wiki delete control if channel ownerAndrew Manning2016-05-291-0/+2
| | | | | | | |
| * | | | | | | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for ↵Andrew Manning2016-05-292-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proper inline code rendering. Stopped using Parsedown even though Markdown is slower, hence extra delay when previewing pages.
| * | | | | | | Home page create with new wiki. URL redirects here when no page given. Fixed ↵Andrew Manning2016-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug with author in wiki item table record.
| * | | | | | | Wiki pages can be saved.Andrew Manning2016-05-281-2/+21
| | | | | | | |
| * | | | | | | Show page content by default. Hide page controls where appropriate. Fix ↵Andrew Manning2016-05-281-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sandbox text format.
| * | | | | | | Page content is loaded from the file on diskAndrew Manning2016-05-281-1/+1
| | | | | | | |
| * | | | | | | Wiki page list links work. File content is not yet loaded into the editor. ↵Andrew Manning2016-05-282-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some logger calls.
| * | | | | | | Wiki page list is fetched and the page widget is updatedAndrew Manning2016-05-282-1/+18
| | | | | | | |
| * | | | | | | Add new page to wiki and redirect to editor page.Andrew Manning2016-05-271-0/+19
| | | | | | | |
| * | | | | | | Wiki deletion worksAndrew Manning2016-05-271-0/+2
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-2723-2002/+2114
| |\ \ \ \ \ \ \
| * | | | | | | | Delete wiki (in progress)Andrew Manning2016-05-242-3/+24
| | | | | | | | |
| * | | | | | | | List of wikis populates with links according to observer permissions.Andrew Manning2016-05-212-7/+4
| | | | | | | | |
| * | | | | | | | Successful new wiki git repo and item table recordAndrew Manning2016-05-211-17/+4
| | | | | | | | |
| * | | | | | | | Forgot some templatesAndrew Manning2016-05-212-0/+21
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 18:18:01 +0000