tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
15,845 Commits 31 Branches 527 Tags 162 MiB
3572e2eaf4
Commit Graph

15845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loz Calver
3572e2eaf4 Merge pull request #5263 from tractorcow/pulls/4.0/install-sync 
Don't use removed API in install.php
 2016-04-04 09:13:21 +01:00
Hamish Friedlander
db7c3ab4d8 Merge pull request #5247 from open-sausages/pulls/4.0/changesets 
API Implement ChangeSets for batch publishing
 2016-04-04 18:59:25 +12:00
Damian Mooyman
3c2b53157e API Update Versioned methods 2016-04-04 14:50:16 +12:00
Damian Mooyman
87ee4365e7 API Implement ChangeSets for batch publishing 2016-04-04 14:46:38 +12:00
Damian Mooyman
64b7a84bb2 API SapphireTest::logInWithPermission now supports multiple permissions 2016-04-04 14:46:38 +12:00
Damian Mooyman
c69e55c49c BUG Fix issue with SapphireTest::assertDOSEquals incorrectly passing on empty set 2016-04-04 14:46:38 +12:00
Damian Mooyman
29c5eff433 API Add $context method to DataObject::can for consistency with canCreate() 2016-04-04 14:46:38 +12:00
Damian Mooyman
195e09097a Don't use removed API in install.php 2016-04-04 14:34:10 +12:00
Damian Mooyman
77b47bac92 Merge pull request #5063 from benmanu/pulls/add-npm-json-js 
Moving thirdparty module to npm dependency - json-js
 2016-04-04 10:13:33 +12:00
Ingo Schommer
6926e85fff Reinstate route externals in Gulpfile 
Accidental regression from c4e5074f67 (see aa1aebd007)
 2016-04-04 08:58:59 +12:00
Ingo Schommer
c4e5074f67 Partially reverted b1b85b5 
We still require copying thirdparty components from node_modules on tiny_mce
 2016-04-04 08:15:27 +12:00
Ingo Schommer
c2b6f6199c Reapplied customisations to tiny_mce_gzip.php 
See previously applied customisations at https://github.com/silverstripe/silverstripe-framework/blob/3/thirdparty/tinymce/tiny_mce_gzip.php
See https://github.com/silverstripe/silverstripe-framework/pull/5258
 2016-04-04 08:01:17 +12:00
Sean Harvey
b1b85b539e TinyMCE 4 optimisations. Use TinyMCE_Compressor. 2016-04-04 07:58:45 +12:00
Ben Manu
5c7a6166b6 Moving thirdparty module to npm dependency - json-js. 2016-04-01 15:43:09 +13:00
Ingo Schommer
d93da92c37 Merge pull request #5243 from open-sausages/pulls/4.0/client-routing 
Implement client-side routing with Page.js
 2016-04-01 14:53:17 +13:00
Damian Mooyman
4585e67e15 Merge pull request #5257 from steve-silverstripe/update-close-icon-on-cms-notices 
Changed CMS close from an 'x' to a silverstripe font icon
 2016-04-01 14:36:39 +13:00
Steve Boyd
7887be704e Changed CMS close from an 'x' to a silverstripe font icon 2016-04-01 13:52:28 +13:00
Damian Mooyman
501b2f1809 API CMSMenu::get_cms_classes() is now sorted 2016-04-01 13:46:33 +13:00
David Craig
aa1aebd007 Implement client-side routing with Page.js 
- Removes thirdparty dependency History.js
- Adds thirdparty dependency Page.js to manage client-side routing
- Adds a wrapper around Page.js for SilverStripe specific behaviour
- Increased minimum browser requirement to IE10. Native HTML History API routing requires IE10 or newer (necessitated by removal of History.js)
- PJAX pannel loading via now uses promises rather than callbacks
- Adds getClientConfig method to LeftAndMain which can be used to pass config from to the front-end client
 2016-04-01 13:45:14 +13:00
Ingo Schommer
3d1673f687 Merge pull request #5255 from tractorcow/pulls/4.0/fix-test-location 
BUG move test file to correct folder and fix class_exists
 2016-03-31 17:43:08 +13:00
Damian Mooyman
d8d005d1e2 BUG move test file to correct folder and fix class_exists 2016-03-31 17:06:23 +13:00
Ingo Schommer
449a41a66a Merge pull request #5254 from tractorcow/pulls/4.0/ignore-tests 
BUG Prevent live manifest loading files from nested test directories
 2016-03-31 16:19:08 +13:00
Damian Mooyman
e8a68c42ce BUG Prevent live manifest loading files from nested test directories 
E.g. framework/admin/tests
 2016-03-31 15:58:23 +13:00
Damian Mooyman
78892f0a8d Merge pull request #5232 from kinglozzer/viewabledata-dep 
Remove deprecated caching behaviour from ViewableData (closes #4063)
 2016-03-31 10:08:15 +13:00
Damian Mooyman
0fa7271ec2 Merge pull request #5239 from open-sausages/pulls/4.0/form-schema-fixes 
Form schema fixes
 2016-03-31 09:49:55 +13:00
Ingo Schommer
55f12939bb Defined $schemaDataType constant, added to FormField subclasses 2016-03-30 23:00:00 +13:00
Loz Calver
b2e4e9622b API: Remove deprecated caching behaviour from ViewableData (closes #4063) 2016-03-30 08:53:35 +01:00
Sam Minnée
b4526ec554 Merge pull request #5237 from open-sausages/pulls/4.0/bootstrap-include-default 
Include Bootstrap by default
 2016-03-30 14:57:32 +13:00
Sam Minnée
fb5f73ebdf Merge pull request #5238 from open-sausages/pulls/4.0/build-tooling-cleanup 
Build tooling cleanup
 2016-03-30 14:39:57 +13:00
Ingo Schommer
1049288cb5 Merge pull request #5240 from madmatt/pulls/fix-dbstringtest-annotations 
MINOR: Fix PHPUnit @covers assertions for DBStringTest
 2016-03-29 16:13:50 +13:00
Ingo Schommer
2ba4e1dabe Removed duplicate bootstrap lib 
Now generated on the fly through framework/admin/scss
 2016-03-29 11:28:40 +13:00
scott1702
6b1444709f Fix menu dropdown icon 2016-03-29 11:28:38 +13:00
David Craig
d4ad1504a9 Fix bottom toolbar height 2016-03-29 11:28:05 +13:00
Hamish Friedlander
700cf9bd56 Merge pull request #5223 from tractorcow/pulls/4.0/transactions 
API Add SS_Database::withTransaction for nice enclosed transactions
 2016-03-29 10:54:04 +13:00
Paul Clarke
dce31d7235 initial updates to main nav styles for 4.0 
Conflicts:
	admin/css/ie7.css
	admin/css/ie7.css.map
	admin/css/ie8.css.map
	admin/css/screen.css
	admin/css/screen.css.map
	admin/javascript/dist/bundle-leftandmain.js
	admin/javascript/src/LeftAndMain.Menu.js
	admin/scss/_spritey.scss
	css/GridField.css
 2016-03-29 10:29:33 +13:00
Ingo Schommer
884c44f596 Removed sourcemaps 
Will be part of .gitignore in a subsequent commit
 2016-03-29 10:29:32 +13:00
scott1702
13d581dea5 Include bootstrap throughout the CMS 2016-03-29 10:29:27 +13:00
Ingo Schommer
3862a7a0a7 Moved FormFieldSchemaTrait into FormField 
The RFC requires a FormField implementation to override $schemaDataType,
but its defined on the trait - which can't be redefined by a field subclass.

In the end, the trait was never designed to be reuseable on classes other than FormField.
We need to admit that architecturally, we'll have to add all that API weight to the base FormField
class because of the way forms are structured in SilverStripe (mainly due to a missing layer
of indirection in getCMSFields implementations).

Also implemented the $schemaDataType on fields where its known.

See https://github.com/silverstripe/silverstripe-framework/issues/4938
See http://php.net/manual/en/language.oop5.traits.php#language.oop5.traits.properties.example
 2016-03-28 21:54:42 +13:00
Ingo Schommer
c3a8159e80 Default to schema response part in LeftAndMain->schema() 
More of a standard API approach to return data by default, and make customisation
via HTTP headers an optional mode.
 2016-03-28 21:54:42 +13:00
Ingo Schommer
adbcddee80 Only iterate through dataFields() in FormSchema 
Temporary measure until we implement nested fields
 2016-03-28 21:54:27 +13:00
Ingo Schommer
8ae2894890 Fix form schema ID getter 
Also moved keys of higher importance to start of array,
easier to review this way
 2016-03-28 21:54:24 +13:00
David Craig
5d88950735 Adds schemaDataType to FormFieldSchema 2016-03-28 21:14:06 +13:00
Ingo Schommer
dbe85dff0a Watch admin SCSS files 2016-03-28 21:02:27 +13:00
David Craig
97176581eb Tidy grunt file 
- Don't watch in prod mode
- Use gulp-if instead of if statements
 2016-03-28 21:02:15 +13:00
Daniel Hensby
1bcd755120 Merge pull request #5229 from madmatt/pulls/fix-gridfield-annotations 
MINOR: Fix PHPUnit @covers assertions for GridFieldTest
 2016-03-26 21:15:13 +00:00
madmatt
41a3a86862 MINOR: Fix PHPUnit @covers assertions for DBStringTest 
This resolves issues when PHPUnit is run strictly, where it exits when
it hits an @covers annotation that references a method that doesn't exist
 2016-03-26 17:58:28 +13:00
madmatt
c972692313 MINOR: Fix PHPUnit @covers assertions for GridFieldTest 
This resolves issues when PHPUnit is run strictly, where it exits when
it hits an @covers annotation that references a method that doesn't exist
 2016-03-26 11:55:01 +13:00
Hamish Friedlander
1e53f29f33 Merge pull request #5219 from open-sausages/pulls/4.0/optional-owned-by 
API Improvements to ownership api
 2016-03-24 10:08:40 +13:00
Damian Mooyman
c6c71fa3be Merge pull request #5221 from christopherdarling/patch-1 
remove $CleartextPassword from ChangePasswordEmail.ss
 2016-03-24 10:00:47 +13:00
Damian Mooyman
8abede1339 API Add SS_Database::withTransaction for nice enclosed transactions 2016-03-24 09:57:07 +13:00