| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-21 | 5 | -12/+53 |
| |\ | |||||
| | * | make sure the optimisations are reliable | redmatrix | 2016-06-20 | 1 | -1/+1 |
| | | | |||||
| | * | code optimisation | redmatrix | 2016-06-20 | 3 | -9/+8 |
| | | | |||||
| | * | update attach on import if exists | redmatrix | 2016-06-20 | 1 | -2/+2 |
| | | | |||||
| | * | Merge pull request #429 from anaqreon/wiki | hubzilla | 2016-06-21 | 1 | -1/+43 |
| | |\ | | | | | | | Wiki page revision comparison viewer | ||||
| | | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-20 | 6 | -13/+25 |
| | | |\ | |||||
| | | * \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-17 | 3 | -8/+33 |
| | | |\ \ | |||||
| | | * | | | Wiki page revision comparison tool with diff displayed in modal dialog. ↵ | Andrew Manning | 2016-06-17 | 1 | -1/+43 |
| | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 1 | -1/+1 |
| |\| | | | | |||||
| | * | | | | Merge branch 'master' into dev | Mario Vavti | 2016-06-20 | 1 | -1/+1 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | | * | | | Merge branch '1.8RC' | redmatrix | 2016-06-19 | 75 | -8346/+2856 |
| | | |\ \ \ | |||||
| | | | * | | | add new connection to default group when auto-accepted | redmatrix | 2016-06-15 | 2 | -1/+11 |
| | | | | | | | |||||
| | | | * | | | DB schema issue with import | redmatrix | 2016-06-12 | 1 | -12/+26 |
| | | | | | | | |||||
| | | | * | | | Apply purify_html to page content before preview and save to prevent ↵ | Andrew Manning | 2016-06-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | JavaScript code injection. | ||||
| | | * | | | | When picktime is false, close date selector on date select | Oda | 2016-06-18 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | issue #386 (master) | redmatrix | 2016-05-16 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | issue #383 | redmatrix | 2016-05-14 | 1 | -1/+0 |
| | | | | | | | |||||
| | | * | | | | SECURITY: edited comment to private post loses privacy info. Not visible in ↵ | redmatrix | 2016-05-12 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | stream but may be visible in feeds | ||||
| * | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 2 | -11/+16 |
| |\| | | | | | |||||
| | * | | | | | Don't use count() to check DB results | redmatrix | 2016-06-19 | 2 | -11/+16 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-18 | 4 | -2/+9 |
| |\| | | | | | |||||
| | * | | | | | the text link to a thing will take you to the local thing page, both as a ↵ | redmatrix | 2016-06-17 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | link for editing and as a destination in case there is no thing photo. If there's a photo, the photo link will take you to the thing URL. | ||||
| | * | | | | | 1. string update, 2. pretty print json blobs | redmatrix | 2016-06-17 | 2 | -1/+7 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-17 | 4 | -8/+38 |
| |\| | | | | |||||
| | * | | | | core changes to better support media migrations | redmatrix | 2016-06-16 | 3 | -8/+33 |
| | | |_|/ | |/| | | |||||
| | * | | | code comments | redmatrix | 2016-06-15 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 4 | -12/+114 |
| |\| | | | |||||
| | * | | | custom request methods for curl | redmatrix | 2016-06-15 | 1 | -3/+13 |
| | | | | | |||||
| | * | | | provide a default for undefined languages | redmatrix | 2016-06-15 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | ignore case in language names and add 'js' as an alias for 'javascript' | redmatrix | 2016-06-15 | 2 | -4/+6 |
| | | | | | |||||
| | * | | | Merge pull request #422 from anaqreon/wiki | hubzilla | 2016-06-16 | 1 | -9/+46 |
| | |\ \ \ | | | | | | | | | | | Wiki rename page feature added. Bug fixes related to git commits. | ||||
| | | * \ \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-15 | 2 | -1/+11 |
| | | |\ \ \ | |||||
| | | * | | | | Rename page feature added. Fixed bug in git commit function and other minor ↵ | Andrew Manning | 2016-06-15 | 1 | -9/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | fixes. | ||||
| | * | | | | | This was the reason for the large line widths - an extra linefeed after each ↵ | redmatrix | 2016-06-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | li element | ||||
| | * | | | | | provide syntax based [colour] highlighting on code blocks for popular ↵ | redmatrix | 2016-06-15 | 2 | -0/+52 |
| | | |/ / / | |/| | | | | | | | | | | | | | languages. I'm not happy with the line height on the list elements but couldn't see where this was defaulted. This uses the syntax [code=xxx]some code snippet[/code], where xxx represents a code/language style - with about 18 builtins. | ||||
| * | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-15 | 2 | -1/+11 |
| |\| | | | | |||||
| | * | | | | add new connection to default group when auto-accepted | redmatrix | 2016-06-15 | 2 | -1/+11 |
| | |/ / / | |||||
| * | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-14 | 11 | -75/+101 |
| |\| | | | |||||
| | * | | | some work to provide propagation and honouring of the item_notshown flag. | redmatrix | 2016-06-13 | 2 | -8/+23 |
| | | | | | |||||
| | * | | | missing iconfig conversion | redmatrix | 2016-06-13 | 1 | -3/+6 |
| | | | | | |||||
| | * | | | deprecate the item_id table - replace with iconfig. A possibly useful ↵ | redmatrix | 2016-06-13 | 10 | -65/+73 |
| | | | | | | | | | | | | | | | | | 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 | 4 | -24/+61 |
| |\| | | | |||||
| | * | | | Merge pull request #416 from anaqreon/embedphotos | hubzilla | 2016-06-13 | 1 | -0/+12 |
| | |\ \ \ | | | | | | | | | | | Add embed photos button with album browser to new post editor | ||||
| | | * \ \ | Merge remote-tracking branch 'upstream/dev' into embedphotos | Andrew Manning | 2016-06-12 | 5 | -12/+499 |
| | | |\ \ \ | |||||
| | | * | | | | Stashing changes. Not a functional state. | Andrew Manning | 2016-06-09 | 1 | -0/+12 |
| | | | | | | | |||||
| | * | | | | | DB schema issue with import | redmatrix | 2016-06-12 | 1 | -12/+26 |
| | | | | | | | |||||
| | * | | | | | Apply purify_html to page content before preview and save to prevent ↵ | Andrew Manning | 2016-06-12 | 1 | -1/+1 |
| | | |/ / / | |/| | | | | | | | | | | | | | JavaScript code injection. | ||||
| | * | | | | remove debugging | redmatrix | 2016-06-11 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | Work supporting issue #411, add an optional priority (int) as a second arg ↵ | redmatrix | 2016-06-11 | 1 | -11/+23 |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | to head_add_js to affect the load ordering, larger numbered priorities will be included after lower numbered ones. Default priority is 0.Note that we treat main.js differently and always add main.js to the page last, regardless of any other ordering. | ||||
| * | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-11 | 1 | -1/+1 |
| |\| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |