aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-201-1/+1
|\
| * the text link to a thing will take you to the local thing page, both as a ↵redmatrix2016-06-171-1/+1
| | | | | | | | link for editing and as a destination in case there is no thing photo. If there's a photo, the photo link will take you to the thing URL.
* | Do not change active page commit until user reverts the pageAndrew Manning2016-06-201-1/+2
| |
* | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-171-1/+6
|\|
| * only use height: auto for week and day viewMario Vavti2016-06-171-1/+6
| |
* | Wiki page revision comparison tool with diff displayed in modal dialog. ↵Andrew Manning2016-06-172-14/+79
|/ | | | Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode
* Rename page feature added. Fixed bug in git commit function and other minor ↵Andrew Manning2016-06-151-1/+40
| | | | fixes.
* Move javascript functions back to jot-header.tplAndrew Manning2016-06-121-0/+83
|
* Photo embed button with album browser works in new post editor.Andrew Manning2016-06-122-84/+1
|
* Merge remote-tracking branch 'upstream/dev' into embedphotosAndrew Manning2016-06-124-0/+319
|\
| * 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-072-4/+4
| |\
| * | Hide page history viewer when viewing sandboxAndrew Manning2016-06-051-2/+2
| | |
| * | Custom commit message available. Improved history viewer and feedback from ↵Andrew Manning2016-06-052-6/+22
| | | | | | | | | | | | revert buttons.
| * | 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-042-69/+90
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-024-11/+19
| |\ \ \
| * | | | 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-291-0/+6
| | | | | | | | | | | | | | | | | | | | 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-273-6/+2
| |\ \ \ \
| * | | | | 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
| | | | | |
| * | | | | Trying to fix wiki branch starting fresh from devAndrew Manning2016-05-211-0/+114
| | | | | |
* | | | | | Stashing changes. Not a functional state.Andrew Manning2016-06-092-0/+112
| |_|_|_|/ |/| | | |
* | | | | rename admin/users to admin/accounts, provide sortable columns in account ↵redmatrix2016-06-062-4/+4
| |_|_|/ |/| | | | | | | | | | | and channel summaries - issue #255
* | | | allow any (current) emoji to be displayed on any site, and provide a default ↵redmatrix2016-06-031-14/+4
| | | | | | | | | | | | | | | | list of reactions that can be over-ridden via configuration if a site doesn't like our choices or perhaps the ordering of our choices.
* | | | turn emoji ability into a feature so that either a member or the site admin ↵redmatrix2016-06-031-1/+1
| | | | | | | | | | | | | | | | can disable it. Default is enabled.
* | | | some theming for emoji buttonMario Vavti2016-06-031-95/+91
| | | |
* | | | restrict emoji reactions to the top level for now.redmatrix2016-06-021-0/+2
| | | |
* | | | menu entries for basic emoji support. I could use a bit of help theming ↵redmatrix2016-06-022-0/+33
| |_|/ |/| | | | | | | | this. It may also be better rendered as a panel of buttons than a dropdown menu. Eventually we should probably allow the system admin to configure the emojis they want; as there are a large number. I only brought in a small collection that I thought would be most useful as post reactions.
* | | more db column renamesredmatrix2016-05-313-10/+18
| | |
* | | more removal of reserved words from DB schemasredmatrix2016-05-311-1/+1
| |/ |/|
* | app rendering issues, typo in class name and could not find icon ↵redmatrix2016-05-251-1/+1
| | | | | | | | 'fa-arrow-circle-o-down-alt'; using 'fa-arrow-circle-o-down' instead
* | remove the add others button for now - after some research it turned out not ↵Mario Vavti2016-05-251-4/+0
| | | | | | | | beeing so useful