Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | css fix | Mario Vavti | 2016-06-14 | 1 | -0/+1 |
| | |||||
* | css fixes | Mario Vavti | 2016-06-13 | 1 | -1/+4 |
| | |||||
* | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-13 | 3 | -0/+118 |
|\ | |||||
| * | Move javascript functions back to jot-header.tpl | Andrew Manning | 2016-06-12 | 2 | -84/+83 |
| | | |||||
| * | Photo embed button with album browser works in new post editor. | Andrew Manning | 2016-06-12 | 4 | -84/+91 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/dev' into embedphotos | Andrew Manning | 2016-06-12 | 12 | -9060/+9371 |
| |\ | |||||
| * | | Stashing changes. Not a functional state. | Andrew Manning | 2016-06-09 | 2 | -0/+112 |
| | | | |||||
* | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-11 | 6 | -9051/+9048 |
|\ \ \ | | |/ | |/| | |||||
| * | | css fixes | Mario Vavti | 2016-06-11 | 2 | -10/+1 |
| | | | |||||
| * | | es_ES and NL string for 1.8RC. Hopefully I'm doing it right. | jeroenpraat | 2016-06-11 | 4 | -9041/+9047 |
| | | | |||||
* | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 6 | -1/+331 |
|\| | | |||||
| * | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-09 | 1 | -16/+0 |
| |\ \ | |||||
| * | | | Javascript only allows saving a page if the content has changed. | Andrew Manning | 2016-06-07 | 1 | -2/+11 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-07 | 3 | -5/+5 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Hide page history viewer when viewing sandbox | Andrew Manning | 2016-06-05 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 4 | -5772/+5642 |
| |\ \ \ | |||||
| * | | | | Custom commit message available. Improved history viewer and feedback from ↵ | Andrew Manning | 2016-06-05 | 2 | -6/+22 |
| | | | | | | | | | | | | | | | | | | | | revert buttons. | ||||
| * | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 1 | -0/+5 |
| |\ \ \ \ | |||||
| * | | | | | Basic page reversion implemented. The revert button on the history view ↵ | Andrew Manning | 2016-06-05 | 2 | -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 Manning | 2016-06-04 | 1 | -4/+30 |
| | | | | | | |||||
| * | | | | | Wiki and page filenames are abstracted from their displayed names. Special ↵ | Andrew Manning | 2016-06-04 | 3 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | characters do not seem to break things. | ||||
| * | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-04 | 3 | -69/+94 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-02 | 6 | -22/+31 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Major corrections to access control and page construction. | Andrew Manning | 2016-06-02 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Created page history widget to dynamically fetch and display the git commit ↵ | Andrew Manning | 2016-05-30 | 2 | -1/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | history for wiki pages. | ||||
| * | | | | | | | Replaced wiki item record object field with ActivityStreams information. ↵ | Andrew Manning | 2016-05-30 | 1 | -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 Manning | 2016-05-29 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Only show wiki delete control if channel owner | Andrew Manning | 2016-05-29 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for ↵ | Andrew Manning | 2016-05-29 | 2 | -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 Manning | 2016-05-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug with author in wiki item table record. | ||||
| * | | | | | | | Wiki pages can be saved. | Andrew Manning | 2016-05-28 | 1 | -2/+21 |
| | | | | | | | | |||||
| * | | | | | | | Show page content by default. Hide page controls where appropriate. Fix ↵ | Andrew Manning | 2016-05-28 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sandbox text format. | ||||
| * | | | | | | | Page content is loaded from the file on disk | Andrew Manning | 2016-05-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Wiki page list links work. File content is not yet loaded into the editor. ↵ | Andrew Manning | 2016-05-28 | 2 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some logger calls. | ||||
| * | | | | | | | Wiki page list is fetched and the page widget is updated | Andrew Manning | 2016-05-28 | 2 | -1/+18 |
| | | | | | | | | |||||
| * | | | | | | | Add new page to wiki and redirect to editor page. | Andrew Manning | 2016-05-27 | 1 | -0/+19 |
| | | | | | | | | |||||
| * | | | | | | | Wiki deletion works | Andrew Manning | 2016-05-27 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-27 | 23 | -2002/+2114 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Delete wiki (in progress) | Andrew Manning | 2016-05-24 | 2 | -3/+24 |
| | | | | | | | | | |||||
| * | | | | | | | | List of wikis populates with links according to observer permissions. | Andrew Manning | 2016-05-21 | 2 | -7/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Successful new wiki git repo and item table record | Andrew Manning | 2016-05-21 | 1 | -17/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Forgot some templates | Andrew Manning | 2016-05-21 | 2 | -0/+21 |
| | | | | | | | | | |||||
| * | | | | | | | | Trying to fix wiki branch starting fresh from dev | Andrew Manning | 2016-05-21 | 2 | -0/+118 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 1 | -16/+0 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | remove the automatic ajax page load on pgdn key; it can load content much ↵ | redmatrix | 2016-06-09 | 1 | -16/+0 |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | faster than you can page and potentially lead to memory exhaustion. | ||||
* / | | | | | | | more style work | Mario Vavti | 2016-06-09 | 1 | -1/+11 |
|/ / / / / / / | |||||
* | | | | | | | rename admin/users to admin/accounts, provide sortable columns in account ↵ | redmatrix | 2016-06-06 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | and channel summaries - issue #255 | ||||
* | | | | | | | adjust the autocomplete regex slightly to account for emoji names | redmatrix | 2016-06-05 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Updating NL + es_ES strings | jeroenpraat | 2016-06-06 | 4 | -5772/+5642 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | provide a hover class for smiley emojis which renders them slightly larger ↵ | redmatrix | 2016-06-04 | 1 | -0/+5 |
| |_|_|/ |/| | | | | | | | | | | | on compatible devices when you single them out for inspection |