Jingga/oms-Editor
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Editor.git synced 2026-01-14 18:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
47 Commits 2 Branches 0 Tags 1.1 MiB
PHP 95.1%
JavaScript 4.9%
164c44922e
Go to file
Dennis Eichhorn 164c44922e 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
Admin Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
Models Fixing json serialization and reporter 2017-01-22 21:08:46 +01:00
Theme Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
Controller.js Preparing editor CRUD 2016-11-09 21:14:37 +01:00
Controller.php Merge remote-tracking branch 'origin/develop' into develop 2017-01-26 16:42:29 +01:00
info.json Remove static loading 2016-07-05 19:22:54 +02:00
README.md Split 2015-12-18 17:43:42 +01:00

README.md