Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 un... | redmatrix | 2016-06-22 | 1 | -1/+1 |
* | | 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 |
| |\ | |||||
| | * | 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. Lever... | Andrew Manning | 2016-06-17 | 2 | -14/+79 |
* | | | | | 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 R... | jeroenpraat | 2016-06-15 | 44 | -81254/+77509 |
| | * | | | 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 lin... | redmatrix | 2016-06-17 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | 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 |
| |\ \ | |||||
| | * | | Rename page feature added. Fixed bug in git commit function and other minor f... | Andrew Manning | 2016-06-15 | 1 | -1/+40 |
| * | | | provide syntax based [colour] highlighting on code blocks for popular languag... | redmatrix | 2016-06-15 | 1 | -0/+1 |
| |/ / | |||||
* | | | 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 |