48ed64a02f
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# Draw/Controller.js
# Draw/Models/DrawType.enum.js
# Draw/Models/Editor.js
# Media/Models/UploadFile.php
2017-01-26 16:42:29 +01:00
8f569642a3
Adjusting copyright
2017-01-26 16:32:45 +01:00
b68b183bc6
Increase php version requirement
2016-12-07 20:56:15 +01:00
0effe74345
Path fix
2016-10-17 22:00:24 +02:00
b740a68f86
Localization fix
2016-10-17 22:00:09 +02:00
055841d251
Localization fix
2016-07-27 22:20:30 +02:00
721d5aab05
Translation fixes (0 still missing)
2016-07-27 13:17:50 +02:00
9a85edd49c
Translation fixes (0 still missing)
2016-07-27 13:15:05 +02:00
507695fe7e
Minor fixes and additions
2016-07-12 17:16:00 +02:00
317938caef
Dynamic language loading
2016-07-05 19:00:30 +02:00
c529256a20
Language fixes+api routes implemented
2016-07-02 20:02:27 +02:00
e49b37c692
Language display optimized
...
Language is now no longer direct array access but provided through a
function. This can be later used to hot load language files instead of
pre-loading them.
2016-07-02 14:14:31 +02:00
768c2ceffe
Implementing basic activate/deactivate
2016-07-02 12:39:31 +02:00
d4848b3906
Directory rename
2016-05-19 19:46:39 +02:00
b07a12012e
Simplyfing layout
2016-05-17 20:14:04 +02:00
58df7357a6
Fixing remaining bugs for route-restructure
2016-04-09 10:43:09 +02:00
b6d6ea716e
Fixing remaining bugs for route-restructure
2016-04-09 10:42:22 +02:00
2679416dd7
Case fix!
2016-03-26 18:59:38 +01:00
87a96032e6
Adding media table
2016-03-12 10:18:39 +01:00
f3311a5e06
Templating
2016-02-11 21:10:18 +01:00
54292bb6fb
Restructure
2015-12-31 18:05:19 +01:00
e476151784
Init
2015-11-29 21:57:18 +01:00
