aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into sabre32Mario Vavti2016-06-281-1/+7
|\
| * fix month view in fullscreen modeMario Vavti2016-06-281-1/+7
* | erge branch 'dev' into sabre32Mario Vavti2016-06-282-8/+0
|\|
| * update fullcalendar to version 2.8.0Mario Vavti2016-06-282-8/+0
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-281-0/+3
|\|
| * add letsencrypt x3 intermediate cert and new cert file, improve UX of new reg...redmatrix2016-06-271-0/+3
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-262-3/+132
|\|
| * Merge pull request #438 from anaqreon/wikihubzilla2016-06-261-2/+131
| |\
| | * A page name wrapped in double brackets is converted into a link to another pa...Andrew Manning2016-06-251-1/+1
| | * Insert image links wherever cursor is in the editorAndrew Manning2016-06-251-2/+2
| | * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-254-10/+10
| | |\
| | * | Post generation about new wiki is optional, default is NOT to post. Fixed bug...Andrew Manning2016-06-251-1/+130
| * | | fix help linkTreer2016-06-261-1/+1
| | |/ | |/|
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-243-4/+4
|\| |
| * | add url permalink mf2 markupBen Roberts2016-06-241-1/+1
| * | p-author missing from embedded h-card in itemsBen Roberts2016-06-231-1/+1
| * | make dropdown-caret invoke the dropdownredmatrix2016-06-231-1/+1
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-06-231-6/+6
| |\ \
| * | | code cleanup for profile_photosredmatrix2016-06-231-1/+1
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-232-7/+7
|\ \ \ \ | | |/ / | |/| |
| * | | microformats 2 for postsBen Roberts2016-06-221-6/+6
| |/ /
| * / use the normal html escape for '@' in addresses rather than the high-plane un...redmatrix2016-06-221-1/+1
| |/
* | erge branch 'dev' into sabre32Mario Vavti2016-06-223-24/+30
|\|
| * vcard spec changesredmatrix2016-06-213-24/+30
* | Merge branch 'dev' into sabre32Mario Vavti2016-06-212-14/+80
|\|
| * Merge pull request #429 from anaqreon/wikihubzilla2016-06-212-14/+80
| |\
| | * Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-2011-2/+21514
| | |\
| | * | Do not change active page commit until user reverts the pageAndrew Manning2016-06-201-1/+2
| | * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-173-3/+8
| | |\ \
| | * | | Wiki page revision comparison tool with diff displayed in modal dialog. Lever...Andrew Manning2016-06-172-14/+79
* | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-2037-86783/+61544
|\| | | |
| * | | | Merge branch 'master' into devMario Vavti2016-06-2037-86783/+61544
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | hebrew hstrings.php was emptyredmatrix2016-06-181-0/+2317
| | * | | hebrew updateredmatrix2016-06-183-3548/+1311
| | * | | All languages up to date as far as they are updated. Added Hebrew (I saw no R...jeroenpraat2016-06-1544-81254/+77509
| | * | | Update DE translation stringsphellmes2016-06-152-5529/+5467
* | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-201-1/+1
|\| | | |
| * | | | experimental rtl support; this will probably require a fair bit of work.redmatrix2016-06-191-1/+1
* | | | | return something so we can make a conclusionMario Vavti2016-06-191-0/+5
* | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-199-0/+21512
|\| | | |
| * | | | hebrew hstrings.php was emptyredmatrix2016-06-181-0/+2317
| * | | | hebrew translationroot2016-06-189-0/+19195
* | | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-181-1/+1
|\| | | |
| * | | | the text link to a thing will take you to the local thing page, both as a lin...redmatrix2016-06-171-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'dev' into sabre32Mario Vavti2016-06-173-3/+8
|\| | |
| * | | only use height: auto for week and day viewMario Vavti2016-06-173-3/+8
| | |/ | |/|
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-162-0/+40
|\| |
| * | show month view in full height in fullscreen viewMario Vavti2016-06-162-0/+40
* | | mrge branch 'dev' into sabre32Mario Vavti2016-06-162-0/+8
|\| |
| * | fix scrollbarsMario Vavti2016-06-162-0/+8