| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-22 | 6 | -7/+751 |
| |\ | |||||
| | * | provide a skeleton of the current CalDAVClient with lots of notes about how ↵ | redmatrix | 2016-06-21 | 1 | -0/+739 |
| | | | | | | | | | best to move forward just in case anybody is feeling ambitious or anxious. | ||||
| | * | channel homepage not providing content when javascript disabled | redmatrix | 2016-06-21 | 1 | -0/+3 |
| | | | |||||
| | * | 1. provide automatic relocation of important links in items that are ↵ | redmatrix | 2016-06-21 | 4 | -7/+9 |
| | | | | | | | | | | | | | | | imported or synced to clones 2. provide framework for custom curl request bodies using custom/non-standard request methods. This was a real nightmare because curl doesn't actually let you specify a string to send as the request body (except when doing POST). You have to treat it as a file upload using a custom file handler function which provides the actual content in chunks as if it were buffered I/O. 3. item_store and item_store_update now return the item that was stored | ||||
| * | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-21 | 2 | -24/+46 |
| |\| | |||||
| | * | code optimisation | redmatrix | 2016-06-20 | 1 | -21/+5 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-06-20 | 2 | -4/+43 |
| | |\ | |||||
| | | * | Merge pull request #429 from anaqreon/wiki | hubzilla | 2016-06-21 | 1 | -2/+41 |
| | | |\ | | | | | | | | | Wiki page revision comparison viewer | ||||
| | | | * | Add formatted heading for revision comparison viewer | Andrew Manning | 2016-06-20 | 1 | -1/+2 |
| | | | | | |||||
| | | | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-20 | 1 | -2/+2 |
| | | | |\ | |||||
| | | | * | | Wiki page revision comparison tool with diff displayed in modal dialog. ↵ | Andrew Manning | 2016-06-17 | 1 | -2/+40 |
| | | | | | | | | | | | | | | | | | | | | | Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode | ||||
| | * | | | | fix siteinfo plugin list | redmatrix | 2016-06-20 | 1 | -2/+1 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Merge branch 'master' into dev | Mario Vavti | 2016-06-20 | 1 | -2/+2 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | missing backslash leading to wsod on xconfig changes | Mario Vavti | 2016-06-20 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | "thing" always showing default url, not that supplied by the thing. | redmatrix | 2016-06-17 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | translate already imported system apps | redmatrix | 2016-06-15 | 1 | -0/+2 |
| | | | | | |||||
| | | * | | Apply purify_html to page content before preview and save to prevent ↵ | Andrew Manning | 2016-06-12 | 1 | -15/+3 |
| | | | | | | | | | | | | | | | | | JavaScript code injection. | ||||
| * | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-18 | 1 | -2/+2 |
| |\| | | | |||||
| | * | | | "thing" always showing default url, not that supplied by the thing. | redmatrix | 2016-06-17 | 1 | -2/+2 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 2 | -4/+52 |
| |\| | | |||||
| | * | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-15 | 5 | -9/+151 |
| | |\ \ | |||||
| | | * | | translate already imported system apps | redmatrix | 2016-06-15 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | Rename page feature added. Fixed bug in git commit function and other minor ↵ | Andrew Manning | 2016-06-15 | 1 | -4/+50 |
| | | | | | | | | | | | | | | | | | fixes. | ||||
| * | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-15 | 4 | -9/+149 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | support cookie auth in Sabre DAV | redmatrix | 2016-06-14 | 2 | -1/+55 |
| | | | | | |||||
| | * | | | readme for the module directory, also provide an undocumented way to reset ↵ | redmatrix | 2016-06-14 | 2 | -8/+94 |
| | |/ / | | | | | | | | | | the timestamp on connection photos to force a refresh without messing with the database directly. | ||||
| * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-14 | 13 | -80/+86 |
| |\| | | |||||
| | * | | some work to provide propagation and honouring of the item_notshown flag. | redmatrix | 2016-06-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | deprecate the item_id table - replace with iconfig. A possibly useful ↵ | redmatrix | 2016-06-13 | 12 | -78/+84 |
| | | | | | | | | | | | | | function in the iconfig class would be a search which takes a service id and type and uid, matches against an item and returns the iid. That could save a bit of code duplication. | ||||
| * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-13 | 2 | -15/+183 |
| |\| | | |||||
| | * | | Merge pull request #416 from anaqreon/embedphotos | hubzilla | 2016-06-13 | 1 | -0/+180 |
| | |\ \ | | | | | | | | | Add embed photos button with album browser to new post editor | ||||
| | | * | | Photo embed button with album browser works in new post editor. | Andrew Manning | 2016-06-12 | 1 | -0/+180 |
| | | |/ | |||||
| | * / | Apply purify_html to page content before preview and save to prevent ↵ | Andrew Manning | 2016-06-12 | 1 | -15/+3 |
| | |/ | | | | | | | JavaScript code injection. | ||||
| * | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 3 | -0/+455 |
| |\| | |||||
| | * | Merge pull request #410 from anaqreon/wiki | hubzilla | 2016-06-10 | 3 | -0/+455 |
| | |\ | | | | | | | Wiki module: first iteration | ||||
| | | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-09 | 2 | -5/+9 |
| | | |\ | |||||
| | | * | | Revised permissions checks across API and enabled collaborative editing ↵ | Andrew Manning | 2016-06-08 | 1 | -79/+60 |
| | | | | | | | | | | | | | | | | | using the write_pages per-channel permission. | ||||
| | | * | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-08 | 5 | -1/+424 |
| | | |\ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-07 | 4 | -53/+258 |
| | | |\ \ \ | |||||
| | | * | | | | Hide page history viewer when viewing sandbox | Andrew Manning | 2016-06-05 | 1 | -1/+4 |
| | | | | | | | |||||
| | | * | | | | Custom commit message available. Improved history viewer and feedback from ↵ | Andrew Manning | 2016-06-05 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | revert buttons. | ||||
| | | * | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Basic page reversion implemented. The revert button on the history view ↵ | Andrew Manning | 2016-06-05 | 1 | -0/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -4/+51 |
| | | | | | | | | |||||
| | | * | | | | | 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 | 1 | -20/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -6/+68 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-02 | 48 | -392/+479 |
| | | |\ \ \ \ \ \ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |