Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | 1. string update, 2. pretty print json blobs | redmatrix | 2016-06-17 | 3 | -1080/+1151 | |
|/ / / / / / / | ||||||
* | | | / / / | core changes to better support media migrations | redmatrix | 2016-06-16 | 3 | -8/+33 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | 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 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | 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 f... | Andrew Manning | 2016-06-15 | 3 | -14/+136 | |
* | | | | | | | | This was the reason for the large line widths - an extra linefeed after each ... | redmatrix | 2016-06-15 | 2 | -4/+1 | |
* | | | | | | | | provide syntax based [colour] highlighting on code blocks for popular languag... | redmatrix | 2016-06-15 | 55 | -0/+23433 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | translate already imported system apps | redmatrix | 2016-06-15 | 1 | -0/+2 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | 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 | |
| |\| | | | | | ||||||
| | * | | | | | 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 th... | redmatrix | 2016-06-14 | 2 | -8/+94 | |
|/ / / / / / | ||||||
* | | | | | | 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 | |
|\| | | | | | ||||||
| * | | | | | 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 | |
| * | | | | | 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 functio... | redmatrix | 2016-06-13 | 24 | -145/+172 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #417 from anaqreon/wiki | hubzilla | 2016-06-13 | 1 | -0/+10 | |
|\| | | | | ||||||
| * | | | | 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 JavaScri... | Andrew Manning | 2016-06-12 | 2 | -16/+4 | |
* | | | | | | Merge pull request #416 from anaqreon/embedphotos | hubzilla | 2016-06-13 | 5 | -0/+310 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | 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 JavaScri... | Andrew Manning | 2016-06-12 | 2 | -16/+4 | |
| |/ / / / |/| | | | | ||||||
* | | | | | 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 | |
| |\ \ \ \ | ||||||
| | * | | | | iconfig sharing not set correctly | redmatrix | 2016-06-10 | 1 | -1/+1 |