| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-14 | 43 | -158/+223 |
| |\ | |||||
| | * | some work to provide propagation and honouring of the item_notshown flag. | redmatrix | 2016-06-13 | 3 | -10/+25 |
| | | | |||||
| | * | missing iconfig conversion | redmatrix | 2016-06-13 | 1 | -3/+6 |
| | | | |||||
| | * | Merge pull request #418 from anaqreon/wiki | hubzilla | 2016-06-14 | 17 | -1/+21 |
| | |\ | | | | | | | Wiki context help translations DE and ES-ES | ||||
| | | * | Missing space in Spanish translation | Andrew Manning | 2016-06-13 | 1 | -1/+1 |
| | | | | |||||
| | | * | Missing onclick attributes in German translation | Andrew Manning | 2016-06-13 | 1 | -4/+4 |
| | | | | |||||
| | | * | Move Spanish context help translation from es to es-es and make es a symlink ↵ | Andrew Manning | 2016-06-13 | 16 | -1/+1 |
| | | | | | | | | | | | | | to es-es | ||||
| | | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-13 | 5 | -0/+310 |
| | | |\ | |||||
| | | * | | Add DE and ES-ES translations for wiki context help | Andrew Manning | 2016-06-13 | 2 | -0/+20 |
| | | | | | |||||
| | * | | | deprecate the item_id table - replace with iconfig. A possibly useful ↵ | redmatrix | 2016-06-13 | 24 | -145/+172 |
| | | |/ | |/| | | | | | | | 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. | ||||
| * | | | css fixes | Mario Vavti | 2016-06-13 | 1 | -1/+4 |
| | | | | |||||
| * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-13 | 10 | -39/+372 |
| |\| | | |||||
| | * | | Merge pull request #417 from anaqreon/wiki | hubzilla | 2016-06-13 | 1 | -0/+10 |
| | |\| | | | | | | | Wiki context help first draft | ||||
| | | * | Context help for wiki interface | Andrew Manning | 2016-06-12 | 1 | -0/+10 |
| | | | | |||||
| | | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-12 | 1 | -12/+26 |
| | | |\ | |||||
| | | * | | Apply purify_html to page content before preview and save to prevent ↵ | Andrew Manning | 2016-06-12 | 2 | -16/+4 |
| | | | | | | | | | | | | | | | | | JavaScript code injection. | ||||
| | * | | | Merge pull request #416 from anaqreon/embedphotos | hubzilla | 2016-06-13 | 5 | -0/+310 |
| | |\ \ \ | | |_|/ | |/| | | Add embed photos button with album browser to new post editor | ||||
| | | * | | Move javascript functions back to jot-header.tpl | Andrew Manning | 2016-06-12 | 2 | -84/+83 |
| | | | | | |||||
| | | * | | Photo embed button with album browser works in new post editor. | Andrew Manning | 2016-06-12 | 5 | -84/+271 |
| | | | | | |||||
| | | * | | Merge remote-tracking branch 'upstream/dev' into embedphotos | Andrew Manning | 2016-06-12 | 371 | -12578/+14316 |
| | | |\| | |||||
| | | * | | Stashing changes. Not a functional state. | Andrew Manning | 2016-06-09 | 3 | -0/+124 |
| | | | | | |||||
| | * | | | 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 | 2 | -16/+4 |
| | | |/ | |/| | | | | | | | JavaScript code injection. | ||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-06-11 | 6 | -9051/+9048 |
| | |\ \ | |||||
| | * | | | 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 | 6 | -9051/+9048 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | css fixes | Mario Vavti | 2016-06-11 | 2 | -10/+1 |
| | | | | | |||||
| | * | | | es_ES and NL string for 1.8RC. Hopefully I'm doing it right. | jeroenpraat | 2016-06-11 | 4 | -9041/+9047 |
| | | | | | |||||
| | * | | | Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC | jeroenpraat | 2016-06-11 | 0 | -0/+0 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | iconfig sharing not set correctly | redmatrix | 2016-06-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-11 | 2 | -2/+2 |
| |\| | | | |||||
| | * | | | iconfig sharing not set correctly | redmatrix | 2016-06-10 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | move dev forward | redmatrix | 2016-06-10 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 354 | -18/+1687 |
| |\| | | |||||
| | * | | changelog update | redmatrix | 2016-06-10 | 1 | -0/+2 |
| | | | | |||||
| | * | | Merge pull request #410 from anaqreon/wiki | hubzilla | 2016-06-10 | 353 | -18/+1685 |
| | |\ \ | | | | | | | | | Wiki module: first iteration | ||||
| | | * \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-09 | 5 | -21/+21 |
| | | |\ \ | |||||
| | | * | | | Revised permissions checks across API and enabled collaborative editing ↵ | Andrew Manning | 2016-06-08 | 2 | -81/+71 |
| | | | | | | | | | | | | | | | | | | | | | using the write_pages per-channel permission. | ||||
| | | * | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-08 | 8 | -372/+449 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | | Javascript only allows saving a page if the content has changed. | Andrew Manning | 2016-06-07 | 1 | -2/+11 |
| | | | | | | |||||
| | | * | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-07 | 13 | -252/+315 |
| | | |\ \ \ | |||||
| | | * | | | | Hide page history viewer when viewing sandbox | Andrew Manning | 2016-06-05 | 2 | -3/+6 |
| | | | | | | | |||||
| | | * | | | | Remove debugging logger statements | Andrew Manning | 2016-06-05 | 2 | -4/+0 |
| | | | | | | | |||||
| | | * | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 5 | -5772/+5649 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Custom commit message available. Improved history viewer and feedback from ↵ | Andrew Manning | 2016-06-05 | 3 | -7/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert buttons. | ||||
| | | * | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 7 | -21/+27 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Basic page reversion implemented. The revert button on the history view ↵ | Andrew Manning | 2016-06-05 | 4 | -3/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -8/+99 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-04 | 1 | -3/+3 |
| | | |\ \ \ \ \ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |