| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC | jeroenpraat | 2016-06-11 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | iconfig sharing not set correctly | redmatrix | 2016-06-10 | 1 | -1/+1 | |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | remove debugging | redmatrix | 2016-06-11 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Work supporting issue #411, add an optional priority (int) as a second arg ↵ | redmatrix | 2016-06-11 | 1 | -11/+23 | |
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to head_add_js to affect the load ordering, larger numbered priorities will be included after lower numbered ones. Default priority is 0.Note that we treat main.js differently and always add main.js to the page last, regardless of any other ordering. | |||||
| * | | | | | | | | | | | | | | | | | iconfig sharing not set correctly | redmatrix | 2016-06-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | move dev forward | redmatrix | 2016-06-10 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | changelog update | redmatrix | 2016-06-10 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | Merge pull request #410 from anaqreon/wiki | hubzilla | 2016-06-10 | 353 | -18/+1685 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | Wiki module: first iteration | |||||
| | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-09 | 5 | -21/+21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | Revised permissions checks across API and enabled collaborative editing ↵ | Andrew Manning | 2016-06-08 | 2 | -81/+71 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using the write_pages per-channel permission. | |||||
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-08 | 8 | -372/+449 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | 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 | 13 | -252/+315 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | Hide page history viewer when viewing sandbox | Andrew Manning | 2016-06-05 | 2 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | Remove debugging logger statements | Andrew Manning | 2016-06-05 | 2 | -4/+0 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 5 | -5772/+5649 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | Custom commit message available. Improved history viewer and feedback from ↵ | Andrew Manning | 2016-06-05 | 3 | -7/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert buttons. | |||||
| | * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 7 | -21/+27 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Basic page reversion implemented. The revert button on the history view ↵ | Andrew Manning | 2016-06-05 | 4 | -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 Manning | 2016-06-04 | 3 | -8/+99 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | 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 | 6 | -48/+62 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -20/+52 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1844 | -458/+517 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-02 | 428 | -56247/+1158 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | Major corrections to access control and page construction. | Andrew Manning | 2016-06-02 | 7 | -120/+135 | |
| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | Created page history widget to dynamically fetch and display the git commit ↵ | Andrew Manning | 2016-05-30 | 5 | -10/+107 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -72/+53 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki git repo path is stored in iconfig instead. | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-29 | 4 | -4/+6 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Fixed bug in access control. Hide new wiki/page buttons if not channel owner. | Andrew Manning | 2016-05-29 | 3 | -7/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Remove Parsedown library files and remove references. | Andrew Manning | 2016-05-29 | 113 | -2702/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Only show wiki delete control if channel owner | Andrew Manning | 2016-05-29 | 4 | -7/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -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/urldecoding | Andrew Manning | 2016-05-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Home page create with new wiki. URL redirects here when no page given. Fixed ↵ | Andrew Manning | 2016-05-29 | 2 | -4/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -5/+62 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Wiki pages can be saved. | Andrew Manning | 2016-05-28 | 3 | -6/+83 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-28 | 5 | -2123/+2151 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Show page content by default. Hide page controls where appropriate. Fix ↵ | Andrew Manning | 2016-05-28 | 2 | -8/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sandbox text format. | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | Page content is loaded from the file on disk | Andrew Manning | 2016-05-28 | 3 | -4/+35 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Wiki page list links work. File content is not yet loaded into the editor. ↵ | Andrew Manning | 2016-05-28 | 4 | -12/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some logger calls. | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | Wiki page list is fetched and the page widget is updated | Andrew Manning | 2016-05-28 | 5 | -15/+81 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Add new page to wiki and redirect to editor page. | Andrew Manning | 2016-05-27 | 3 | -13/+120 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Check if wiki exists and redirect if it does not | Andrew Manning | 2016-05-27 | 2 | -1/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Wiki deletion works | Andrew Manning | 2016-05-27 | 2 | -6/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-05-27 | 152 | -5312/+4411 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Delete wiki (in progress) | Andrew Manning | 2016-05-24 | 4 | -19/+89 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | List of wikis populates with links according to observer permissions. | Andrew Manning | 2016-05-21 | 5 | -13/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |