aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-212-24/+46
|\
| * code optimisationredmatrix2016-06-201-21/+5
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-202-4/+43
| |\
| | * Merge pull request #429 from anaqreon/wikihubzilla2016-06-211-2/+41
| | |\
| | | * Add formatted heading for revision comparison viewerAndrew Manning2016-06-201-1/+2
| | | * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-201-2/+2
| | | |\
| | | * | Wiki page revision comparison tool with diff displayed in modal dialog. Lever...Andrew Manning2016-06-171-2/+40
| * | | | fix siteinfo plugin listredmatrix2016-06-201-2/+1
| | |_|/ | |/| |
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-201-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' into devMario Vavti2016-06-201-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | missing backslash leading to wsod on xconfig changesMario Vavti2016-06-201-2/+2
| | * | "thing" always showing default url, not that supplied by the thing.redmatrix2016-06-171-2/+2
| | * | translate already imported system appsredmatrix2016-06-151-0/+2
| | * | Apply purify_html to page content before preview and save to prevent JavaScri...Andrew Manning2016-06-121-15/+3
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-181-2/+2
|\| | |
| * | | "thing" always showing default url, not that supplied by the thing.redmatrix2016-06-171-2/+2
| | |/ | |/|
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-162-4/+52
|\| |
| * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-155-9/+151
| |\ \
| | * | translate already imported system appsredmatrix2016-06-151-0/+2
| * | | Rename page feature added. Fixed bug in git commit function and other minor f...Andrew Manning2016-06-151-4/+50
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-154-9/+149
|\ \ \ \ | | |/ / | |/| |
| * | | support cookie auth in Sabre DAVredmatrix2016-06-142-1/+55
| * | | readme for the module directory, also provide an undocumented way to reset th...redmatrix2016-06-142-8/+94
| |/ /
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-1413-80/+86
|\| |
| * | some work to provide propagation and honouring of the item_notshown flag.redmatrix2016-06-131-2/+2
| * | deprecate the item_id table - replace with iconfig. A possibly useful functio...redmatrix2016-06-1312-78/+84
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-132-15/+183
|\| |
| * | Merge pull request #416 from anaqreon/embedphotoshubzilla2016-06-131-0/+180
| |\ \
| | * | Photo embed button with album browser works in new post editor.Andrew Manning2016-06-121-0/+180
| | |/
| * / Apply purify_html to page content before preview and save to prevent JavaScri...Andrew Manning2016-06-121-15/+3
| |/
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-103-0/+455
|\|
| * Merge pull request #410 from anaqreon/wikihubzilla2016-06-103-0/+455
| |\
| | * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-092-5/+9
| | |\
| | * | Revised permissions checks across API and enabled collaborative editing using...Andrew Manning2016-06-081-79/+60
| | * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-085-1/+424
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-074-53/+258
| | |\ \ \
| | * | | | Hide page history viewer when viewing sandboxAndrew Manning2016-06-051-1/+4
| | * | | | Custom commit message available. Improved history viewer and feedback from re...Andrew Manning2016-06-051-1/+10
| | * | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-051-1/+1
| | |\ \ \ \
| | * | | | | Basic page reversion implemented. The revert button on the history view repla...Andrew Manning2016-06-051-0/+35
| | * | | | | Page deletion implemented. Hide the delete button and disallow for Home page.Andrew Manning2016-06-041-4/+51
| | * | | | | 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-041-20/+22
| | * | | | | | Created three distinct names for wiki and page that are suitable for URL, HTM...Andrew Manning2016-06-041-6/+10
| | * | | | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-043-6/+68
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-0248-392/+479
| | |\ \ \ \ \ \ \
| | * | | | | | | | Major corrections to access control and page construction.Andrew Manning2016-06-022-102/+110
| | * | | | | | | | Created page history widget to dynamically fetch and display the git commit h...Andrew Manning2016-05-301-3/+33
| | * | | | | | | | 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-301-6/+12
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 04:42:15 +0000