| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-26 | 1 | -21/+25 |
| |\ | |||||
| | * | A page name wrapped in double brackets is converted into a link to another ↵ | Andrew Manning | 2016-06-25 | 1 | -4/+11 |
| | | | | | | | | | page in the current wiki | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-25 | 12 | -81/+261 |
| | |\ | |||||
| | * | | Post generation about new wiki is optional, default is NOT to post. Fixed ↵ | Andrew Manning | 2016-06-25 | 1 | -17/+14 |
| | | | | | | | | | | | | | bug in wiki creation. Added embed image dialog and album browser. | ||||
| * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-24 | 11 | -73/+244 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | fix pdledit "list layouts" | redmatrix | 2016-06-24 | 1 | -5/+5 |
| | | | | |||||
| | * | | SuperCurl to provide a re-usable curl options stack and just change options ↵ | redmatrix | 2016-06-23 | 2 | -1/+112 |
| | | | | | | | | | | | | | that are different from one call to the next | ||||
| | * | | change AbConfig to use channel_id instead of channel_hash; which was a ↵ | redmatrix | 2016-06-23 | 4 | -20/+19 |
| | | | | | | | | | | | | | mistake in retrospect | ||||
| | * | | relocate the cache class | redmatrix | 2016-06-23 | 1 | -0/+46 |
| | | | | |||||
| | * | | code cleanup for profile_photos | redmatrix | 2016-06-23 | 4 | -47/+62 |
| | | | | |||||
| * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-23 | 2 | -10/+19 |
| |\| | | |||||
| | * | | set profile when "use existing photo" | redmatrix | 2016-06-22 | 1 | -4/+14 |
| | | | | |||||
| | * | | missing class selector when "use photo as profile photo" | redmatrix | 2016-06-22 | 1 | -1/+1 |
| | | | | |||||
| | * | | db statement debugging | redmatrix | 2016-06-22 | 2 | -5/+4 |
| | |/ | |||||
| * | | 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 | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |