Ingo Schommer
|
963f02e7a3
|
Using new description style in MemberDateTimeOptionSetField
|
2012-12-14 01:58:04 +01:00 |
|
Ingo Schommer
|
f03ad7b0dd
|
Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
admin/javascript/LeftAndMain.AddForm.js
control/Director.php
control/HTTPResponse.php
dev/Profiler.php
email/Mailer.php
forms/ComplexTableField.php
forms/ManyManyComplexTableField.php
forms/SimpleImageField.php
forms/TableField.php
forms/TableListField.php
javascript/ComplexTableField.js
javascript/ImageFormAction.js
javascript/TableField.js
javascript/TableListField.js
security/Member.php
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
tests/forms/TableListFieldTest.php
|
2012-12-12 10:11:56 +01:00 |
|
Simon Welsh
|
b0121b541c
|
Add codesniffer that ensures indentation is with tabs.
|
2012-12-12 17:33:31 +13:00 |
|
Simon Welsh
|
fc5dd2994c
|
Add codesniffer that ensures indentation is with tabs.
|
2012-12-12 00:12:11 +13:00 |
|
Ingo Schommer
|
0fd6d14f94
|
Fixed Behat steps for preview feature
|
2012-12-10 18:06:49 +01:00 |
|
Ingo Schommer
|
1e0b0e7f56
|
More flexible Behat steps for HTML fields
|
2012-12-10 15:39:20 +01:00 |
|
Ingo Schommer
|
e9d999d648
|
Support for chosen.js drop downs in behat steps
|
2012-11-16 15:32:17 +13:00 |
|
Ingo Schommer
|
d86ad20e72
|
More flexible tabs selection in behat steps
|
2012-11-16 15:32:17 +13:00 |
|
Ingo Schommer
|
32f829d094
|
NEW Support for Behat tests, and initial set of tests
|
2012-11-16 15:31:55 +13:00 |
|