Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-21 | 2 | -14/+80 |
|\ | |||||
| * | Merge pull request #429 from anaqreon/wiki | hubzilla | 2016-06-21 | 2 | -14/+80 |
| |\ | | | | | | | Wiki page revision comparison viewer | ||||
| | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-20 | 11 | -2/+21514 |
| | |\ | |||||
| | * | | Do not change active page commit until user reverts the page | Andrew Manning | 2016-06-20 | 1 | -1/+2 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-17 | 3 | -3/+8 |
| | |\ \ | |||||
| | * | | | Wiki page revision comparison tool with diff displayed in modal dialog. ↵ | Andrew Manning | 2016-06-17 | 2 | -14/+79 |
| | | | | | | | | | | | | | | | | | | | | 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 | 37 | -86783/+61544 |
|\| | | | | |||||
| * | | | | Merge branch 'master' into dev | Mario Vavti | 2016-06-20 | 37 | -86783/+61544 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | hebrew hstrings.php was empty | redmatrix | 2016-06-18 | 1 | -0/+2317 |
| | | | | | |||||
| | * | | | hebrew update | redmatrix | 2016-06-18 | 3 | -3548/+1311 |
| | | | | | |||||
| | * | | | All languages up to date as far as they are updated. Added Hebrew (I saw no ↵ | jeroenpraat | 2016-06-15 | 44 | -81254/+77509 |
| | | | | | | | | | | | | | | | | | | | | RTL on my browser, but maybe that's a locale setting or else it's not yet implemented in HZ). Removed Esperanto and Czech (they where old ones from Friendica and are not on Transifex (yet)). | ||||
| | * | | | Update DE translation strings | phellmes | 2016-06-15 | 2 | -5529/+5467 |
| | | | | | |||||
* | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | experimental rtl support; this will probably require a fair bit of work. | redmatrix | 2016-06-19 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | return something so we can make a conclusion | Mario Vavti | 2016-06-19 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-19 | 9 | -0/+21512 |
|\| | | | | |||||
| * | | | | hebrew hstrings.php was empty | redmatrix | 2016-06-18 | 1 | -0/+2317 |
| | | | | | |||||
| * | | | | hebrew translation | root | 2016-06-18 | 9 | -0/+19195 |
| | | | | | |||||
* | | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-18 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | the text link to a thing will take you to the local thing page, both as a ↵ | redmatrix | 2016-06-17 | 1 | -1/+1 |
| | |_|/ | |/| | | | | | | | | | | 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. | ||||
* | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-17 | 3 | -3/+8 |
|\| | | | |||||
| * | | | only use height: auto for week and day view | Mario Vavti | 2016-06-17 | 3 | -3/+8 |
| | |/ | |/| | |||||
* | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 2 | -0/+40 |
|\| | | |||||
| * | | show month view in full height in fullscreen view | Mario Vavti | 2016-06-16 | 2 | -0/+40 |
| | | | |||||
* | | | mrge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 2 | -0/+8 |
|\| | | |||||
| * | | fix scrollbars | Mario Vavti | 2016-06-16 | 2 | -0/+8 |
| | | | |||||
* | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-16 | 2 | -1/+41 |
|\| | | |||||
| * | | Merge pull request #422 from anaqreon/wiki | hubzilla | 2016-06-16 | 1 | -1/+40 |
| |\ \ | | | | | | | | | Wiki rename page feature added. Bug fixes related to git commits. | ||||
| | * | | Rename page feature added. Fixed bug in git commit function and other minor ↵ | Andrew Manning | 2016-06-15 | 1 | -1/+40 |
| | | | | | | | | | | | | | | | | fixes. | ||||
| * | | | provide syntax based [colour] highlighting on code blocks for popular ↵ | redmatrix | 2016-06-15 | 1 | -0/+1 |
| |/ / | | | | | | | | | | 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. | ||||
* | | | css fix | Mario Vavti | 2016-06-14 | 1 | -0/+1 |
| | | | |||||
* | | | css fixes | Mario Vavti | 2016-06-13 | 1 | -1/+4 |
| | | | |||||
* | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-13 | 3 | -0/+118 |
|\| | | |||||
| * | | 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 | 4 | -84/+91 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/dev' into embedphotos | Andrew Manning | 2016-06-12 | 12 | -9060/+9371 |
| |\| | |||||
| * | | Stashing changes. Not a functional state. | Andrew Manning | 2016-06-09 | 2 | -0/+112 |
| | | | |||||
* | | | 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 'dev' into sabre32 | Mario Vavti | 2016-06-10 | 6 | -1/+331 |
|\| | | |||||
| * | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-09 | 1 | -16/+0 |
| |\ \ | |||||
| * | | | 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 | 3 | -5/+5 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Hide page history viewer when viewing sandbox | Andrew Manning | 2016-06-05 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 4 | -5772/+5642 |
| |\ \ \ | |||||
| * | | | | Custom commit message available. Improved history viewer and feedback from ↵ | Andrew Manning | 2016-06-05 | 2 | -6/+22 |
| | | | | | | | | | | | | | | | | | | | | revert buttons. | ||||
| * | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-05 | 1 | -0/+5 |
| |\ \ \ \ | |||||
| * | | | | | Basic page reversion implemented. The revert button on the history view ↵ | Andrew Manning | 2016-06-05 | 2 | -2/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -4/+30 |
| | | | | | |