Commit Graph

10 Commits

Author SHA1 Message Date
ee15ab5bd4 Auto adjust image/canvas size to image 2017-02-08 18:14:53 +01:00
1dfb1d2b70 More flexbox implementations 2017-01-29 12:35:25 +01:00
4a95f90207 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
1c5b097be4 Adjusting copyright 2017-01-26 16:32:45 +01:00
b9c1cc4857 Increase php version requirement 2016-12-07 20:56:15 +01:00
5509176eed Upload fixes 2016-05-26 22:53:58 +02:00
537b9291ab Fixing upload bugs 2016-05-25 22:52:49 +02:00
4557f2a0f8 Directory rename 2016-05-19 19:46:39 +02:00
f7843d534c Templating 2016-02-11 21:10:18 +01:00
b68fc816ee Init 2015-11-29 21:57:18 +01:00