| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/dev' into dev | Andrew Manning | 2016-06-16 | 73 | -553/+25128 |
| |\ | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-06-16 | 13 | -536/+1539 |
| | |\ | |||||
| | | * | show month view in full height in fullscreen view | Mario Vavti | 2016-06-16 | 2 | -0/+40 |
| | | | | |||||
| | | * | fix scrollbars | Mario Vavti | 2016-06-16 | 2 | -0/+8 |
| | | | | |||||
| | | * | update 3rd party lib fullcalendar to version 2.7.3 | Mario Vavti | 2016-06-16 | 9 | -536/+1491 |
| | | | | |||||
| | * | | code comments | redmatrix | 2016-06-15 | 1 | -0/+5 |
| | |/ | |||||
| | * | 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 |
| | | | |||||
| | * | improve readability of comments | redmatrix | 2016-06-15 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #422 from anaqreon/wiki | hubzilla | 2016-06-16 | 3 | -14/+136 |
| | |\ | | | | | | | Wiki rename page feature added. Bug fixes related to git commits. | ||||
| | | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-15 | 7 | -10/+162 |
| | | |\ | |||||
| | | * | | Rename page feature added. Fixed bug in git commit function and other minor ↵ | Andrew Manning | 2016-06-15 | 3 | -14/+136 |
| | | | | | | | | | | | | | | | | | fixes. | ||||
| | * | | | This was the reason for the large line widths - an extra linefeed after each ↵ | redmatrix | 2016-06-15 | 2 | -4/+1 |
| | | | | | | | | | | | | | | | | | li element | ||||
| | * | | | provide syntax based [colour] highlighting on code blocks for popular ↵ | redmatrix | 2016-06-15 | 55 | -0/+23433 |
| | | |/ | |/| | | | | | | | 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. | ||||
| | * | | translate already imported system apps | redmatrix | 2016-06-15 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/dev' into dev | Andrew Manning | 2016-06-15 | 35 | -167/+392 |
| |\| | | |||||
| | * | | add new connection to default group when auto-accepted | redmatrix | 2016-06-15 | 2 | -1/+11 |
| | | | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-06-14 | 2 | -1/+11 |
| | |\ \ | |||||
| | | * | | Merge pull request #419 from anaqreon/wiki | hubzilla | 2016-06-15 | 2 | -1/+11 |
| | | |\| | | | | | | | | | Wiki context help translations IT and ES-ES | ||||
| | | | * | Fix Spanish wiki translation | Andrew Manning | 2016-06-14 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-14 | 26 | -157/+202 |
| | | | |\ | | | |/ | | |/| | |||||
| | | | * | Add Italian wiki context help translation | Andrew Manning | 2016-06-14 | 1 | -0/+10 |
| | | | | | |||||
| | * | | | 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. | ||||
| | * | | 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. | ||||
| * / | | Move Spanish context help translation from es to es-es and make es a symlink ↵ | Andrew Manning | 2016-06-13 | 15 | -1/+1 |
| |/ / | | | | | | | to es-es | ||||
| * | | 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 |
| |\ \ | |||||
| | * | | 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 |
| | |\ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |