Ingo Schommer
|
f36b110db3
|
Merge remote-tracking branch 'origin/3.3'
|
2016-03-04 17:06:04 +13:00 |
|
Damian Mooyman
|
3b0a9f4ba2
|
Merge remote-tracking branch 'origin/3'
# Conflicts:
# admin/javascript/LeftAndMain.Menu.js
# control/HTTPRequest.php
# css/GridField.css
# css/GridField.css.map
# docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
# docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
# docs/en/02_Developer_Guides/06_Testing/index.md
# docs/en/02_Developer_Guides/14_Files/01_File_Management.md
# docs/en/02_Developer_Guides/14_Files/02_Images.md
# filesystem/Upload.php
# javascript/HtmlEditorField.js
# model/Image.php
# model/connect/MySQLDatabase.php
# model/fieldtypes/Enum.php
# model/versioning/Versioned.php
# scss/GridField.scss
|
2016-02-25 14:51:59 +13:00 |
|
David Craig
|
5a42a4181a
|
Added Bootstrap Alpha.2
- Managed by npm
- Created an `npm run css` task to compile
- Updated shrinkwrap
- Updated changelog
|
2016-02-23 11:11:24 +13:00 |
|
Damian Mooyman
|
f20ad434ce
|
API Update TinyMCE to 4.x
API Allow HtmlEditorField to be individually configured
BUG Fix incorrect change detection
BUG Fix missing i18n files
|
2016-02-23 10:10:02 +13:00 |
|
scott1702
|
2bf802a8cd
|
Include React and related libraries in framework
|
2016-02-15 16:05:55 +13:00 |
|