aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_mergeredmatrix2016-06-152-5529/+5467
|\
| * Merge pull request #420 from phellmes/de20160615Jeroen van Riet Paap2016-06-152-5529/+5467
| |\
| | * Update DE translation stringsphellmes2016-06-152-5529/+5467
| |/
* / add new connection to default group when auto-acceptedredmatrix2016-06-152-1/+11
|/
* DB schema issue with importredmatrix2016-06-121-12/+26
* Merge pull request #414 from anaqreon/1.8RChubzilla2016-06-132-16/+4
|\
| * Apply purify_html to page content before preview and save to prevent JavaScri...Andrew Manning2016-06-122-16/+4
|/
* css fixesMario Vavti2016-06-112-10/+1
* es_ES and NL string for 1.8RC. Hopefully I'm doing it right.jeroenpraat2016-06-114-9041/+9047
* Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RCjeroenpraat2016-06-110-0/+0
|\
| * iconfig sharing not set correctlyredmatrix2016-06-101-1/+1
* | iconfig sharing not set correctlyredmatrix2016-06-101-1/+1
* | move dev forwardredmatrix2016-06-101-1/+1
|/
* changelog updateredmatrix2016-06-101-0/+2
* Merge pull request #410 from anaqreon/wikihubzilla2016-06-10353-18/+1685
|\
| * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-095-21/+21
| |\
| * | Revised permissions checks across API and enabled collaborative editing using...Andrew Manning2016-06-082-81/+71
| * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-088-372/+449
| |\ \
| * | | 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-0713-252/+315
| |\ \ \
| * | | | Hide page history viewer when viewing sandboxAndrew Manning2016-06-052-3/+6
| * | | | Remove debugging logger statementsAndrew Manning2016-06-052-4/+0
| * | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-055-5772/+5649
| |\ \ \ \
| * | | | | Custom commit message available. Improved history viewer and feedback from re...Andrew Manning2016-06-053-7/+32
| * | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-057-21/+27
| |\ \ \ \ \
| * | | | | | Basic page reversion implemented. The revert button on the history view repla...Andrew Manning2016-06-054-3/+93
| * | | | | | Page deletion implemented. Hide the delete button and disallow for Home page.Andrew Manning2016-06-043-8/+99
| * | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-041-3/+3
| |\ \ \ \ \ \
| * | | | | | | Wiki and page filenames are abstracted from their displayed names. Special ch...Andrew Manning2016-06-046-48/+62
| * | | | | | | Created three distinct names for wiki and page that are suitable for URL, HTM...Andrew Manning2016-06-042-20/+52
| * | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-041844-458/+517
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-02428-56247/+1158
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Major corrections to access control and page construction.Andrew Manning2016-06-027-120/+135
| * | | | | | | | | Created page history widget to dynamically fetch and display the git commit h...Andrew Manning2016-05-305-10/+107
| * | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-301-1/+1
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Replaced wiki item record object field with ActivityStreams information. Wiki...Andrew Manning2016-05-304-72/+53
| * | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-294-4/+6
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed bug in access control. Hide new wiki/page buttons if not channel owner.Andrew Manning2016-05-293-7/+3
| * | | | | | | | | | | Remove Parsedown library files and remove references.Andrew Manning2016-05-29113-2702/+0
| * | | | | | | | | | | Only show wiki delete control if channel ownerAndrew Manning2016-05-294-7/+16
| * | | | | | | | | | | Hide page controls when not owner. Fixed some serious access control issues.Andrew Manning2016-05-291-22/+27
| * | | | | | | | | | | Hacked Parsedown and Markdown to add class inline-code to <code> blocks for p...Andrew Manning2016-05-295-6/+28
| * | | | | | | | | | | Fixed bug where page file was not loaded because of urlencoding/urldecodingAndrew Manning2016-05-291-1/+1
| * | | | | | | | | | | Home page create with new wiki. URL redirects here when no page given. Fixed ...Andrew Manning2016-05-292-4/+18
| * | | | | | | | | | | Git commit made for the page edits when the page is saved.Andrew Manning2016-05-293-5/+62
| * | | | | | | | | | | Wiki pages can be saved.Andrew Manning2016-05-283-6/+83
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-05-285-2123/+2151
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Show page content by default. Hide page controls where appropriate. Fix sandb...Andrew Manning2016-05-282-8/+18
| * | | | | | | | | | | | Page content is loaded from the file on diskAndrew Manning2016-05-283-4/+35
| * | | | | | | | | | | | Wiki page list links work. File content is not yet loaded into the editor. Re...Andrew Manning2016-05-284-12/+25
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 21:09:27 +0000