Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-20 | 1 | -2/+2 |
|\ | |||||
| * | "thing" always showing default url, not that supplied by the thing. | redmatrix | 2016-06-17 | 1 | -2/+2 |
| | | |||||
* | | Wiki page revision comparison tool with diff displayed in modal dialog. ↵ | Andrew Manning | 2016-06-17 | 1 | -2/+40 |
|/ | | | | 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 | ||||
* | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-15 | 2 | -8/+94 |
|\ | |||||
| * | readme for the module directory, also provide an undocumented way to reset ↵ | redmatrix | 2016-06-14 | 2 | -8/+94 |
| | | | | | | | | the timestamp on connection photos to force a refresh without messing with the database directly. | ||||
* | | Rename page feature added. Fixed bug in git commit function and other minor ↵ | Andrew Manning | 2016-06-15 | 1 | -4/+50 |
|/ | | | | fixes. | ||||
* | some work to provide propagation and honouring of the item_notshown flag. | redmatrix | 2016-06-13 | 1 | -2/+2 |
| | |||||
* | deprecate the item_id table - replace with iconfig. A possibly useful ↵ | redmatrix | 2016-06-13 | 11 | -74/+79 |
| | | | | function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication. | ||||
* | Merge pull request #416 from anaqreon/embedphotos | hubzilla | 2016-06-13 | 1 | -0/+180 |
|\ | | | | | Add embed photos button with album browser to new post editor | ||||
| * | Photo embed button with album browser works in new post editor. | Andrew Manning | 2016-06-12 | 1 | -0/+180 |
| | | |||||
* | | Apply purify_html to page content before preview and save to prevent ↵ | Andrew Manning | 2016-06-12 | 1 | -15/+3 |
|/ | | | | JavaScript code injection. | ||||
* | Merge pull request #410 from anaqreon/wiki | hubzilla | 2016-06-10 | 1 | -0/+436 |
|\ | | | | | Wiki module: first iteration | ||||
| * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-09 | 1 | -4/+4 |
| |\ | |||||
| * | | Revised permissions checks across API and enabled collaborative editing ↵ | Andrew Manning | 2016-06-08 | 1 | -79/+60 |
| | | | | | | | | | | | | using the write_pages per-channel permission. | ||||
| * | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-07 | 2 | -52/+68 |
| |\ \ | |||||
| * | | | Hide page history viewer when viewing sandbox | Andrew Manning | 2016-06-05 | 1 | -1/+4 |
| | | | | |||||
| * | | | Custom commit message available. Improved history viewer and feedback from ↵ | Andrew Manning | 2016-06-05 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | revert buttons. | ||||
| * | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 1 | -1/+1 |
| |\ \ \ | |||||
| * | | | | Basic page reversion implemented. The revert button on the history view ↵ | Andrew Manning | 2016-06-05 | 1 | -0/+35 |
| | | | | | | | | | | | | | | | | | | | | 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/+51 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-04 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| * | | | | | Wiki and page filenames are abstracted from their displayed names. Special ↵ | Andrew Manning | 2016-06-04 | 1 | -20/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | characters do not seem to break things. | ||||
| * | | | | | Created three distinct names for wiki and page that are suitable for URL, ↵ | Andrew Manning | 2016-06-04 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | HTML, and raw display. Implemented in new wiki POST activity only so far. | ||||
| * | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-04 | 2 | -5/+56 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-02 | 39 | -358/+233 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Major corrections to access control and page construction. | Andrew Manning | 2016-06-02 | 1 | -102/+109 |
| | | | | | | | | |||||
| * | | | | | | | Created page history widget to dynamically fetch and display the git commit ↵ | Andrew Manning | 2016-05-30 | 1 | -3/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | history for wiki pages. | ||||
| * | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Replaced wiki item record object field with ActivityStreams information. ↵ | Andrew Manning | 2016-05-30 | 1 | -6/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki git repo path is stored in iconfig instead. | ||||
| * | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-29 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fixed bug in access control. Hide new wiki/page buttons if not channel owner. | Andrew Manning | 2016-05-29 | 1 | -2/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Remove Parsedown library files and remove references. | Andrew Manning | 2016-05-29 | 1 | -2/+0 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Only show wiki delete control if channel owner | Andrew Manning | 2016-05-29 | 1 | -0/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Hide page controls when not owner. Fixed some serious access control issues. | Andrew Manning | 2016-05-29 | 1 | -22/+27 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for ↵ | Andrew Manning | 2016-05-29 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -3/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug with author in wiki item table record. | ||||
| * | | | | | | | | | Git commit made for the page edits when the page is saved. | Andrew Manning | 2016-05-29 | 1 | -2/+13 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Wiki pages can be saved. | Andrew Manning | 2016-05-28 | 1 | -4/+40 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Show page content by default. Hide page controls where appropriate. Fix ↵ | Andrew Manning | 2016-05-28 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sandbox text format. | ||||
| * | | | | | | | | | Page content is loaded from the file on disk | Andrew Manning | 2016-05-28 | 1 | -3/+11 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Wiki page list links work. File content is not yet loaded into the editor. ↵ | Andrew Manning | 2016-05-28 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some logger calls. | ||||
| * | | | | | | | | | Wiki page list is fetched and the page widget is updated | Andrew Manning | 2016-05-28 | 1 | -4/+16 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add new page to wiki and redirect to editor page. | Andrew Manning | 2016-05-27 | 1 | -7/+52 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Check if wiki exists and redirect if it does not | Andrew Manning | 2016-05-27 | 1 | -1/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-27 | 57 | -497/+451 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Delete wiki (in progress) | Andrew Manning | 2016-05-24 | 1 | -7/+45 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | List of wikis populates with links according to observer permissions. | Andrew Manning | 2016-05-21 | 1 | -0/+15 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Successful new wiki git repo and item table record | Andrew Manning | 2016-05-21 | 1 | -11/+14 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Trying to fix wiki branch starting fresh from dev | Andrew Manning | 2016-05-21 | 1 | -0/+113 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | foreach: invalid argument | redmatrix | 2016-06-09 | 2 | -14/+16 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |