Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 1 | -1/+7 |
|\ | |||||
| * | fix month view in fullscreen mode | Mario Vavti | 2016-06-28 | 1 | -1/+7 |
| | | |||||
* | | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 2 | -8/+0 |
|\| | |||||
| * | update fullcalendar to version 2.8.0 | Mario Vavti | 2016-06-28 | 2 | -8/+0 |
| | | |||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 1 | -0/+3 |
|\| | |||||
| * | add letsencrypt x3 intermediate cert and new cert file, improve UX of new ↵ | redmatrix | 2016-06-27 | 1 | -0/+3 |
| | | | | | | | | registrations | ||||
* | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-26 | 2 | -3/+132 |
|\| | |||||
| * | Merge pull request #438 from anaqreon/wiki | hubzilla | 2016-06-26 | 1 | -2/+131 |
| |\ | | | | | | | Wiki post generation option and image embed tool | ||||
| | * | A page name wrapped in double brackets is converted into a link to another ↵ | Andrew Manning | 2016-06-25 | 1 | -1/+1 |
| | | | | | | | | | | | | page in the current wiki | ||||
| | * | Insert image links wherever cursor is in the editor | Andrew Manning | 2016-06-25 | 1 | -2/+2 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-25 | 4 | -10/+10 |
| | |\ | |||||
| | * | | Post generation about new wiki is optional, default is NOT to post. Fixed ↵ | Andrew Manning | 2016-06-25 | 1 | -1/+130 |
| | | | | | | | | | | | | | | | | bug in wiki creation. Added embed image dialog and album browser. | ||||
| * | | | fix help link | Treer | 2016-06-26 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-24 | 3 | -4/+4 |
|\| | | |||||
| * | | add url permalink mf2 markup | Ben Roberts | 2016-06-24 | 1 | -1/+1 |
| | | | |||||
| * | | p-author missing from embedded h-card in items | Ben Roberts | 2016-06-23 | 1 | -1/+1 |
| | | | |||||
| * | | make dropdown-caret invoke the dropdown | redmatrix | 2016-06-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-06-23 | 1 | -6/+6 |
| |\ \ | |||||
| * | | | code cleanup for profile_photos | redmatrix | 2016-06-23 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-23 | 2 | -7/+7 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | microformats 2 for posts | Ben Roberts | 2016-06-22 | 1 | -6/+6 |
| |/ / | |||||
| * / | use the normal html escape for '@' in addresses rather than the high-plane ↵ | redmatrix | 2016-06-22 | 1 | -1/+1 |
| |/ | | | | | | | unicode variant. This makes it copy-able, but not easily scrape-able. | ||||
* | | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-22 | 3 | -24/+30 |
|\| | |||||
| * | vcard spec changes | redmatrix | 2016-06-21 | 3 | -24/+30 |
| | | |||||
* | | 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 |
| | | |