aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-162-1/+41
|\| |
| * | Merge pull request #422 from anaqreon/wikihubzilla2016-06-161-1/+40
| |\ \
| | * | Rename page feature added. Fixed bug in git commit function and other minor f...Andrew Manning2016-06-151-1/+40
| * | | provide syntax based [colour] highlighting on code blocks for popular languag...redmatrix2016-06-151-0/+1
| |/ /
* | | css fixMario Vavti2016-06-141-0/+1
* | | css fixesMario Vavti2016-06-131-1/+4
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-133-0/+118
|\| |
| * | Move javascript functions back to jot-header.tplAndrew Manning2016-06-122-84/+83
| * | Photo embed button with album browser works in new post editor.Andrew Manning2016-06-124-84/+91
| * | Merge remote-tracking branch 'upstream/dev' into embedphotosAndrew Manning2016-06-1212-9060/+9371
| |\|
| * | Stashing changes. Not a functional state.Andrew Manning2016-06-092-0/+112
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-116-9051/+9048
|\ \ \ | | |/ | |/|
| * | css fixesMario Vavti2016-06-112-10/+1
| * | es_ES and NL string for 1.8RC. Hopefully I'm doing it right.jeroenpraat2016-06-114-9041/+9047
* | | Merge branch 'dev' into sabre32Mario Vavti2016-06-106-1/+331
|\| |
| * | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-091-16/+0
| |\ \
| * | | Javascript only allows saving a page if the content has changed.Andrew Manning2016-06-071-2/+11
| * | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-073-5/+5
| |\ \ \ | | | |/ | | |/|
| * | | Hide page history viewer when viewing sandboxAndrew Manning2016-06-051-2/+2
| * | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-054-5772/+5642
| |\ \ \
| * | | | Custom commit message available. Improved history viewer and feedback from re...Andrew Manning2016-06-052-6/+22
| * | | | Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-06-051-0/+5
| |\ \ \ \
| * | | | | Basic page reversion implemented. The revert button on the history view repla...Andrew Manning2016-06-052-2/+20
| * | | | | Page deletion implemented. Hide the delete button and disallow for Home page.Andrew Manning2016-06-041-4/+30
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 06:51:17 +0000