Commit Graph

61 Commits

Author SHA1 Message Date
dfaec66351 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
822220dada Adjusting copyright 2017-01-26 16:32:45 +01:00
3c75662633 Fixing json serialization and reporter 2017-01-22 21:08:46 +01:00
a6827afdc5 Template, comment and path fixes 2016-12-30 19:59:24 +01:00
24b8eb31fc Increase php version requirement 2016-12-07 20:56:15 +01:00
16a04b81f7 Prepare const visibility 2016-12-07 20:23:04 +01:00
f0b4c471b3 Fixing templates 2016-12-07 18:59:40 +01:00
51c5c5ef58 [News] Added plain text 2016-11-23 23:49:41 +01:00
6014a13e4a Fixing doc blocks 2016-11-06 22:22:07 +01:00
f967450cad Adjust database pool name 2016-10-29 20:44:52 +02:00
63914106d1 Fixing editor bugs 2016-10-23 21:49:16 +02:00
07804359bb Localization fix 2016-10-17 22:00:09 +02:00
cf1f0b43be Fix install 2016-10-09 20:07:30 +02:00
c1b8b582d4 Core adjustments for pending issues 2016-10-02 12:07:05 +02:00
ac22080aba Localization fix 2016-07-27 22:20:30 +02:00
265b77dec9 Translation fixes (0 still missing) 2016-07-27 13:17:50 +02:00
10cbacf466 Translation fixes (0 still missing) 2016-07-27 13:15:05 +02:00
a8c342b75b Dashboard drafts 2016-07-22 20:22:49 +02:00
ea4028918c Implemented application routes 2016-07-22 00:15:26 +02:00
78de73cc80 Path fix 2016-07-15 20:43:38 +02:00
f08d4582b8 Revert "Case ignore false"
This reverts commit f697ebb8790e967ff69ecafd84daa3b02d45b076.
2016-07-15 20:42:57 +02:00
ad4141f3b5 Case ignore false 2016-07-15 20:42:16 +02:00
741722b06f Remove editor 2016-07-15 18:06:39 +02:00
a31790f061 Path fixes 2016-07-15 18:05:46 +02:00
aaee4cc5e0 Path fixes 2016-07-15 18:05:13 +02:00
21dcf2b196 Path changes 2016-07-15 18:03:43 +02:00
6e279b6a08 Fixes #1
No templating done or language implementations. Simple pull out
performed.
2016-07-15 17:55:12 +02:00
354659fca8 Remove static loading 2016-07-05 19:22:54 +02:00
2b57caed74 Dynamic language loading 2016-07-05 19:00:30 +02:00
b1bb03f216 Routing 2016-07-05 11:35:20 +02:00
fd09b26911 Language fixes+api routes implemented 2016-07-02 20:02:27 +02:00
d9597ba149 Language display optimized
see previous commit
2016-07-02 14:15:02 +02:00
0ff0bf5713 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
470d54bdd9 Implementing basic activate/deactivate 2016-07-02 12:39:31 +02:00
deca3a073d Templating 2016-06-25 13:57:53 +02:00
8033658a3b Directory rename 2016-05-19 19:46:39 +02:00
447e3b5926 Simplyfing layout 2016-05-17 20:14:04 +02:00
7a0d6c887a Fixing comments and parameter for orm 2016-05-14 16:23:17 +02:00
697af0cedb Making datamapper static 2016-05-14 14:58:33 +02:00
8e08dfa030 Reformatting and new directory (capitalization) 2016-05-06 18:24:44 +02:00
ee3ba02494 Fixing remaining bugs for route-restructure 2016-04-09 10:43:09 +02:00
7ce67e7b7b Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
9f51c160da Usage of InfoManager 2016-04-02 17:47:30 +02:00
21f7087a2f Routes files 2016-04-02 16:24:59 +02:00
52c25f936b Routings moved to routing files 2016-04-01 22:16:21 +02:00
ebd7ac6fa1 Namespace fixes 2016-03-31 21:53:31 +02:00
803a48c9c3 Case fix! 2016-03-26 18:59:38 +01:00
7a4ec7af7d Organization + calendar fixes/extensions 2016-02-14 23:10:58 +01:00
5b293282fa Cleanup and function pull out 2016-01-30 22:13:15 +01:00
a9a95d3dd2 Remove namespace from scalars 2016-01-23 10:17:21 +01:00