Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | remove debugging | redmatrix | 2016-06-11 | 1 | -1/+0 | |
| * | | | Work supporting issue #411, add an optional priority (int) as a second arg to... | redmatrix | 2016-06-11 | 1 | -11/+23 | |
* | | | | 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 '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 | |
* | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-11 | 2 | -2/+2 | |
|\| | | | ||||||
| * | | | iconfig sharing not set correctly | redmatrix | 2016-06-10 | 1 | -1/+1 | |
| * | | | move dev forward | redmatrix | 2016-06-10 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 354 | -18/+1687 | |
|\| | | ||||||
| * | | changelog update | redmatrix | 2016-06-10 | 1 | -0/+2 | |
| * | | Merge pull request #410 from anaqreon/wiki | hubzilla | 2016-06-10 | 353 | -18/+1685 | |
| |\ \ | ||||||
| | * \ | 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 using... | Andrew Manning | 2016-06-08 | 2 | -81/+71 | |
| | * | | | 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 re... | Andrew Manning | 2016-06-05 | 3 | -7/+32 | |
| | * | | | | | 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 repla... | Andrew Manning | 2016-06-05 | 4 | -3/+93 | |
| | * | | | | | | 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 ch... | Andrew Manning | 2016-06-04 | 6 | -48/+62 | |
| | * | | | | | | | Created three distinct names for wiki and page that are suitable for URL, HTM... | Andrew Manning | 2016-06-04 | 2 | -20/+52 | |
| | * | | | | | | | 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 h... | Andrew Manning | 2016-05-30 | 5 | -10/+107 | |
| | * | | | | | | | | | 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. Wiki... | Andrew Manning | 2016-05-30 | 4 | -72/+53 | |
| | * | | | | | | | | | | 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 p... | Andrew Manning | 2016-05-29 | 5 | -6/+28 | |
| | * | | | | | | | | | | | 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 | |
| | * | | | | | | | | | | | 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 sandb... | Andrew Manning | 2016-05-28 | 2 | -8/+18 | |
| | * | | | | | | | | | | | | 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. Re... | Andrew Manning | 2016-05-28 | 4 | -12/+25 | |
| | * | | | | | | | | | | | | 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 |