aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge conflictredmatrix2016-06-191-6/+0
* zot_revision should be string, not float1.8redmatrix2016-06-191-1/+1
* recreate link from the merge kerfuffleredmatrix2016-06-191-0/+1
* Merge branch '1.8RC'redmatrix2016-06-192861-171567/+92849
|\
| * hebrew hstrings.php was emptyredmatrix2016-06-181-0/+2317
| * hebrew updateredmatrix2016-06-183-3548/+1311
| * changelog update for 1.8redmatrix2016-06-171-0/+4
| * "thing" always showing default url, not that supplied by the thing.redmatrix2016-06-171-2/+2
| * Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_mergeredmatrix2016-06-1544-81254/+77509
| |\
| | * All languages up to date as far as they are updated. Added Hebrew (I saw no R...jeroenpraat2016-06-1544-81254/+77509
| * | translate already imported system appsredmatrix2016-06-151-0/+2
| |/
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 17:00:36 +0000