Damian Mooyman
f26c220d86
API Support trait loading
2015-09-24 11:57:45 +12:00
Nicola Fontana
c39cf2d55f
Do not hang on nested parameters in search context
2015-09-23 09:12:02 +02:00
Loz Calver
0d89a13c2d
FIX: GridFieldDetailForm failing to save many_many relations
2015-09-22 14:46:57 +01:00
Damian Mooyman
10dece653f
API Consolidate DataObject db methods
...
BUG Fix namespace and getField on composite fields
2015-09-22 10:38:12 +12:00
Damian Mooyman
9872fbef4d
API Refactor CompositeDBField into an abstract class
...
API Refactor ClassName into DBClassName
API Update PolymorphicForeignKey to use new CompositeDBField and DBClassName
CompositeDBField is now an interface to nested fields on an underlying dataobject, allowing field manipulation to be performed at the field and dataobject level without having to synchronise them manually.
2015-09-22 10:28:07 +12:00
Damian Mooyman
e97b14ea65
Minor: Suppress custom themes in Formtest
2015-09-17 14:23:52 +12:00
Damian Mooyman
34b71cf6c8
Merge remote-tracking branch 'origin/3'
2015-09-15 13:42:17 +12:00
Damian Mooyman
71b8aec306
Merge remote-tracking branch 'origin/3.2' into 3
2015-09-15 13:35:51 +12:00
Damian Mooyman
c4710b2272
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
admin/code/GroupImportForm.php
admin/code/MemberImportForm.php
tests/model/DataListTest.php
2015-09-15 13:18:47 +12:00
Damian Mooyman
8c99659e3f
Merge pull request #4563 from assertchris/split-bulk-loader-imports-to-reduce-memory-consumption
...
Splitting BulkLoader imports to reduce memory consumption
2015-09-15 10:22:45 +12:00
Christopher Pitt
1c5089f7fc
Splitting BulkLoader imports to reduce memory consumption
2015-09-15 10:06:06 +12:00
Damian Mooyman
7367cf54c4
[ss-2015-020]: Prevent possible Privilege escalation
2015-09-10 13:01:24 +12:00
Damian Mooyman
812b5ecb62
Fix merge regressions
2015-09-09 16:18:39 +12:00
Damian Mooyman
b552a7370f
Merge remote-tracking branch 'origin/3'
...
Conflicts:
tests/model/ImageTest.php
2015-09-09 15:44:47 +12:00
Damian Mooyman
f10785350e
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
2015-09-09 14:50:47 +12:00
Damian Mooyman
309ac0d196
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
.travis.yml
admin/code/CMSProfileController.php
admin/tests/LeftAndMainTest.php
control/HTTP.php
security/Permission.php
tests/forms/FormTest.php
tests/model/ArrayListTest.php
tests/security/PermissionTest.php
2015-09-09 14:35:29 +12:00
micmania1
9f91b47825
NEW Update SS_ConfigStaticManifest to use Reflection
2015-09-03 22:25:42 +00:00
Daniel Hensby
f6fe1427c2
API Making ArrayList (and others) more consistent with DataList
2015-09-02 23:43:27 +01:00
Jonathon Menz
2ae5d83f08
FIX Resampled images inherit source properties
...
Ensure Image_Cached objects can access all the properties of the source image (fixes #4569 )
2015-09-02 10:38:02 -07:00
Will Morgan
17e97babf1
Merge pull request #4549 from kinglozzer/pulls/recursion-arraylist-sort
...
FIX: Recursion errors when sorting objects with circular dependencies (fixes #4464 )
2015-09-01 16:42:17 +01:00
Loz Calver
0943b3b1a0
FIX: Recursion errors when sorting objects with circular dependencies ( fixes #4464 )
2015-09-01 09:37:06 +01:00
Damian Mooyman
e86b45bf5d
BUG Remove html5 number field due to insufficient localisation support
2015-09-01 12:23:35 +12:00
Damian Mooyman
dc4c40f642
Merge pull request #4507 from JorisDebonnet/resampled-images-in-folders
...
Save resampled images into a folder structure indicating transformations
2015-09-01 11:16:23 +12:00
JorisDebonnet
ea05526e9d
Save resampled images into a folder structure indicating transformations
2015-09-01 00:40:27 +02:00
Sam Minnée
f4b7cd3f68
Merge pull request #4500 from stevie-mayhew/pulls/get-response
...
FEATURE: implement getter and setter usage for response
2015-08-29 15:35:55 +12:00
Stevie Mayhew
1b57e0ca5b
FEATURE: implement getter and setter usage for response
2015-08-29 10:24:06 +12:00
Sam Minnee
1b8d295767
API CHANGE: Shift to Monolog for error reporting and logging
...
API CHANGE: Debug::showError(), Debug::showLines(), Debug::log(), and Debug::header() removed
NEW: Logging provided
ZendLog has been removed and monolog introduced instead as a dependency.
The “ErrorLogger” injection point is now the used as the logger that
errors are fed into, and implements PSR-3’s Psr\Log\LoggerInterface.
The SS_ERROR_LOG setting expect a Monolog Logger to be provided as the
ErrorLogger.
2015-08-28 16:06:41 +12:00
Ingo Schommer
28554dbe94
Merge pull request #4504 from dhensby/pulls/fields-fix
...
When loading data into a form, make sure its using ALL fields
2015-08-28 08:38:49 +12:00
Daniel Hensby
cffb11e568
TEST Ensure data is loaded into complete FieldList
2015-08-27 17:56:22 +01:00
Loz Calver
4ec6210c98
Merge pull request #4537 from chillu/pulls/urlsegment-forward-slashes
...
Remove forward slash in URLs in multibyte mode
2015-08-26 16:18:53 +01:00
Daniel Hensby
2d4b743090
FIX Members can access their own profiles in CMS
2015-08-26 15:47:51 +01:00
Ingo Schommer
860b5dcc6e
Remove forward slash in URLs in multibyte mode
...
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1262
2015-08-26 17:40:04 +12:00
Loz Calver
df9eb77e2b
Allow abstract BuildTask subclasses ( closes #4538 )
2015-08-25 10:14:15 +01:00
Loz Calver
99a8a81e9a
Fix issues with tests and "subfolder" URLs
2015-08-25 11:49:01 +12:00
Damian Mooyman
4ea344ac9c
Merge remote-tracking branch 'origin/3.2' into 3
2015-08-24 12:57:22 +12:00
Damian Mooyman
1686c83826
Revert #3425 #3396 to restore deprecated functionality
...
Fixes #4514
2015-08-24 11:26:25 +12:00
Daniel Hensby
6eede57ff2
Fix issue where Access All CMS Sections doesnt work
2015-08-20 22:30:43 +01:00
Patrick Nelson
e13aebc3d7
FIX for #4502 Prevents JSON.parse() from scrambling sorted results from server-side.
...
Conflicts:
tests/forms/gridfield/GridFieldAddExistingAutocompleterTest.php
2015-08-19 11:42:45 +01:00
Daniel Hensby
0b36082564
Merge branch '3'
...
Conflicts:
.travis.yml
composer.json
docs/en/changelogs/4.0.0.md
forms/gridfield/GridFieldExportButton.php
2015-08-17 13:12:41 +01:00
Dan Hensby
c5c8a6a720
Merge remote-tracking branch '3.2' into 3
...
Conflicts:
admin/templates/Includes/ModelAdmin_ImportSpec.ss
css/GridField.css
2015-08-17 11:59:24 +00:00
Daniel Hensby
a8ab5a468d
Merge branch '3.1' into 3.2
...
Conflicts:
admin/code/LeftAndMain.php
composer.json
2015-08-17 11:43:28 +01:00
Daniel Hensby
910156b84c
Merge pull request #4443 from JorisDebonnet/base64url
...
Url-safe alternative for base64_encode in resampled Image filenames
2015-08-10 13:56:35 +01:00
Damian Mooyman
cf9d2d12ac
BUG Fix duplicate primary key crash on duplicate
2015-08-10 09:54:30 +12:00
JorisDebonnet
18e163d985
Url-safe alternative for base64_encode in resampled Image filenames
2015-08-05 20:59:40 +02:00
Loz Calver
687de33d0d
Ensure ClassInfo is backwards compatible with non-existant classes
2015-08-04 15:07:07 +01:00
Damian Mooyman
1532eeb69e
Merge pull request #4459 from kinglozzer/test-path-fixes
...
Fix issues with tests and "subfolder" URLs
2015-07-31 21:16:46 +12:00
Loz Calver
1aa5d7314c
Fix issues with tests and "subfolder" URLs
2015-07-31 09:42:35 +01:00
Damian Mooyman
09210efbc0
Merge remote-tracking branch 'origin/3'
...
Conflicts:
composer.json
control/Session.php
docs/en/05_Contributing/01_Code.md
docs/en/05_Contributing/02_Release_Process.md
forms/FormField.php
model/DataQuery.php
model/Image.php
model/queries/SQLConditionalExpression.php
view/SSViewer.php
view/ViewableData.php
2015-07-31 15:49:35 +12:00
Damian Mooyman
e0a560051e
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
css/AssetUploadField.css
2015-07-31 14:33:16 +12:00
Damian Mooyman
7ee444e08a
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
admin/code/LeftAndMain.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
filesystem/File.php
model/DataObject.php
model/DataQuery.php
search/filters/FulltextFilter.php
search/filters/SearchFilter.php
tests/core/ClassInfoTest.php
tests/filesystem/FileTest.php
tests/model/DataListTest.php
2015-07-31 11:38:18 +12:00
Sam Minnee
a1f7dcafa2
NEW: Add ‘calls’ section to Injector configs.
...
As well as properties, you can now configure a series of method calls in
your service definitions.
2015-07-30 19:34:46 +12:00
Daniel Hensby
dd0e2dc362
FIX Image_Cached exists method doesnt check for positive ID
...
FIX Files should only report as "existing" if the file actually exists
2015-07-30 14:52:06 +12:00
Daniel Hensby
130eb8ed02
Merge pull request #4439 from spekulatius/codestyle-model-tests
...
removing tailing spaces from model tests
2015-07-28 12:28:19 +01:00
Daniel Hensby
ffbeac6b7d
Ensuring classinfo is case insensitive
2015-07-28 11:17:50 +01:00
Daniel Hensby
5f0d0ab66a
Merge pull request #4155 from kinglozzer/pulls/getfiletype-case
...
FIX: File::getFileType() was case sensitive (fixes #3631 )
2015-07-28 00:13:26 +01:00
Jonathon Menz
40cc567c36
API Force resampling by default
...
Simplified force resampling by serving up a resampled image throught the getURL() function, but only if the resampled image has a smaller file size than the original.
2015-07-27 12:20:20 -07:00
Peter Thaleikis
bcac1a5afc
removing tailing spaces from model tests
2015-07-27 22:38:16 +12:00
Russell
51722e3d12
DataObject accept arrays or stdClass
...
The constructor of DataObject can take an array or stdClass for $record.
However, it is access as an array [here](https://github.com/silverstripe/silverstripe-framework/blob/3.1/model/DataObject.php#L416 ) and [here](https://github.com/silverstripe/silverstripe-framework/blob/3.1/model/DataObject.php#L431 )
This pull request ensures $record is an array after validation
2015-07-27 10:29:34 +01:00
JorisDebonnet
dd0c85c9cf
Use fputcsv in GridFieldExportButton
2015-07-27 04:23:49 +02:00
Loz Calver
20a66136e6
Merge pull request #4403 from tractorcow/pulls/3.2/disable-deprecation
...
API Disable deprecation notices by default
2015-07-23 14:23:41 +01:00
Loz Calver
778161931b
Merge pull request #4325 from dhensby/pulls/http-fix
...
Fixing issues with HTTP cache control
2015-07-23 14:12:41 +01:00
Sam Minnée
532bf6ccb9
Merge pull request #3554 from tractorcow/pr/3179
...
FIX: FulltextFilter did not work and was not usable
2015-07-22 11:29:57 +12:00
Sam Minnée
40e9515233
Merge pull request #4053 from tractorcow/pulls/3.1/fix-stringfield-exists
...
BUG Fix default casted (boolean)false evaluating to true in templates
2015-07-22 11:26:49 +12:00
Dan Hensby
64ceba133c
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
admin/css/screen.css
2015-07-20 14:08:36 +00:00
Daniel Hensby
ca8d0f2818
Merge branch '3.1' into 3.2
...
Conflicts:
dev/Debug.php
docs/en/05_Contributing/01_Code.md
forms/FormField.php
i18n/i18nTextCollector.php
model/DataQuery.php
2015-07-20 10:48:01 +01:00
Damian Mooyman
914d734df0
API Disable deprecation notices by default
2015-07-16 09:56:47 +12:00
Damian Mooyman
a556b4854a
BUG Fix of multiple i18nTextCollector issues: #3797 , #3798 , #3417
2015-07-09 10:45:08 +12:00
David Craig
ae3fc84181
Add three column layout to Page content view
...
- Content filters included in SiteTree view
- View (tree/list) buttons included in SiteTree view
- Update view button styles for new layout
- Updated breadcrumbs for new layout
2015-07-02 10:22:24 +12:00
Daniel Hensby
33d93c2a31
Fixing issues with HTTP cache control
2015-06-29 22:16:02 +01:00
Hamish Friedlander
f5d6f20113
Merge pull request #4333 from sminnee/shortcode-fix
...
Allow shortcodes inside script tags. Fixes #4332 .
2015-06-25 14:51:03 +12:00
Daniel Hensby
3507ddb0e8
FIX MemberPassword history removed with with Members
...
Currently Members that were deleted would still have their passwords
stored in the DB even though they were deleted. This seems unnecessary
and just increases data that could potentially be compromised later.
2015-06-24 21:04:23 +01:00
David Craig
a6013ed1d0
Move filters from panel to header
...
- The filter panel has been removed in favour of a search menu in the header.
- The multi-select component has been updated:
- Now called 'Bulk actions'
- Styling updated
- Added placeholder text / removed redundant option
- Now also appears in SiteTree view
2015-06-23 13:08:23 +12:00
Sam Minnee
6d05c57881
Ensure that shortcodes inside script tags are parsed. Fixes #4332 .
...
The problem is that the marker images aren’t picked up by DOMDocument
if they are inserted into a <script> tag, due to the semantics of HTML.
This fix does an additional replacement after the marker images are
replaced in this way to pick up any leftover tags.
2015-06-22 11:29:12 +01:00
Daniel Hensby
66391ab57a
FIX Imported namespaces now correctly used to determine class inheritance
...
Fixes #3707
2015-06-20 16:09:10 +01:00
Damian Mooyman
e14f743bf0
Set deprecation level for all changes in 3.x to 4.0
2015-06-19 13:07:41 +12:00
Damian Mooyman
1d122803cc
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
dev/SapphireTest.php
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
forms/DatetimeField.php
forms/NullableField.php
forms/NumericField.php
forms/gridfield/GridField.php
tests/control/DirectorTest.php
tests/model/DataObjectSchemaGenerationTest.php
tests/model/MySQLDatabaseTest.php
2015-06-19 10:48:07 +12:00
Daniel Hensby
aa3871d716
Merge pull request #4306 from gregsmirnov/pulls/3.1/fixed-datetimefield-setname-issue-4305
...
Issue #4305 : fixed DatetimeField::setName()
2015-06-18 22:10:13 +01:00
Gregory Smirnov
5b22e3afc5
Test TimeField value at 12:00 am
2015-06-18 18:53:44 +02:00
Gregory Smirnov
66b1dd9154
Issue 4305: fixed DatetimeField::setName()
2015-06-18 18:36:02 +02:00
Ingo Schommer
7b47501296
Merge pull request #4218 from tractorcow/pulls/4.0/fix-directortest
...
API New default behaviour for Director::getAbsoluteUrl
2015-06-18 21:42:23 +12:00
Sam Minnée
32eba39cef
Merge pull request #4288 from tractorcow/pulls/3.2/fix-pdoconnector
...
BUG Fix major segfault on PDOConnector after any DDL / Issue in PDOQuery::first()
2015-06-17 17:40:50 +01:00
Damian Mooyman
7597b888c3
Make SQLQuery strict semver for 3.2
2015-06-17 16:54:17 +12:00
Damian Mooyman
0653ba9630
Merge pull request #3979 from dhensby/pulls/test-nest
...
Nest and unnest Config and Controller for each test
2015-06-17 16:04:27 +12:00
Damian Mooyman
55170a0b74
API make DataObject::validate public
2015-06-17 15:51:30 +12:00
Damian Mooyman
0103b076c3
Merge remote-tracking branch 'origin/3'
...
Conflicts:
forms/Form.php
model/ManyManyList.php
2015-06-17 15:41:13 +12:00
Ingo Schommer
b95fdc7ba0
Merge pull request #4286 from tractorcow/pulls/3.2/fix-public-validate
...
API Revert DataObject::validate to 3.1 method signature (protected)
2015-06-17 15:36:03 +12:00
Damian Mooyman
ce3b5a5ace
BUG Fix major segfault on PDOConnector after any DDL
...
BUG Fix issue in PDOQuery::first()
Refactor previewWrite and benchmarkQuery into SS_Database
2015-06-17 13:34:21 +12:00
Damian Mooyman
0abacaead6
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
admin/code/LeftAndMain.php
forms/EmailField.php
forms/Form.php
forms/HeaderField.php
forms/LiteralField.php
forms/PasswordField.php
forms/TextareaField.php
forms/TreeDropdownField.php
model/DataObject.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
Daniel Hensby
6169bf2760
FIX No longer caching has_one after ID change
2015-06-16 17:38:34 +01:00
Damian Mooyman
58cc3da8d8
API Revert DataObject::validate to 3.1 method signature (protected)
2015-06-16 11:59:21 +12:00
Damian Mooyman
78a3f703f2
Merge pull request #4178 from dhensby/pulls/cookie-name-normalisation
...
NEW Cookie names with dots are now handled more gracefully
2015-06-15 11:35:39 +12:00
Daniel Hensby
5c8925f92e
Merge pull request #4256 from tractorcow/pulls/3/fix-manymany-falsey-values
...
BUG Fix false values for many_many_ExtraFields not being saved
2015-06-14 23:32:02 +01:00
Jonathon Menz
838926085c
API New and renamed image functions
...
Renamed image functions with more expressive names. Added CropWidth & CropHeight functions. Added no-upsampling capabilities. Cleaned up Image docs. Closes #4211
2015-06-12 17:02:55 -07:00
Jonathon Menz
24a268a12b
FIX Image test cleanup
...
Ensured files referenced by name in tests are actually used, and fixed added support for Flushable interface in image regeneration. Also ensured getters methods are used for width and height.
2015-06-12 16:43:13 -07:00
Damian Mooyman
513f0191fb
API New default behaviour for Director::getAbsoluteUrl
2015-06-12 16:12:38 +12:00
Damian Mooyman
7ff131daa7
BUG Fix default casted (boolean)false evaluating to true in templates
2015-06-12 15:47:15 +12:00
Damian Mooyman
782c4cbf6f
API Enable single-column fulltext filter search as fallback
2015-06-12 15:36:03 +12:00
micmania1
40c5b8b675
FIX FulltextFilter did not work and was not usable
2015-06-12 15:31:45 +12:00
Loz Calver
28be51cab0
FIX: Config state leaking between unit tests
2015-06-11 16:37:26 +01:00
Daniel Hensby
3ee5b24898
Nest and unnest Config and Controller for each test and test suite
2015-06-11 16:37:25 +01:00
Daniel Hensby
c062670ba3
Removing unreachable test line
2015-06-09 16:01:33 +01:00
Damian Mooyman
b42ddd107c
Merge pull request #3499 from colymba/ie-multi-file-upload-fix
...
FIX #3458 iframe transport multi file upload FIX #3343 , FIX #3148
2015-06-09 13:22:10 +12:00
Damian Mooyman
a8ace75341
API Support for multiple HTMLEditorConfig per page
2015-06-09 12:17:55 +12:00
Damian Mooyman
acf19b72e2
BUG Fix false values for many_many_ExtraFields not being saved
...
Fixes #4067
2015-06-09 12:05:25 +12:00
Damian Mooyman
786b1dd5d4
Merge remote-tracking branch 'origin/3'
...
Conflicts:
control/HTTPRequest.php
filesystem/Upload.php
model/ManyManyList.php
2015-06-09 11:10:14 +12:00
Jonathon Menz
223466a8b8
NEW Configurable file version prefix
...
Numbers are often used at the end of file names in image sequences (e.g. digital photos) and the current renaming scheme can disrupt this, creating a confusing situation for the user. A configurable file version prefix should help prevent this.
Filename | Old result | New result
-----------|------------|--------------
IMG001.jpg | IMG2.jpg | IMG001-v2.jpg
2015-06-03 09:24:30 -07:00
Jonathon Menz
44b1ff1931
NEW: Configurable file version prefix
...
Numbers are often used at the end of file names in image sequences (e.g. digital photos) and the current renaming scheme can disrupt this, creating a confusing situation for the user. A configurable file version prefix should help prevent this, with a default of '-v' proposed for SS4.0.
Filename | Old result | New result (with '-v' prefix)
-----------|------------|--------------
IMG001.jpg | IMG2.jpg | IMG001-v2.jpg
2015-06-03 08:55:38 -07:00
Damian Mooyman
51df4df9f1
Fix merge regressions / errors
2015-06-02 20:19:12 +12:00
Damian Mooyman
8331171f2c
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
.scrutinizer.yml
admin/javascript/LeftAndMain.Panel.js
core/startup/ParameterConfirmationToken.php
dev/Debug.php
dev/FixtureBlueprint.php
docs/en/00_Getting_Started/05_Coding_Conventions.md
docs/en/00_Getting_Started/index.md
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
filesystem/File.php
filesystem/Folder.php
forms/FieldList.php
forms/LabelField.php
forms/MoneyField.php
forms/TextField.php
forms/TreeDropdownField.php
forms/Validator.php
forms/gridfield/GridField.php
forms/gridfield/GridFieldExportButton.php
lang/de.yml
lang/fi.yml
model/DataObject.php
model/SQLQuery.php
parsers/ShortcodeParser.php
security/ChangePasswordForm.php
security/Security.php
tests/control/DirectorTest.php
tests/core/startup/ParameterConfirmationTokenTest.php
tests/dev/FixtureBlueprintTest.php
tests/forms/FieldListTest.php
tests/forms/MoneyFieldTest.php
tests/model/SQLQueryTest.php
tests/security/SecurityTest.php
2015-06-02 19:13:38 +12:00
Ingo Schommer
dac1b5818b
Merge pull request #4217 from tractorcow/pulls/3.1/fix-directortest
...
BUG Fix DirectorTest failing when run with sake
2015-06-01 17:34:26 +12:00
Damian Mooyman
e733efa195
Merge pull request #4206 from gregsmirnov/pulls/localised-moneyfield-fix
...
BUG Fixed handling of numbers in certain locales
2015-05-29 09:21:43 +12:00
Damian Mooyman
50e33b8e5e
Merge remote-tracking branch 'origin/3.1.13' into 3.1
2015-05-28 19:08:12 +12:00
Damian Mooyman
0a8f328947
Fix merge / test regressions
2015-05-28 16:59:05 +12:00
Damian Mooyman
a978b891e1
BUG Fix handling of empty parameter token
2015-05-28 10:13:10 +12:00
Damian Mooyman
79cfa2bb64
Bug fix sqlquery select
2015-05-28 10:11:32 +12:00
Damian Mooyman
922d02f535
API Enable filters to perform 'IS NULL' or 'IS NOT NULL' checks
2015-05-26 12:09:17 +12:00
Loz Calver
68d8df4e04
FIX: DropdownField didn't consider disabled items
2015-05-22 21:14:11 +01:00
Loz Calver
dfb9b76b95
Add validation for GroupedDropdownField ( closes #3923 )
2015-05-22 20:55:54 +01:00
Gregory Smirnov
94f6a13729
BUG Fixed setting LastEdited for DataObject with class ancestry
2015-05-22 11:32:59 +02:00
Damian Mooyman
e0710ae4e4
BUG Fix DirectorTest failing when run with sake
2015-05-22 14:48:35 +12:00
Gregory Smirnov
f9bdf61b6f
BUG Fixed handling of numbers in certain locales
2015-05-20 12:18:34 +01:00
Kamran Vighio
20c9d6f02e
Implement validate() method for TextField to validate max length ( closes #4073 )
2015-05-19 09:36:51 +01:00
Damian Mooyman
cd1eb1b484
Merge remote-tracking branch 'origin/3'
...
Conflicts:
admin/tests/CMSFormTest.php
2015-05-19 09:19:47 +12:00
Jonathon Menz
c6bcfea3e3
BUG: FieldList::changeFieldOrder() leftovers discarded
...
Logical error. Use of + operator means items from second array are only merged if the key does not already appear in the first array. The first array has numeric keys 0,1,2 etc. The second array is keyed by field name, but array_values() resets the keys to be numberic starting at 0. This means that some or all leftovers are discarded instead of appended.
2015-05-17 09:09:35 -07:00
Daniel Hensby
ce5a8f2b41
NEW Cookie names with dots are now handled more gracefully
2015-05-12 10:49:58 +01:00
Damian Mooyman
e8d6f15f28
API Use mysql buffered statements
...
Avoids the usage of any MySQL Native Driver specific API
2015-05-08 13:23:53 +12:00
Daniel Hensby
e94c2a944e
Test to prove having count issue
2015-05-07 21:26:11 +01:00
Loz Calver
a7100e9006
FIX: Object::parse_class_spec failed to parse associative arrays
2015-05-06 18:29:51 +01:00
Loz Calver
23fc498c27
NEW: Allow 'null' limit for database queries ( closes #3487 )
2015-05-04 22:50:33 +01:00
Loz Calver
1cca37c908
FIX: File::getFileType() was case sensitive ( fixes #3631 )
2015-05-04 15:10:16 +01:00
Stevie Mayhew
0d94cf15a5
UPDATE: change all instances of $this->request to use appropriate getter/setter
2015-04-30 11:04:08 +12:00
Damian Mooyman
8e24511266
BUG Fix users with all cms section access not able to edit files
...
Fixes #4078
2015-04-20 18:20:56 +12:00
Damian Mooyman
e91606e494
API Introduce $FromEnd variable for iterators
2015-04-09 17:02:30 +12:00
Ingo Schommer
72a284c9b8
Merge remote-tracking branch 'origin/3'
...
Conflicts:
core/Constants.php
docs/en/05_Contributing/01_Code.md
tests/model/SQLQueryTest.php
2015-04-09 16:26:16 +12:00
Daniel Hensby
aea3512e61
Merge pull request #4051 from tractorcow/pulls/3/fix-security-returnurl
...
API Security better respects BackURL on login
2015-03-31 21:44:04 +01:00
Turnerj
ae8dbe309b
FEATURE - Added maximum upload file size by type
...
This support is on both an instance level and a global default level.
2015-03-31 21:57:32 +10:30
Damian Mooyman
95c162ef0d
API Security better respects BackURL on login
...
BUG Restore missing authentication message not appearing in the login form $Content area (regression from #1807 )
2015-03-31 20:22:35 +13:00
Damian Mooyman
43f49e8434
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
admin/code/ModelAdmin.php
control/Director.php
model/SQLQuery.php
security/Member.php
tests/control/HTTPTest.php
tests/model/SQLQueryTest.php
tests/security/SecurityTest.php
tests/view/SSViewerTest.php
2015-03-31 19:54:15 +13:00
Damian Mooyman
7f983c2bae
BUG Fix SS-2014-017
2015-03-20 18:27:30 +13:00
Damian Mooyman
80fc55decf
Merge branch 'xss-fix' into '3.1'
...
Xss fix
See merge request !3
2015-03-20 18:19:53 +13:00
Christopher Pitt
604c328712
Fixed XSS vulnerability relating to rewrite_hash
2015-03-20 18:17:51 +13:00
Damian Mooyman
b34c236b3c
BUG Fix joins on tables containing "select" being mistaken for sub-selects
...
Fix PHPDoc on SQLQuery::addFrom and SQLQuery::setFrom
Fixes #3965
2015-03-18 16:10:07 +13:00
Daniel Hensby
de2aa47250
Merge pull request #4006 from kinglozzer/patch-1
...
FIX: Security::$default_message_set Config value unusable
2015-03-17 17:05:01 +00:00
Loz Calver
a61c08d031
FIX: Security::$default_message_set Config value unusable
2015-03-17 15:51:31 +00:00
Loz Calver
835ee69339
NEW: Only validate DataObject model definitions during a build
2015-03-13 16:16:16 +00:00
Loz Calver
c58f4c469d
Replace core uses of DataObject::has_one/has_many/many_many
2015-03-13 16:16:12 +00:00
Loz Calver
7e2a00aa3d
Refactor DataObject has_one/has_many/many_many methods
2015-03-13 15:15:23 +00:00
Daniel Hensby
f568052044
Testing empty absolute urls and more thorough tests
2015-03-13 13:56:14 +00:00
Loz Calver
203f77116b
Fixes, tests and documentation for multiple many_manys between the same class
2015-03-13 09:27:23 +00:00
Damian Mooyman
319b96b48b
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/05_Contributing/01_Code.md
forms/TreeDropdownField.php
model/DataObject.php
security/Member.php
tests/model/DataObjectTest.php
2015-03-11 11:40:06 +13:00
Damian Mooyman
9651889f1b
BUG Fix yaml generation to conform to version 1.1, accepted by transifex
2015-03-10 13:44:21 +13:00
Damian Mooyman
622ad54c5b
BUG Fix yaml generation to conform to version 1.1, accepted by transifex
2015-03-10 13:42:22 +13:00
Loz Calver
9c70a91f1b
Merge pull request #3977 from dhensby/pulls/3566
...
NEW LimitCharactersToClosestWord helper function
2015-03-09 11:40:58 +00:00
Daniel Hensby
ef818b3b7b
Merge pull request #3970 from tractorcow/pulls/3.2/api-zero-pagination
...
API enable PaginatedList to be disabled by setting page length to 0
2015-03-09 11:28:36 +00:00
Loz Calver
93dca9aabd
Merge pull request #3934 from dhensby/pulls/cofig-lru-fix
...
Change the LRU cache to a simple in-memory model
2015-03-09 09:31:04 +00:00
Simon Welsh
1d135552cf
Change the LRU cache to a simple in-memory model
...
Slight memory increase when there are lots of additions for much better performance in every case.
2015-03-09 02:01:24 +00:00
Damian Mooyman
95efc330e4
Refactor ViewableData::obj caching
2015-03-09 10:32:37 +13:00
Ingo Schommer
1a9c206d15
Merge pull request #3871 from patbolo/3173-folder-treedropdownfield
...
BUGFIX Use correct query when searching for items managed by a tree drop...
2015-03-08 23:23:03 +13:00
Daniel Hensby
d2a3da2203
Making docs gender agnostic
2015-03-07 12:32:04 +00:00
Anton Smith
dc7bc4673e
NEW Text - Limit characters to closest word
2015-03-05 23:12:02 +00:00
Damian Mooyman
9367fd2456
API enable PaginatedList to be disabled by setting page length to 0
2015-03-05 12:07:14 +13:00
Loz Calver
f234301c0a
FIX: DataQuery::applyRelation using incorrect foreign key ( fixes #3954 )
2015-03-02 09:56:47 +00:00
Jean-Fabien Barrois
f9d493dff5
BUGFIX Fixes case insensitive search for postgres databases
2015-03-02 09:55:29 +13:00
Will Rossiter
548f297563
Merge pull request #3890 from dhensby/pulls/testonly
...
Cleaning up Test DataObjects to ensure TestOnly is implemented
2015-02-28 18:06:53 +13:00
Jean-Fabien Barrois
bbe27999eb
BUGFIX Use correct query when searching for items managed by a tree dropdown field #3173
2015-02-27 11:18:27 +13:00
Loz Calver
3a7e24a220
FIX: Unable to access a list of all many_many_extraFields
2015-02-25 10:33:50 +00:00
Damian Mooyman
a86ed93759
Merge remote-tracking branch 'origin/3'
...
Conflicts:
docs/en/05_Contributing/01_Code.md
2015-02-20 14:09:38 +13:00
Damian Mooyman
e7619feadb
Fix merge errors and regressions
2015-02-20 11:49:47 +13:00
Damian Mooyman
dff65867cc
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
control/HTTP.php
control/HTTPResponse.php
docs/en/05_Contributing/01_Code.md
forms/CompositeField.php
forms/FormAction.php
forms/FormField.php
forms/InlineFormAction.php
forms/NumericField.php
forms/TreeDropdownField.php
forms/TreeMultiselectField.php
templates/forms/TreeDropdownField.ss
tests/core/CoreTest.php
tests/forms/NumericFieldTest.php
tests/model/DataDifferencerTest.php
2015-02-20 10:17:19 +13:00
Sean Harvey
cebc0d08c5
Merge pull request #3894 from tractorcow/pulls/3.1/encoding-fixes
...
BUG Lots of encoding fixes
2015-02-16 09:18:41 +13:00
Damian Mooyman
1db08bac88
BUG Fix FormAction title encoding
...
BUG Fix TreeMultiSelectField using the wrong label
BUG Fix encoding of selected title on TreeDropdownField
BUG Fix DataDifferencer trying to compare non-comparable fields (non-dbfield objects)
BUG: Fix issue with TreeMultiSelectField not saving
BUG: Fix issue with GridFieldPrintButton
ENHANCEMENT Instead of using multiple api calls to encode dbfield values, delegate this operation to the individual fields via forTemplate
Instead of using a new API to communicate html encoding to treeselect, just ensure all content is HTML encoded, and enable html_titles in jstree.
2015-02-13 15:50:45 +13:00
Damian Mooyman
518045257e
BUG Fixed handling of numbers in certain locales.
...
Fixes #2161
2015-02-13 10:50:00 +13:00
Daniel Hensby
0ca0bb55b0
Cleaning up Test DataObjects to ensure TestOnly is implemented
2015-02-12 15:22:29 +00:00
JorisDebonnet
047fe3a410
BUG Include php version in default cache folder name
...
Update CoreTest.php
2015-02-12 17:29:45 +13:00
Ingo Schommer
5f31983ded
NEW: updateAttributes hook in FormField
2015-02-08 19:14:31 +13:00
Benjamin R. White
6212b4bd4b
FIX: Versioned not ignoring obsolete fields
2015-02-08 18:42:36 +13:00
Will Rossiter
a4d4d0273b
Merge pull request #2506 from chillu/pulls/form-validation-exempt
...
Form validation exempts
2015-02-08 16:58:49 +13:00
Will Morgan
7c9810bf49
Merge pull request #3432 from IgorNadj/3.1-fix-minify
...
FIX making minify javascript fail-safe
2015-02-06 11:17:59 +00:00
Will Rossiter
abd1e6b856
FIX GridFieldExportButton should honour can method.
2015-02-03 16:21:37 +13:00
Daniel Hensby
5d4c2c4b34
API Adding default_classes to FormField
2015-01-20 13:36:32 +00:00
Daniel Hensby
6d0002780d
API Adding default_classes to Form
2015-01-20 13:36:31 +00:00
Loz Calver
77ebdc22fa
FIX: DataObject::db returned fields in incorrect order, with incorrect data types
...
fixes #3802
2015-01-19 20:38:08 +00:00
Damian Mooyman
58cb0af753
Merge remote-tracking branch 'origin/3'
...
Conflicts:
composer.json
docs/en/00_Getting_Started/00_Server_Requirements.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
docs/en/00_Getting_Started/04_Directory_Structure.md
docs/en/01_Tutorials/01_Building_A_Basic_Site.md
docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
docs/en/01_Tutorials/03_Forms.md
docs/en/01_Tutorials/04_Site_Search.md
docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
docs/en/01_Tutorials/index.md
docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
docs/en/02_Developer_Guides/01_Templates/06_Themes.md
docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
docs/en/02_Developer_Guides/05_Extending/05_Injector.md
docs/en/02_Developer_Guides/14_Files/index.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
docs/en/04_Changelogs/3.1.9.md
docs/en/05_Contributing/00_Issues_and_Bugs.md
docs/en/05_Contributing/02_Release_Process.md
docs/en/05_Contributing/03_Documentation.md
2015-01-16 10:08:40 +13:00
Damian Mooyman
88fdc75456
Merge remote-tracking branch 'composer/3.1' into 3
...
Conflicts:
.editorconfig
docs/en/00_Getting_Started/00_Server_Requirements.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
docs/en/00_Getting_Started/04_Directory_Structure.md
docs/en/00_Getting_Started/index.md
docs/en/01_Tutorials/01_Building_A_Basic_Site.md
docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
docs/en/01_Tutorials/03_Forms.md
docs/en/01_Tutorials/04_Site_Search.md
docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
docs/en/01_Tutorials/index.md
docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
docs/en/02_Developer_Guides/01_Templates/06_Themes.md
docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
docs/en/02_Developer_Guides/05_Extending/05_Injector.md
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/02_Developer_Guides/10_Email/index.md
docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
docs/en/02_Developer_Guides/14_Files/index.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
docs/en/04_Changelogs/3.1.9.md
docs/en/05_Contributing/00_Issues_and_Bugs.md
docs/en/05_Contributing/02_Release_Process.md
docs/en/05_Contributing/03_Documentation.md
filesystem/File.php
filesystem/GD.php
model/DataDifferencer.php
model/Versioned.php
security/BasicAuth.php
security/Member.php
tests/filesystem/FileTest.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/VersionedTest.php
tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
Will Rossiter
220bdf342c
Merge pull request #3577 from tractorcow/pulls/3.1/fix-basicauth-resetlogin
...
BUG Fix BasicAuth not resetting failed login counts on authentication
2015-01-15 11:03:52 +13:00
Damian Mooyman
7816875e92
Fix file and uploadfield permissions
2015-01-12 10:56:25 +13:00
Ingo Schommer
c705c547fd
Behat: Ignore native dropdowns if they're not visible
...
The CmsUiContext->theIFillInTheDropdownWith() method was written
primarily for TreeDropdownField, which don't have a select tag (only an input tag).
The method currently fails for CMS dropdowns (Dropdown form field class),
since they have a hidden select tag.
I've checked through core feature files and confirmed that every use
of the method relates to TreeDropdownField, which is why this bug hasn't ocurred earlier.
2015-01-06 10:19:17 +13:00
Damian Mooyman
19549d620f
Moved deprecation of SQLQuery to 4.0
2014-12-04 09:30:50 +13:00
Damian Mooyman
1f4f5e68ba
BUG Fix versioned
...
Versioned is not writing Version to _version tables for subclasses of Version dataobjects which have their own DB fields
- Fix disjoint of ID / RecordID (which should be the same)
- Fix calculation of new record version
- Fix use of empty vs !isset to check for existing version
Conflicts:
model/Versioned.php
tests/model/VersionedTest.php
Cherry picked from commit c140459ac6
2014-12-02 22:30:59 +02:00
Ingo Schommer
5d1c355cad
Form action validation excempts
...
Thanks to @kinglozzer for doing the majority of work on this. See #2493 .
2014-11-26 22:49:37 +13:00
Igor Nadj
77e30d4524
Cleanup, removing redundant returns
2014-11-26 15:31:07 +13:00
Igor Nadj
657606e8c8
Updating code to allow unit test to use try-catch block to catch warning
...
without stopping code execution inside try
2014-11-26 15:27:54 +13:00
Damian Mooyman
6baf63e18c
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
dev/install/install.php5
docs/en/changelogs/index.md
security/Security.php
2014-11-19 11:16:46 +13:00
Damian Mooyman
ce93a8a98e
Resolve merge regressions
2014-11-19 11:05:07 +13:00
Damian Mooyman
2bdfd65e9b
BUG Security::findAnAdministrator doesn't always find an admin
2014-11-18 15:36:34 +13:00
Damian Mooyman
0b1f297873
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
README.md
admin/code/LeftAndMain.php
admin/css/screen.css
admin/scss/screen.scss
api/RestfulService.php
conf/ConfigureFromEnv.php
control/injector/ServiceConfigurationLocator.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
core/Object.php
css/AssetUploadField.css
css/ComplexTableField_popup.css
dev/CSSContentParser.php
dev/DevelopmentAdmin.php
docs/en/changelogs/index.md
docs/en/misc/contributing/code.md
docs/en/reference/execution-pipeline.md
filesystem/GD.php
filesystem/ImagickBackend.php
filesystem/Upload.php
forms/Form.php
forms/FormField.php
forms/HtmlEditorConfig.php
forms/gridfield/GridFieldDetailForm.php
forms/gridfield/GridFieldSortableHeader.php
lang/en.yml
model/Aggregate.php
model/DataList.php
model/DataObject.php
model/DataQuery.php
model/Image.php
model/MySQLDatabase.php
model/SQLQuery.php
model/fieldtypes/HTMLText.php
model/fieldtypes/Text.php
scss/AssetUploadField.scss
search/filters/SearchFilter.php
security/Authenticator.php
security/LoginForm.php
security/Member.php
security/MemberAuthenticator.php
security/MemberLoginForm.php
security/Security.php
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
tests/control/HTTPTest.php
tests/control/RequestHandlingTest.php
tests/filesystem/UploadTest.php
tests/forms/FormTest.php
tests/forms/NumericFieldTest.php
tests/model/DataListTest.php
tests/model/DataObjectTest.php
tests/model/TextTest.php
tests/security/MemberAuthenticatorTest.php
tests/security/SecurityDefaultAdminTest.php
tests/view/SSViewerCacheBlockTest.php
tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13:00
Stevie Mayhew
41ea83b337
FEATURE: add validation to form field subclasses
2014-11-17 08:17:38 +13:00
Damian Mooyman
7f2161d7a0
Merge pull request #3599 from kinglozzer/numericfield-whitespace
...
Fix whitespace issues in NumericField/NumericFieldTest
2014-11-14 10:31:21 +13:00
Sam Minnée
71c354d768
Merge pull request #3623 from kinglozzer/pulls/dataobject-db-inheritance
...
FIX: DataObject::db() doesn't respect overloaded db types (fixes #3620 )
2014-11-12 13:41:03 +13:00
Loz Calver
85b4ba15fc
FIX: DataObject::db() doesn't respect overloaded db types ( fixes #3620 )
2014-11-11 10:41:54 +00:00
g4b0
239ed66eaf
Bugfix: fixed inheritance breaks filtering if relations are included (issue #3610 )
2014-11-11 10:04:41 +01:00
Loz Calver
76b833dfbb
Fix whitespace issues in NumericField/NumericFieldTest
2014-11-03 09:13:54 +00:00
muskie9
082c49c1b5
Bugfix NumericField shows (none) for 0 on readonly
2014-11-02 20:57:20 -06:00
Stephen McMahon
20af30ed98
FIX GridFieldExportButton exporting only Paginated list when using ArrayList as source
2014-10-27 11:03:00 +11:00
Loz Calver
a77ca1995a
Merge pull request #3521 from halkyon/bigsummary_plain_fix
...
BUG Text::BigSummary() fails with undefined $data when $plain = false
2014-10-25 23:30:36 +01:00
Loz Calver
2176a6dea8
Merge pull request #3576 from tractorcow/pulls/3.1/upload-attach
...
BUG File attach handler is no longer accessible if attachment is disallowed or disabled
2014-10-25 23:12:03 +01:00
Damian Mooyman
0a04e2e77b
Merge pull request #3484 from dnadesign/object_has_extension_fix
...
fixed and tested object has_extension
2014-10-24 17:20:00 +13:00
John Milmine
62658a6cca
fixed and tested object has_extension
2014-10-24 16:58:50 +13:00
Damian Mooyman
9d78eb7fe6
BUG Fix BasicAuth not resetting failed login counts on authentication
2014-10-24 14:19:12 +13:00
Damian Mooyman
5d27ea4be1
BUG File attach handler is no longer accessible if attachment is disallowed or disabled
2014-10-24 11:31:33 +13:00
Devlin
478edfa0c6
BUG Upload: File versioning with existing files
...
reinsert oldFilePath = relativeFilePath in while loop
2014-10-22 08:48:55 +13:00
Damian Mooyman
49cb38dfc1
BUG Fix static call to protected instance method
2014-10-20 17:04:25 +13:00
Sam Minnée
3d9fa205fe
Merge pull request #3547 from kinglozzer/pulls/3546-apply-relation
...
Fix DataQuery::applyRelation for multiple relations of the same class (fixes #3546 )
2014-10-15 18:00:19 +13:00
Damian Mooyman
53c40a94fa
API Enable re-authentication within the CMS if a user session is lost
...
BUG Resolve issue with error redirection being ignored within CMS
BUG Fix issue with invalid securityID being re-emitted on failure
2014-10-14 15:19:48 +13:00
Damian Mooyman
793784e9d7
BUG Fix flushing of SSViewer cache via testing
2014-10-14 09:47:05 +13:00
Loz Calver
c52e94e98e
Fix DataQuery::applyRelation for multiple relations of the same class ( fixes #3546 )
2014-10-13 19:46:37 +01:00
Loz Calver
97170dd42d
Better tests for SSViewer::flush & Flushable
2014-10-13 09:44:14 +01:00
Sean Harvey
f86b0bbca0
Merge pull request #3459 from jdemeschew/3356-fix-js-not-properly-included
...
Fix #3356 js not properly included
2014-10-13 16:41:37 +13:00
Loz Calver
48eb0e67e6
FIX: Deliberately clear partial cache blocks on flush ( fixes #1383 )
...
Move property to top of class definition
Move property to top of class definition
2014-10-09 21:44:01 +01:00
Damian Mooyman
1e612607aa
Suggested improvements / test case fixes
2014-10-10 09:28:11 +13:00
Daniel Hensby
3b9056fc01
NEW Cookie_Backend for managing cookie state
...
I've decoupled `Cookie` from the actual act of setting and getting
cookies. Currently there are a few limitations to how Cookie works that
this change mitigates:
0. `Cookie` currently changes the super global `$_COOKIE` when setting
to make the state of an application a bit more managable, but this is
bad because we shouldn't be modifying super globals
0. One can't actually change the `$cookie_class` once the
`Cookie::$inst` has been instantiated
0. One can't test cookies as there is no class that holds the state of
the cookies (it's just held in the super global which is reset as part
of `Director::test()`
0. One can't tell the origin of a cookie (eg: did the application set it
and it needs to be sent, or did we receive it from the browser?)
0. `time()` was used, so testing was made difficult
0. There was no way to get all the cookies at once (without accessing
the super global)
Todos are on the phpdoc and I'd like to write some tests for the backend
as well as update the docs (if there are any) around cookies.
DOCS Adding `Cookie` docs
Explains basic usage of `Cookie` as well as how the `Cookie_Backend`
controls the setting and getting of cookies and manages state of sent vs
received cookies
Fixing `Cookie` usage
`Cookie` is being used inconsistently with the API throughout framework.
Either by not using `force_expiry` to expire cookies or setting them to
null and then expiring them (which is redundant).
NEW `Director::test()` takes `Cookie_Backend` rather than `array` for `$cookies` param
2014-10-06 17:44:51 +13:00
Sean Harvey
776f6976c9
BUG Text::BigSummary() fails with undefined $data when $plain = false
2014-10-01 16:02:28 +13:00
Thierry François
bbc1cb8270
FIX #3458 iframe transport multi file upload FIX #3343 , FIX #3148
...
UploadField now handles multiple file upload through iframe transport
correctly (mainly for IE) as well as upload errors on a per file basis.
2014-09-26 10:48:41 +03:00
Sean Harvey
c57c24eb81
Merge pull request #3464 from InfinityIo/rewrite_hash_links-SSTemplateParser-fix
...
Fix over-eager rewrite_hash_links regexp in SSTemplateParser
2014-09-26 18:14:08 +12:00
Nik
5258b84e5c
Updated SSViewerTest to test for SSTemplateParser rewrite_hash_links fix
2014-09-26 17:41:27 +12:00
Damian Mooyman
db0cad4616
BUG ErrorControlChain now supports exception handling
2014-09-26 16:54:34 +12:00
torleif
75ec0c4791
Added tests that check comparisonClause()
...
AS requested by tractorcow: https://github.com/silverstripe/silverstripe-postgresql/pull/26
Tested on MySQL (succeeds as expected) Tested on PostgreSQL (and fails as expected, but passes with patch). The fixes test only DataQueryTest related items for consistency, e.g. by avoiding DataObject calls.
2014-09-26 12:11:33 +12:00
Sean Harvey
e3056ed831
Merge pull request #3486 from jeffreyguo/pulls/html-field
...
Updated html field to support quotes
2014-09-26 11:16:42 +12:00
Sean Harvey
f7af0d8955
Merge pull request #3398 from dnadesign/fixsortableheader
...
API: Add ClassInfo::table_for_object_field to return the table name for ...
2014-09-26 11:14:33 +12:00
Will Rossiter
920978df99
API: Add ClassInfo::table_for_object_field
...
Returns the table name for a field in a class hierarchy.
This issue raised itself with GridFieldSortableHeader not supporting sorting on fields from parent class fields.
2014-09-26 10:38:31 +12:00
Sean Harvey
99f8fb29b5
Merge pull request #3507 from tractorcow/pulls/fix-mailer
...
API / FIX / Cleanup - Mailer and Convert::html2raw
2014-09-26 10:15:18 +12:00
Gabrijel Gavranović
cf456d6625
FIX use @param $colName in column call
2014-09-26 09:18:29 +12:00
Damian Mooyman
bf4e9eb044
API Singleton method allowing type inference
...
This pattern improves over the current usage of singleton by allowing type inference.
This also better supports refactor, code usage detection, and auto-completion of classes.
2014-09-26 09:10:25 +12:00
Sean Harvey
ee717c7f66
Merge pull request #3287 from IgorNadj/3.1
...
ENH making /dev extendable
2014-09-25 18:34:21 +12:00
Sean Harvey
04e26d4a36
Merge pull request #3025 from tractorcow/pulls/3.2-date-relevance
...
API DateTime.Ago better infers significance of date units.
2014-09-25 18:28:30 +12:00
Sean Harvey
409aebf0af
Merge pull request #2515 from guttmann/html-text-absolutelink-placeholders
...
HTMLText AbsoluteLink parse placeholders
2014-09-25 16:07:41 +12:00
Damian Mooyman
e47800917a
API Mailer can be configured to use different encoding mechanisms, and added support for unicode quoted-string encoding
...
API Mailer bounce email can now be configured
API Mailer no longer calls Convert::xml2raw on all email subjects
API Deprecate dead Mailer code and refactored duplicate or mis-documented code.
2014-09-25 16:04:56 +12:00
Damian Mooyman
29e3347562
API Convert::html2raw no longer wraps text automatically
...
BUG Convert::html2raw now correctly decodes single quotes
2014-09-25 16:04:48 +12:00
Sean Harvey
bbd4e8b8c1
Merge pull request #3462 from tractorcow/pulls/3.2/fix-versioned
...
BUG Fix versioned failing to generate new versions
2014-09-24 18:03:40 +12:00
Sean Harvey
6d12cf372e
Merge pull request #2921 from JayDevlin/2904-upload-file-versioning
...
BUG Upload: file versioning uses illegal underscore in filename
2014-09-24 15:59:53 +12:00
Sean Harvey
4ae0d90c55
Merge pull request #2946 from tractorcow/pulls/3.1-fix-injector-inheritance-bug
...
BUG Fix issue with inheritance of Injector service configuration
2014-09-24 15:52:00 +12:00
Ingo Schommer
fb8b22c292
Merge pull request #3402 from halkyon/plural_fix
...
BUG Fixing plural_name messing up singular words ending in "e" (#3251 )
2014-09-18 21:56:56 +12:00
Damian Mooyman
062ad8e685
API Allow parameterised joins / subselects
2014-09-16 17:54:30 +12:00
Jeffrey Guo
1f5f2a1798
Updated html field to support quotes
2014-09-12 15:09:12 +12:00
Juri Demeschew
3eabd7d41a
Fix #3356 js not properly included
2014-09-09 06:59:31 +02:00
Sean Harvey
151b7e9876
Adding ability to change query distinct on DataList and DataQuery
2014-09-04 13:51:43 +12:00
Damian Mooyman
c140459ac6
BUG Fix versioned
...
Versioned is not writing Version to _version tables for subclasses of Version dataobjects which have their own DB fields
- Fix disjoint of ID / RecordID (which should be the same)
- Fix calculation of new record version
- Fix use of empty vs !isset to check for existing version
2014-09-02 09:14:08 +12:00
Nightjar
e4b563e596
Fixing the failure of some tests if the framework dir is named something other than 'framework' (which is a legitimate option)
2014-09-01 13:53:06 +01:00
Will Rossiter
7993875f16
FIX: Sorting a DataQuery over a relation.
...
When sorting a DataQuery over a relation, the SQLQuery automatically included the sort column. The issue with the implement is that potentially the joined record has a field with the same name as the source record causing it to be overridden.
In the attached test case, without the patch the title will be set to 'Bar' rather than 'Foo'.
This patch aliases the sort column. Alternativally a patch would be to
2014-08-26 17:41:38 +12:00
Igor Nadj
f823831a63
FIX making minify javascript fail-safe
2014-08-25 11:49:38 +12:00
Damian Mooyman
96d0874953
BUG Fix issue with inheritance of Injector service configuration
2014-08-25 10:23:01 +12:00
Damian Mooyman
5b553616dc
API DateTime.Ago better infers significance of date units.
...
BUG Fixes missing i18n translation in Date::TimeDiffIn
BUG Fixes Date::TimeDiffIn not respecting mocked SS_Datetime::now
This provides less vague date periods. I.e. "36 days" has a lot more relevance that "1 month"
Reduced duplication of time period calculation code
(ref: CWPBUG-141)
2014-08-25 10:04:24 +12:00
Sean Harvey
0e07f1a7f5
Merge remote-tracking branch 'origin/3.0' into 3.1
2014-08-22 17:50:36 +12:00
Ingo Schommer
1661213e5b
FIX Opt-out pf form message escaping ( fixes #2796 )
...
This fixes a limitation introduced through http://www.silverstripe.org/ss-2013-008-xss-in-numericfield-validation/ .
Form messages used to accept HTML, now they’re escaped by default, effectively removing the ability
to pass in HTML and take care of escaping manually.
We pass through HTML to message in core through the CTF system, so this needs to be fixed.
It’s an alternative fix to https://github.com/silverstripe/silverstripe-framework/pull/2803 .
2014-08-22 16:59:34 +12:00
Sean Harvey
8063b349c8
BUG Fixing Director::test() failing on BASE_URL prefixed URLs
...
Example: you have a site in a sub-directory off the webroot, you call
->Link() on a SiteTree record, which returns "/[sitedir]/my-page", and
you pass this URL to Director::test(). It's a valid URL, but
Director::test() will throw a 404.
Director::test() should be ensuring that all URLs passed to it are
properly made relative, not just in the case where it thinks the URL
is absolute.
2014-08-22 15:21:53 +12:00
Damian Mooyman
aec8430395
Merge pull request #3393 from halkyon/flushable
...
NEW Provide a consistent way of triggering flush
2014-08-22 10:28:26 +12:00
Sean Harvey
2b316e79e5
NEW Provide a consistent way of triggering flush
...
Provides an interface for classes to implement their own flush()
functionality. This function gets called early in a request on
all implementations of Flushable when flush=1|all is requested in the
URL.
This fix came out of an issue where Requirements combined files were not
being cleaned up after dev/build?flush=1, due to the fact that flush
would only occur when you called it while on a page that used those
combined files, but not in any other contexts. This will now call flush
on any implementors of Flushable regardless of the context of where
flush was called.
2014-08-22 09:24:27 +12:00
Sean Harvey
61c6dee057
BUG Fixing plural_name messing up singular words ending in "e" ( #3251 )
...
This would ideally be fixed with the ability to use an external library
like gettext, but that's an API change. This for now fixes the issue
where a singular like "Page" returns "Pags" for the plural name.
2014-08-20 14:55:40 +12:00
Devlin
4178f7beb0
test all generate methods and formatted image deletetions
2014-08-19 10:12:47 +02:00
Damian Mooyman
eb069e605d
Remove all redundant whitespace
2014-08-19 09:17:15 +12:00
Sean Harvey
404478b07f
Removing @deprecated 3.1 functionality and classes.
...
Changelog has been updated to include what was removed in terms of
major functionality, and what to use as a replacement.
2014-08-18 16:00:13 +12:00
Sean Harvey
5f1552b365
BUG Custom label set in summary_fields config gets overridden
2014-08-14 14:19:41 +12:00
Mateusz Uzdowski
8bf3853887
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/misc/contributing/issues.md
docs/en/reference/uploadfield.md
forms/HtmlEditorField.php
i18n/i18n.php
javascript/HtmlEditorField.js
model/DB.php
model/Image.php
model/SQLQuery.php
2014-08-14 09:08:26 +12:00
John Milmine
0a36951ab1
adding exclamation mark and question mark to delimiters, made text work the same as HTML Text
2014-08-07 21:01:23 +10:00
Igor Nadj
b3d52de531
ENH making /dev extendable
2014-08-06 16:29:52 +12:00
Marcus Nyeholt
b273f3b524
API Updated aspect proxy service
...
- Updated AspectProxyService to handle multiple handlers for each proxied
object's methods.
- Changed BeforeCallAspect to allow for providing a return value that
should be returned to the caller instead of the proxied return value
- Changed AfterCallAspect behaviour to allow for returning the value of
the aspect to the caller instead of the proxied return value
2014-08-06 13:48:26 +10:00
Sean Harvey
1759d5d017
API Use "number" HTML5 type for NumericField by default
2014-08-04 14:27:35 +12:00
Damian Mooyman
2c24d51c0b
Revert #3358
2014-08-04 12:13:19 +12:00
Sean Harvey
b2dac644a0
BUG Fixed escaping of name/value in options of form fields
...
DropdownField was currently escaping options, but CheckboxSetField and
OptionsetField were not. This fixes them to be consistent.
2014-08-04 09:55:35 +12:00
Damian Mooyman
a89dbd29e1
Revert #3345 #3323
2014-07-31 17:05:57 +12:00
Daniel Hensby
04e5c11ed9
TEST Empty absolute urls - tests for #3323
2014-07-30 23:22:37 +01:00
Jeffrey Guo
5519a026e8
expand a tree node and check a CMS tab
2014-07-30 17:17:08 +12:00
Stig Lindqvist
333a2aa8f9
BUG: CMS tree filters doesn't count the correct number of children for deleted pages
...
This is a bug that combines Hierarchy, Versioned and LeftAndMain admins and CMSSiteTreeFilters.
This bug can be reproduced by having a large site tree with enough deleted pages in it so it doesn't
pre load all the children pages when initially opening an admin. Filter by either 'All pages including deleted'
or 'Deleted pages'. For CMS users it will look like deleted pages are gone.
The solution involves a couple of smaller fixes in both CMS and framework modules.
1) Ensure that 'numHistoricalChildren' are used instead of 'numChildren' when dealing with deleted pages
2) LeftAndMain::currentPage() deletes all the 'marking' cache previously built up by Hierarchy::markPartialTree()
3) Use Versioned::get_included_deleted() instead of raw DB queries against the DataObject tables when calculating parents in CMSSiteTreeFilter
2014-07-25 16:19:30 +12:00
Damian Mooyman
0433ba1642
BUG Revert some changes to ManyManyList
...
BUG Fix incompatibility in Member_GroupList
Fix regressions in merges from 3.1
BUG Fix Security failing on test classes
BUG Fix postgresql compatibility
Clarify sql encoding of table names
2014-07-23 12:38:41 +12:00
Senorgeno
df6a8b6fb6
BUG #3282 : Added ability to subselect with in left or inner join
2014-07-17 13:27:28 +12:00
Simon Welsh
c14d58f585
Merge branch '3.1'
...
Conflicts:
.travis.yml
model/ManyManyList.php
model/fieldtypes/DBField.php
2014-07-16 21:24:02 +10:00
Loz Calver
791ee7171b
API: Prevent large images from repeatedly crashing PHP on resize
2014-07-16 09:18:51 +01:00
Damian Mooyman
d8e9af8af8
API New Database abstraction layer. Ticket #7429
...
Database abstraction broken up into controller, connector, query builder, and schema manager, each independently configurable via YAML / Injector
Creation of new DBQueryGenerator for database specific generation of SQL
Support for parameterised queries, move of code base to use these over escaped conditions
Refactor of SQLQuery into separate query classes for each of INSERT UPDATE DELETE and SELECT
Support for PDO
Installation process upgraded to use new ORM
SS_DatabaseException created to handle database errors, maintaining details of raw sql and parameter details for user code designed interested in that data.
Renamed DB static methods to conform correctly to naming conventions (e.g. DB::getConn -> DB::get_conn)
3.2 upgrade docs
Performance Optimisation and simplification of code to use more concise API
API Ability for database adapters to register extensions to ConfigureFromEnv.php
2014-07-09 18:04:05 +12:00
Damian Mooyman
c26df0b3c6
Revert "BUG Config::merge_array_low_into_high() ignores falsey values"
2014-07-09 09:57:25 +12:00
Sean Harvey
16e546300f
BUG Config::merge_array_low_into_high() ignores falsey values
...
Specific case: LeftAndMain::$session_keepalive_ping = true cannot be
set to false in config.yml for some cases because the value is ignored
when merge_array_low_into_high() is processing the config arrays.
2014-07-08 15:18:26 +12:00
Sean Harvey
d1d295056b
Merge pull request #3265 from stevie-mayhew/images-force-resample
...
FEATURE allow force resampling on images
2014-07-07 11:27:16 +12:00
Damian Mooyman
c30111eee3
Better encoding of javascript
...
Fixes #2988
2014-07-07 09:01:53 +12:00
Stevie Mayhew
1d86fe4f52
FEATURE allow force resampling on images
2014-07-05 14:29:01 +12:00
Damian Mooyman
d3c7e41419
BUG using isDev or isTest query string no longer triggers basic auth
2014-07-02 11:51:51 +12:00
Will Rossiter
2c741fec0c
FIX Add support for compositedbfield within many_many_extraFields
...
Previously selectFromTable would simply try to select the composite field name. This expands the extraField name to include the children field names and uses CompositeDBField::writeToManipulation to generate the correct SQL for the queries.
2014-06-28 10:54:48 +12:00
Damian Mooyman
6ff1d3ccbc
Merge pull request #3225 from halkyon/log_constants
...
Adding some more commonly used SS_Log priority constants.
2014-06-23 13:15:45 +12:00
Sean Harvey
9c2ddd4850
Adding some more commonly used SS_Log priority constants.
2014-06-23 11:50:05 +12:00
Sean Harvey
0ee3a683a5
Better support for overloading start and destroy methods in Session
...
Move functionality from static start and destroy functions into instance
methods, allowing these to be overloaded. This works the same way as
calling Session::set() which then in turn calls inst_set()
Additionally use Injector to create the default Session instance to
allow the class to be swapped out.
2014-06-20 10:35:53 +12:00
Damian Mooyman
ef03dfdd5b
Merge remote-tracking branch 'origin/3.1'
2014-06-17 18:17:24 +12:00
Damian Mooyman
11cc27f700
Merge pull request #2967 from halkyon/formfield_readonly
...
Fixing FormField not setting readonly attribute on setReadonly(true)
2014-06-17 14:48:56 +12:00
Sean Harvey
b4bfb75a0d
Merge pull request #3207 from chillu/pulls/behat-gridfield
...
Moved table-related feature steps to behat extension
2014-06-17 13:43:33 +12:00
Loz Calver
3d71a22a98
FIX: ClassManifest errors if files contain duplicate class names ( fixes #3210 )
2014-06-16 22:18:18 +01:00
Ingo Schommer
bb03f6ba2f
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
forms/HtmlEditorField.php
2014-06-15 22:50:20 +12:00
Ingo Schommer
415ba11356
Merge pull request #3175 from tractorcow/pulls/3.1/mink-update
...
Update for Mink 1.6 compatibility (DO NOT MERGE)
2014-06-13 16:34:22 +12:00
Ingo Schommer
a433fa2ec4
Moved table-related feature steps to behat extension
...
Reused for tables other than GridField.
See https://github.com/silverstripe-labs/silverstripe-behat-extension/pull/51
2014-06-13 15:10:16 +12:00
Damian Mooyman
d516063db7
BUG fix dependency injection stumbling over ViewableData's __isset
2014-06-12 10:08:59 +12:00
Damian Mooyman
4c5de82625
Versioned no longer sets redundant session data
2014-06-11 16:42:22 +12:00
Damian Mooyman
4fdfff8a23
Update for Mink 1.6 compatibility
2014-05-30 15:46:54 +12:00
Simon Welsh
9b3bfb2e10
Merge pull request #3145 from tractorcow/pulls/3.1/fix-choose-stage
...
BUG Fix access to protected Session::current_session()
2014-05-24 11:07:40 +10:00
Simon Welsh
b020cabc1a
Merge pull request #3138 from tractorcow/pulls/3.1/fix-arraylist-sorting
...
BUG ArrayList failing to respect the SS_Sortable interface
2014-05-24 11:05:25 +10:00
Ingo Schommer
ec325a3c7f
API Fix HTTPS proxy header detection
...
Didn't use the de facto standard HTTP_X_FORWARDED_PROTO or the less standard HTTP_FRONT_END_HTTPS.
Removed the 'X-Forwarded-Proto', since PHP should prefix/underscore all HTTP headers before it hits $_SERVER.
References:
- https://docs.djangoproject.com/en/1.4/ref/settings/#secure-proxy-ssl-header
- https://drupal.org/node/1859252
- https://drupal.org/node/313145
- http://scottwb.com/blog/2013/02/06/always-on-https-with-rails-behind-an-elb/
2014-05-22 18:34:15 +12:00
Devlin
5f7ebd3c23
API UploadField: move replaceFile to the front end config
2014-05-21 12:03:26 +02:00
Damian Mooyman
4a34c364e6
BUG Fix access to protected Session::current_session()
...
Fixes #3144
2014-05-20 10:17:33 +12:00
Damian Mooyman
c24a2c2177
BUG ArrayList failing to respect the SS_Sortable interface
...
ref: CWPBUG-133
2014-05-15 14:25:23 +12:00
Damian Mooyman
ec578e5c8a
Merge remote-tracking branch 'origin/3.1'
2014-05-12 11:32:22 +12:00
Damian Mooyman
51c3346b46
BUG Fix deprecated use of statics in test cases
2014-05-12 08:44:11 +12:00
Ingo Schommer
a05d8113af
Merge pull request #3103 from simonwelsh/configstatic_nextstring
...
Adds to nextString() method to ConfigStaticManifest
2014-05-09 16:08:19 +12:00
Daniel Hensby
7617f08ad3
Use Controller::join_links()
in RestfulService
...
At the moment, `RestfulService` duplicates functionality of
`Controller::join_links` (badly) and it means that one MUST use a base
URL with a trailing slash for the URL to be constructed properly
Plus tests for `RestfulService::getAbsoluteRequestURL()`
API Deprecating `RestfulService::constructURL()`
This function isn't used in core so we should remove it
2014-05-08 08:59:57 +01:00
Ingo Schommer
6d3f7887a6
Merge pull request #3018 from willmorgan/patch-3
...
FIX change action variable source to getViewer
2014-05-07 08:38:33 +12:00
Simon Welsh
3602ce2db8
Adds to nextString() method to ConfigStaticManifest
...
This is used to get the classname out of the tokens, rather than assuming that
the class name is a single T_STRING.
2014-05-06 15:35:37 +10:00
Hamish Friedlander
50e1ed2f72
Merge pull request #3101 from tractorcow/pulls/3.1-fileexists-checking
...
BUG Better checking of existing files
2014-05-06 15:32:06 +12:00
Hamish Friedlander
149b4e4356
Merge pull request #3019 from tractorcow/pulls/3.1-dataquery-tables
...
BUG Fix data query not always joining necessary tables
2014-05-06 15:26:26 +12:00
Damian Mooyman
ae573f829f
BUG Fix Versioned stage not persisting in Session. Fixes #962
...
BUG Disabled disruptive test case in DirectorTest
API RequestProcessor and VersionedRequestFilter now both correctly implement RequestFilter
Better PHPDoc on RequestFilter and implementations
2014-05-06 14:11:44 +12:00
Damian Mooyman
df28ccb59f
BUG Better checking of existing files
...
[ref: CWPBUG-158]
2014-05-06 14:06:16 +12:00
Damian Mooyman
a3c8a594ca
BUG Fix data query not always joining necessary tables
...
Fixes #2846
2014-05-06 12:22:46 +12:00
Hamish Friedlander
bbd7bba11f
Merge pull request #3058 from tractorcow/pulls/injector-stack-tests
...
API Injector supports nesting
2014-05-06 11:35:32 +12:00
Damian Mooyman
e9c3ff933f
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
composer.json
2014-05-06 10:22:09 +12:00
Hamish Friedlander
ad27cd5ec9
FIX Folder Title not being exactly the same as Name field
...
Backport to 3.0 of PR #3086
2014-05-05 14:39:45 +12:00
Ingo Schommer
f2b2ee8a68
Merge pull request #3021 from tractorcow/pulls/3.1-htmltext-whitelist
...
BUG HTMLText whitelist considers text nodes
2014-05-05 13:23:52 +12:00
Hamish Friedlander
8e841cc471
FIX folder Title not being exactly the same as Name field if setName modified the value
2014-05-02 14:41:10 +12:00
Ingo Schommer
ff42ad268e
Merge pull request #3077 from tractorcow/pulls/fix-imagetest
...
BUG Fix ImageTest
2014-04-29 21:34:04 +12:00
Mateusz U
2c9f99c1f0
Merge pull request #3031 from tractorcow/pulls/3.1-fix-tree-duplication
...
BUG Fix jstree when duplicating subtrees
2014-04-29 16:19:00 +12:00
Damian Mooyman
0b4f62dfd8
BUG Fix jstree when duplicating subtrees
2014-04-29 16:00:07 +12:00
Damian Mooyman
91034d1341
BUG HTMLText whitelist considers text nodes
...
Minor improvement to #2853 .
If a list of whitelisted elements are specified, text nodes no longer evade the whitelist
2014-04-29 11:52:16 +12:00
Damian Mooyman
2e73dcb891
API Remove swf,html,htm,xhtml,xml as default allowed upload able file types
2014-04-29 11:09:30 +12:00
Damian Mooyman
d06d5c113b
API Injector supports nesting
...
BUG Resolve issue with DirectorTest breaking RequestProcessor
Injector::nest and Injector::unnest are introduced to better support sandboxing of testings.
Injector and Config ::nest and ::unnest support chaining
Test cases for both Injector::nest and Config::nest
2014-04-29 08:59:33 +12:00
Damian Mooyman
8673b11cd9
BUG Fix ImageTest
...
Image test would erroneously reset the Image::$backend to null if the test was skipped, breaking subsequent test cases
2014-04-29 08:57:23 +12:00
Stephan Bauer
81210bb6fe
Enhanced DBTest to respect SS_DATABASE_PREFIX if set
2014-04-24 23:32:23 +02:00
Damian Mooyman
1dcaf36c9b
Fix merge regressions
2014-04-22 13:28:44 +12:00
Damian Mooyman
982ad569b9
Merge remote-tracking branch 'origin/3.1'
2014-04-22 12:09:51 +12:00
Hamish Friedlander
f2c4a629a7
FIX: ConfirmedPasswordField used to expose existing hash
2014-04-17 11:57:57 +12:00
Will Morgan
c6797f52ea
Test nested controller actions and Controller->getViewer
...
Adds tests and supporting classes for testing that the correct action is passed to Controller->getViewer inside Controller->handleRequest.
2014-04-16 13:34:09 +01:00
Damian Mooyman
3620d01998
Merge pull request #3004 from stecman/delete-resampled-after-image-upload
...
Delete formatted images after image upload
2014-04-16 08:10:37 +12:00
Damian Mooyman
997077ae83
API Security.remember_username to disable login form autocompletion
2014-04-11 09:05:25 +12:00
Damian Mooyman
d8836fd488
Merge remote-tracking branch 'origin/3.0' into 3.1
2014-04-08 17:10:07 +12:00
Stephen Holdaway
3be01968ec
Delete formatted images after image upload
...
This change fixes an issue where old/existing formatted images are used
when a filename is reused (by overwrite or by coincidence), regardless
of if the file contents have changed. To users this mainly manifests
as a file overwrite appearing not to work; the thumbnails in the CMS
show the original image until regeneration is forced.
Calling Image::deleteFormattedImages() after image upload ensures that
no stagnant formatted images will be used.
2014-04-08 14:33:44 +12:00
Damian Mooyman
15c6b67c29
Docs / Tests for Director::absoluteURL
2014-04-08 09:16:48 +12:00
Damian Mooyman
4c69d42bd2
Merge remote-tracking branch 'origin/3.1'
2014-04-02 17:23:39 +13:00
Damian Mooyman
84d8022b32
BUG Fix Date and SS_DateTime::FormatFromSettings
...
This issue is caused by the odd default behaviour of Zend_Date, which attempts to parse yyyy-mm-dd format date and times as though they were yyyy-dd-mm.
2014-04-02 15:38:35 +13:00
Mateusz Uzdowski
38609c0762
Add Behat behaviours to click links and submit forms in preview.
2014-04-01 11:04:42 +13:00
Simon Welsh
1d5706f15c
Correct line length and indentation
2014-03-30 21:11:56 +13:00
Simon Welsh
e07b14f5bc
Correct line length and endings
2014-03-30 20:59:28 +13:00
Simon Welsh
dde90dc346
Correct line length and endings
2014-03-30 19:51:38 +13:00
Simon Welsh
2566795b59
Merge branch '3.1'
...
Conflicts:
view/SSViewer.php
2014-03-30 19:39:18 +13:00
Simon Welsh
ac1546eb97
Correct line length and indentation
2014-03-30 19:37:54 +13:00
Simon Welsh
6db96eac8f
Correct errors from differening behaviour between 3.0 and 3.1
2014-03-30 19:29:18 +13:00
Simon Welsh
fe8dc50ffc
Merge branch '3.1'
...
Conflicts:
tests/view/SSViewerTest.php
2014-03-30 18:17:24 +13:00
Simon Welsh
f9c44e4ceb
Merge branch '3.0' into 3.1
...
Conflicts:
model/Versioned.php
view/SSTemplateParser.php
view/SSViewer.php
2014-03-30 18:15:12 +13:00
Damian Mooyman
cf5d524235
BUG Fix regressions from #2206 in hasValue and dbObject
...
Fixes #2982
2014-03-30 18:05:46 +13:00
Damian Mooyman
4415a75d93
BUG Fix issue with versioned dataobjects being cached between stages
2014-03-27 13:17:29 +13:00
Ingo Schommer
023641e263
Merge pull request #2776 from ryanwachtl/fix-get-candidate-template
...
FIX Overriding of theme templates in project folder
2014-03-25 23:08:36 +13:00
Devlin
0096ab0d3d
Upload: refactor file versioning
2014-03-24 11:45:37 +01:00
Sean Harvey
f11adcfe2e
Fixing FormField not setting readonly attribute on setReadonly(true)
2014-03-24 08:59:35 +13:00
Damian Mooyman
7c60c73dbb
API Polymorphic has_one behaviour
2014-03-18 09:18:04 +13:00
James Goodman
cd4ebb25ca
Fix HTMLText AbsoluteLinks not parsing placeholder
...
Add an AbsoluteLinks method to HTMLText that parses placeholders instead of returning the raw value.
2014-03-18 07:53:42 +13:00
Russell Michell
26f8341438
NEW Added FormatFromSettings(). Formats dates as per user preferences.
...
- Required for silverstripe-cms/issue/965.
- Separate implementations for Date and SS_Datetime.
2014-03-17 10:15:59 +13:00
Cam Spiers
145d78edca
Cache templates created from string SSViewer_FromString
2014-03-16 13:16:24 +13:00
Simon Welsh
dbf64399b8
Update expected ID value
2014-03-16 09:52:37 +13:00
Simon Welsh
8f31352039
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2014-03-16 09:36:48 +13:00
Loz Calver
a73c3574e2
FieldList->insertBefore/After now accept arguments in either order ( fixes #2737 )
2014-03-15 11:32:51 +00:00
Simon Welsh
90ba514cda
Merge pull request #2917 from tractorcow/pulls/fix-lazyload-queryparams
...
BUG Fix DataObject / Versioned publishing issues
2014-03-15 21:45:42 +13:00
Simon Welsh
ccaca9a6aa
Merge pull request #2916 from tractorcow/pulls/fix-classname-generation
...
BUG Prevent unnecessary reconstruction of ClassName field
2014-03-15 21:44:29 +13:00
Simon Welsh
b145e96d27
Merge pull request #2818 from tractorcow/pulls/gridstate_data-error-test
...
BUG GridState_Data doesn't hold falsey values - Fixes #2813
2014-03-15 21:29:56 +13:00
Simon Welsh
66b60cb486
Merge pull request #2754 from madmatt/pulls/behat-profile
...
Allow GridFields without titles to be found.
2014-03-15 21:13:06 +13:00
Simon Welsh
279b927df1
Merge pull request #2903 from tractorcow/pulls/fix-fileupload-fileexists
...
BUG Fix issues with uploading to /assets
2014-03-15 21:02:36 +13:00
Simon Welsh
5beaebc43a
Merge pull request #2718 from silverstripe-rebelalliance/2503
...
BUG: Fixes performReadonlyTransformation for OptionSetField
Closes #2503
2014-03-15 20:45:04 +13:00
Simon Erkelens
6676787176
ENHANCEMENT: Allow nested grouping of GroupedList
2014-03-15 19:20:28 +13:00
Simon Welsh
d1befdd37c
Merge pull request #2901 from dhensby/director-test
...
Making Director::test() ignore URL Anchors
2014-03-15 00:09:06 +13:00
Simon Welsh
d431e98ecf
Merge branch '3.1'
...
Conflicts:
forms/Form.php
forms/FormField.php
security/Member.php
security/MemberLoginForm.php
2014-03-10 22:58:49 +13:00
Simon Welsh
0e0597f8cd
Merge branch '3.0' into 3.1
...
Conflicts:
control/Director.php
dev/Backtrace.php
docs/en/installation/nginx.md
model/HTMLValue.php
tests/model/SQLQueryTest.php
2014-03-10 22:56:27 +13:00
Damian Mooyman
cad863204c
Merge pull request #2871 from feejin/urlsegment-trailing-space
...
BUG Trim URLSegment before applying replacements in filter
2014-03-06 08:16:31 +13:00
Damian Mooyman
c61c9e7ac2
Merge pull request #2922 from JayDevlin/2904-upload-loadintofile
...
BUG Upload: loadIntoFile() duplicates files if replaceFile=true
2014-03-05 16:43:45 +13:00
Damian Mooyman
0cbad41d3b
Rewrote usages of error suppression operator
2014-03-05 15:48:55 +13:00
Damian Mooyman
6d5d3d8cb7
Rewrote usages of error suppression operator
2014-03-05 14:22:19 +13:00
Devlin
3c1e82b42c
Upload: retrieve existing File if an object without an ID is given and replaceFile=true
2014-03-04 18:02:33 +01:00
Damian Mooyman
23f5f08eda
BUG Fix DataObject::loadLazyFields discarding original query parameters
...
BUG Fix Versioned::writeToStage failing to write object with unchanged fields
2014-03-04 16:12:07 +13:00
Damian Mooyman
1cc366fe23
Merge pull request #2850 from kinglozzer/2827-member-extend
...
FIX: Rewrite Member getCMSFields to ensure updateCMSFields is only run once (fixes #2827 )
2014-03-04 13:42:17 +13:00
Damian Mooyman
53b5adbcd9
BUG Prevent unnecessary reconstruction of ClassName field after default records are generated
2014-03-04 12:03:45 +13:00
Simon Welsh
ccb791995e
Merge pull request #2894 from wilr/3.1-manymanyyaml
...
Add support for many_many_extraField in YAML
2014-03-04 11:35:58 +13:00
Colin Richardson
7b13041449
Remove trailing dashes from URLSegment
2014-03-03 22:22:03 +00:00
Ingo Schommer
c047a7b990
Reset FailedLoginCount on successful password reset
2014-03-03 17:47:16 +13:00
Colin Richardson
1795b21df0
Remove redundant underscore and update the comment
2014-03-02 15:03:02 +00:00
Damian Mooyman
c1e0f98f87
BUG Fix case where setFolder('/') would break UploadField::fileexists
...
BUG Prevent Upload from writing to the site root folder
2014-02-27 14:23:32 +13:00
Daniel Hensby
5e6c1b902b
Making Director::test() ignore URL Anchors
...
Anchors should never make it to the server when they are in the browser URL bar, however tests are slightly different and some `Link()` functions may return a URL anchor. Instead of every test checking a link and stripping the anchor, I feel the Director::test() function should strip them off.
2014-02-26 12:04:47 +00:00
Will Rossiter
8b92300622
Add support for many_many_extraField in YAML
...
Format is
RelationName:
- =>Obj.name:
ExtraFieldName: "Foo"
2014-02-24 22:03:53 +13:00
Damian Mooyman
ebeb663ddf
BUG Fixed critical issue with Folder::find_or_make failing to handle invalid filename characters
...
BUG Fix UploadField duplicate checking with invalid folderName
2014-02-21 09:11:34 +13:00
Ingo Schommer
705c75baa5
Merge pull request #2861 from srizzling/expand-filter-update
...
Expand CMS Panel Update + New Test File
2014-02-18 23:38:31 +13:00
Ingo Schommer
d8361f9d3f
Merge remote-tracking branch 'origin/3.1'
2014-02-18 22:06:59 +13:00
Hamish Friedlander
d6630d240a
NEW Allow specifying element whitelist in HTMLText fields
2014-02-18 14:02:04 +13:00
Sriram Venkatesh
80997171cc
Updated Expand CMS Panel to find first visible panel and added new test file
2014-02-18 11:17:31 +13:00
Sean Harvey
30e3904e4c
Merge pull request #2845 from kinglozzer/1429-summary-searchable-fields
...
FIX: searchable_fields inheritance from summary_fields includes methods called on fields (fixes #1429 )
2014-02-17 15:14:54 +13:00
Sean Harvey
03f14565b5
Merge pull request #2841 from chillu/pulls/dateformat-simplified
...
API Default to "yyyy-MM-dd" for date format
2014-02-17 14:05:39 +13:00
Loz Calver
d91c7d14b8
FIX: Rewrite Member getCMSFields to ensure updateCMSFields is only run once ( fixes #2827 )
...
Fix usage of inside closure
Can't use self:: in closure either
Basic unit tests to check extensions are applied correctly
2014-02-16 21:21:15 +00:00
Ingo Schommer
f63a78c0b9
Fixed Filesystem class capitalization
2014-02-17 00:12:26 +13:00
Ingo Schommer
6906c9bd1a
API Removed auto-detection for i18n date/time formats
...
Default to "yyyy-MM-dd" for date format, and "H:mm" for time_format.
Switched to config API for setting/getting values.
Avoid using "MMM" in particular, since it causes
inconsistencies in month names between jQuery UI and Zend_Locale_Format.
Fixes https://github.com/silverstripe/silverstripe-cms/issues/544
2014-02-16 23:57:49 +13:00
Loz Calver
a91a4bbdc2
FIX: Searchable fields with dot notation can be inherited from summary_fields ( fixes #1429 )
2014-02-14 21:52:47 +00:00
Sam Minnee
a1c3cf1cf4
Removed use of assertCount() from this test as it causes infinite loops on Travis.
2014-02-14 16:39:36 +13:00
Sam Minnee
346d3edb37
Merge branch '3.1'
2014-02-13 17:58:30 +13:00
Sam Minnee
4f7c6ebcff
FIX: Fixed behat text selection rule, which broke some tests.
...
The behat rule for text selection wasn't working due to the JavaScript not executing properly. I have
also updated the code to traverse all childNodes, which is important if you have text like this:
<p>text1 <b>text2</b> text3</p>
And you are trying to select 'text3'
2014-02-13 17:36:46 +13:00
Sean Harvey
9048eab4a2
Merge branch '3.1'
2014-02-12 11:06:54 +13:00
Ingo Schommer
5e38ef9e55
Merge pull request #2835 from kinglozzer/1891-csrf-friendly-error
...
NEW: Forms with invalid/expired SecurityIDs are repopulated (fixes #1891 )
2014-02-12 09:44:03 +13:00
Sean Harvey
c322cb2d65
Fixing SQLQueryTest failures on PHPUnit 3.7.30
2014-02-10 13:32:39 +13:00
Loz Calver
058219c0ee
NEW: Forms with invalid/expired SecurityIDs are repopulated ( fixes #1891 )
2014-02-09 10:19:24 +00:00
Ingo Schommer
4af9143d3b
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/misc/contributing/code.md
2014-02-07 16:43:22 +13:00
madmatt
267786a7d1
Add behat test for security permission checkboxes.
2014-02-07 15:41:33 +13:00
Mateusz Uzdowski
e91f10b0ab
Add Behat step to click on a row in the first GridField table.
2014-02-07 15:40:06 +13:00
Ingo Schommer
bb9f84afd5
Merge pull request #2806 from tractorcow/pulls/bug-member-locale
...
BUG Default Member.Locale now chooses a better default value when i18n.locale is not a valid translation
2014-02-03 17:03:48 -08:00
Ingo Schommer
457ec9446b
Merge pull request #2700 from ajshort/injector-factory
...
Injector Factory
2014-02-03 16:50:15 -08:00
Damian Mooyman
cd213ab488
BUG Fixed handing of false values in GridState_Data
...
API Added ability to unset values
2014-02-04 10:26:26 +13:00
Daniel Hensby
6df276c843
BUG GridState_Data doesn't hold falsey values
...
After patch #2522 was taken GridField_Data was no longer able to hold
falsey values. See failing tests.
2014-02-04 10:26:18 +13:00
Ingo Schommer
0d7e9a9692
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
_config/routes.yml
docs/en/topics/datamodel.md
forms/DropdownField.php
2014-02-04 08:19:04 +13:00
Andrew Short
2f817ba177
NEW: Allow specifying a factory to use for creating services.
...
A service factory can be used for creating instances where a non-trivial
construction process is required. This is done by adding a `factory`
key to the service definition.
2014-02-03 11:30:22 +11:00
Ingo Schommer
91b363b141
Merge pull request #2756 from madmatt/pulls/behat-form-context
...
Update theHtmlFieldShouldContain step to include negation.
2014-01-30 18:09:55 -08:00
Ingo Schommer
558d202bf2
Merge pull request #2746 from micmania1/move-test-theme-setup
...
API moved useTestTheme to base Sapphire test class so that it can be used elsewhere
2014-01-30 18:08:21 -08:00
Kirk Mayo
44a8537f68
BUG: #2503 Fixes performReadonlyTransformation for OptionSetField
...
NEW: Adding unit test for performReadonlyTransformation #nd fixing OptionSetField #2503
BUG: Fixing undefined variables and function parameters for PerformReadonlyTransformation unit tests
NEW: Adding unit test to OptionsetField for read only fields
2014-01-30 16:09:55 +13:00
Damian Mooyman
293c672fa7
BUG Default Member.Locale now chooses a better default value when i18n.locale is not a valid translation
...
This will resolve issues in cases where the site locale may be assigned a value that does not have an explicit translation. E.g. if the locale is en_NZ (and it's appropriate for this to be the assigned locale), Afrikaans will no longer be the default selected locale when creating members. Now en_US is chosen as a better fallback default.
This is a minor ease of use fix that means fewer CMS users can be accidentally created in Afrikaans within NZ based sites.
Test cases included.
2014-01-30 15:55:14 +13:00
Simon Welsh
cf01ca818a
Revert "MINOR: Added behat test to cover changes made in e69e65c."
...
This reverts commit e0b4e6125c
.
2014-01-22 15:20:48 +13:00
Mateusz U
ce3a944903
Merge pull request #2780 from madmatt/pulls/securityadmin-js2
...
BUGFIX: Fix JS for PermissionCheckboxsetField in SecurityAdmin
2014-01-20 19:00:00 -08:00
madmatt
e0b4e6125c
MINOR: Added behat test to cover changes made in e69e65c
.
2014-01-15 16:20:19 +13:00
Ryan Wachtl
5f87d344f1
FIX Overriding of theme templates in project folder
...
Fixes issue of templates not being found when a Page's main/Layout templates are split between the project and theme folders. Adds more expansive testing for template loading.
2014-01-14 15:05:24 -06:00
Will Rossiter
a50996a010
NEW: Add support for push operator on ArrayList ( Fixes #1539 )
2014-01-12 18:55:40 +13:00
Will Rossiter
e7266535c5
FIX: Allow empty checkboxes through setValue(null) ( #1392 )
2014-01-12 17:28:09 +13:00
Will Rossiter
4ea62b44f9
FIX: Ensure GridFieldDetailForm has the current record validator.
...
Currently the validator is only set through
ModelAdmin and not through GridField
directly. This will set the validator based on the
record unless a custom validator has been
provided.
http://www.silverstripe.org/data-model-questions/show/34650?start=8#post331958
2014-01-12 16:08:31 +13:00
Will Rossiter
f433b5000f
FIX: Resolve issue when selected value is zero. ( #2530 )
...
$this->value is stored as string internally. In
the special case that the option value is 0, the
type comparison fails to resolve 0 == '0',
see http://www.php.net/manual/en/types.comparisons.php .
2014-01-11 13:25:40 +13:00
Jeremy Shipman
62694b0a8b
NEW: Made ValidationResult functions chain-able.
...
Added unit tests for CombiningResults
2014-01-09 16:32:27 +13:00
Simon Welsh
39d42e4ea3
Merge branch '3.1'
2014-01-09 08:22:47 +13:00
Jeremy Shipman
8d8f3abace
FIX: ConfirmedPasswordField setName failed to set names of child fields.
...
FIX: ConfirmedPasswordField relied on POST variables. These should instead come from setValue().
Added all important tests for validating the field: valid if passwords match, invalid if passwords differ.
2014-01-07 17:17:55 +13:00
Matt Peel
0eaae90bdb
Update theHtmlFieldShouldContain step to include negation.
...
This allows steps to be declared as either “should contain” or “should not
contain”.
2014-01-06 17:22:40 +13:00
madmatt
2b00036d9d
Allow GridFields without titles to be found.
2014-01-06 10:20:44 +13:00
micmania1
5fff5afb47
API moved useTestTheme to base Sapphire test class so that it can be used elsewhere (eg CMS test)
2013-12-23 21:54:20 +00:00
Stephen Shkardoon
40163edba7
Make CacheTest sleep properly
...
This way it will always sleep for the right amount of time (or longer)
2013-12-21 15:05:51 +13:00
Will Rossiter
3d2875a111
Merge pull request #2741 from simonwelsh/hhvm-test
...
Changes to error message detection to handle the differences in HHVM
2013-12-20 16:55:14 -08:00
Simon Welsh
8de403abd4
Changes to error message detection to handle the differences in HHVM
2013-12-21 13:17:47 +13:00
micmania1
229bea399b
added logout url to Security and deprecated Security::set_login_url in favour of config
2013-12-20 21:55:54 +00:00
Ingo Schommer
60333f68ee
NEW UploadField lists all files, shows path info
...
It doesn't make a lot of sense to limit the listing
to assets/Uploads/, which is the default set through FileField->folderName.
Showing all files regardless of folder makes them easier
to find, users can still opt-in to filtering by folder
through the TreeDropdownField.
2013-12-20 01:00:36 +01:00
madmatt
7d271d5346
Fix profile.feature behat test
2013-12-20 12:32:44 +13:00
Ingo Schommer
1afb8bb414
Merge remote-tracking branch 'origin/3.1'
2013-12-19 20:47:31 +01:00
Ingo Schommer
d032fadfb5
Fixed spelling of class in test
2013-12-19 20:47:16 +01:00
Ingo Schommer
f29d51f433
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/reference/dataobject.md
lang/es.yml
2013-12-19 20:23:09 +01:00
Ingo Schommer
78a530524b
Merge pull request #2684 from Firesphere/feature/force_write_js_to_bottom
...
NEW Forcefully write javascripts to the end of the HTML if wished
2013-12-19 09:21:06 -08:00
Sean Harvey
6fc9db6f0e
API DataObject::validate() visibility changed to public (issue #1659 )
...
DataObject::validate() is currently set to protected, but this means
you can't call validate() from outside the context of itself unless
you overload the method to use a public visibility and then call
parent::validate()
As it would turn out, most classes that overload this method already
set the visibility to public, so it would make sense the parent matches
that as well.
2013-12-19 16:36:39 +13:00
Daniel Pickering
94c19e349a
FIX: Year.php getDefaultOptions now fixed, sets key as year. Also added YearTest unit test.
2013-12-16 03:29:29 +00:00
Firesphere
af7afbe918
IMPROVEMENT/FEATURE Forcefully write javascripts to the end of the HTML if wanted.
...
It's defaulted to false. But when set to true, the JS is written to the end of the HTML, even though there are earlier scripts.
This results in faster page-loading if the JS isn't needed earlier-on.
2013-12-14 14:04:03 +01:00
Ingo Schommer
ab91a5a80b
Merge pull request #2622 from froog/patch-1
...
Created LessThanOrEqualFilter and GreaterThanEqualFilter
2013-12-13 03:34:45 -08:00
Ingo Schommer
c811556ea5
Removed debug code
2013-12-13 10:04:26 +01:00
Firesphere
41371fea72
NEW Force the javascripts to be put before the closing body tag
2013-12-07 15:47:31 +01:00
Fred Condo
b88a0955a5
API: Support string descriptors for unique indexes in Versioned
...
- Document the format for descriptor arrays
- Implement the behaviour that developers have come to expect for
string descriptors of indexes
- Add test for handling of unique indexes (MySQL & sqlite3)
- Resolve #2403
Versioned needs to convert unique indexes to non-unique for its suffixed
tables, such as Foo_Live and Foo_versions. Because DataObject accepts
string descriptors such as array('UniqIDX' => 'unique (Uniq)') as well
as array-based descriptors, Versioned needs to recognize string
descriptors. This patch accomplishes that. Before, Versioned would fail
to convert string-described indexes to non-unique, resulting in run-time
errors when creating a new version of an object.
2013-12-06 10:02:44 -08:00
Ingo Schommer
740560c487
Fixed merge errors
...
- HTML identifier changes in master breaking tests
- Regression from b6b3cd9889
in GridFieldSortableHeader (var capitalisation)
2013-12-06 15:37:51 +01:00
Ingo Schommer
6176d65bd2
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
forms/gridfield/GridFieldSortableHeader.php
model/DataList.php
model/fieldtypes/Enum.php
2013-12-02 20:49:34 +01:00
Ingo Schommer
a7ad85c2a8
Better "editable page" Behat assertion
2013-12-02 19:07:14 +01:00
micmania1
b89ab1eb16
Added SSViewer::get_templates_by_class() to make the functionality in LeftAndMain::getTemplatesWithSuffix() more open.
2013-12-01 07:42:37 +00:00
Ingo Schommer
df2d59df1c
Use more solid getValue() in Behat assertions
...
getAttribute('value') behaves inconsistently with Selenium drivers
(fails on Travis and TeamCity, but works locally). Selenium2Driver
in Mink provides a JS wrapper for getting the value, which is more reliable.
This fixes "insert a link" failures, see https://travis-ci.org/silverstripe/silverstripe-cms/jobs/14281251
2013-11-30 13:27:20 +01:00
Ingo Schommer
73eae2990f
Merge pull request #2683 from tractorcow/pulls/2682-fix-gridfieldsortableheader
...
BUG Fixes #2682 - Regression in #2595
2013-11-29 09:17:39 -08:00
Sean Harvey
3a8833ec28
Fixing broken manage-users behat test.
...
"ADMIN group" is created by default, but assertions are checking
for "Admin Group".
2013-11-29 14:51:46 +13:00
Sean Harvey
cfc009964c
Fixing undefined step caused by change in behat-extensio module.
2013-11-29 14:17:04 +13:00
Sean Harvey
761cc63e19
Adding test for CheckboxSetField saving into a text DB field.
2013-11-29 11:38:07 +13:00
Damian Mooyman
7636699c9f
BUG Fixes #2682 - Regression in #2595 causing gridfield headers to break on summary_fields containing field methods
2013-11-27 18:43:27 +13:00
froog
755857b22a
NEW: Created LessThanOrEqualFilter and GreaterThanEqualFilter
2013-11-25 03:59:51 +00:00
Ingo Schommer
784c766ee6
Revert "Don't rely on Behat/Selenium returning 'value' for textarea"
...
This reverts commit 8245125349
.
2013-11-22 20:38:56 +01:00
Ingo Schommer
7e291133a0
Merge pull request #2663 from ajshort/has-many-prepopulate
...
NEW: Pre-populate and disable foreign key field on has many lists.
2013-11-22 11:18:11 -08:00
Ingo Schommer
053258b984
Merge pull request #2595 from kinglozzer/gridfield-sort-relation
...
NEW: GridField can sort on relation columns
2013-11-22 11:14:12 -08:00
Ingo Schommer
8245125349
Don't rely on Behat/Selenium returning 'value' for textarea
...
Technically a textarea DOM node doesn't have a 'value' attribute,
but rather a HTML content. This used to work, but likely broke either
by updated browser handling or updated selenium logic.
Fixes "Scenario: I can edit title and content and see the changes on draft"
2013-11-22 20:05:17 +01:00
Ingo Schommer
70207b0c98
Merge pull request #2626 from Zauberfisch/filterByCallback
...
filterByCallback added to SS_Filterable interface and implemented in ArrayList
2013-11-21 05:34:36 -08:00
Zauberfisch
d9b74874fc
added filterByCallback() to interface SS_Filterable and all implementing classes
2013-11-21 13:03:18 +00:00
Will Rossiter
0e89c4b6cd
API: Implement SS_Map::push() to append values.
...
FIX: SS_Map::count() not taking into account additional firstItems
2013-11-18 20:38:57 +13:00
Ingo Schommer
bd5fdf1f19
Fixing coding conventions in Behat files
2013-11-15 12:03:43 +01:00
Loz Calver
a1a402224f
NEW: GridField can sort on relation columns
...
Slightly improved logic
Add support for relations more than one 'level' apart
Add unit tests
Fixing PostgreSQL support
Throw exception if attempting to sort on a has_many/many_many relation
2013-11-13 10:33:00 +00:00
Andrew Short
fc773c5c22
NEW: Pre-populate and disable foreign key field on has many lists.
...
This is a common use case, and by default a form field is added which
has no effect. While this coupling is undesirable, it makes the default
behaviour much more sensible.
See #2662 , #2651 , #2637 for more information.
2013-11-13 16:21:18 +11:00
Andrew Short
bedf292612
Merge branch '3.1'
...
Conflicts:
docs/en/reference/execution-pipeline.md
lang/nl.yml
2013-11-11 18:18:25 +11:00
Cam Spiers
14486902fb
Allow users to extend the SSTemplateParser by defining open & closed blocks
...
Currently the only way the extend SSTemplateParser is to define a class
extension of it and then tell the injector component to use your new
custom class. This new change allows a user to define new "open blocks"
and "closed blocks" for SSTemplateParser to use without needing to
recompile the real SSTemplateParser class.
The following example shows how the functionality can be used
to add a new <% minify %>…<% end_minify %> syntax to the template parser
In a config.yml file, define the new minify closed block to call the
static function "Minifier::minify"
```
Injector:
SSTemplateParser:
properties:
closedBlocks:
minify: "Minifier::minify"
```
Define a new class with the minify static method that returns the new
template code when regenerating templates:
```
class Minifier {
public static function minify(&$res) {
return <<<PHP
{$res['Template']['php']}
\$val = zz\Html\HTMLMinify::minify(\$val, array('optimizationLevel' => zz\Html\HTMLMinify::OPTIMIZATION_ADVANCED));
PHP;
}
}
```
2013-11-04 14:24:58 +13:00
Sean Harvey
70c23f37de
Merge pull request #2608 from andrewvt/3.1
...
added removeFromGroupByCode() function to Member.php
2013-11-03 12:27:10 -08:00
andrewvt
389bdb4ddf
Added a unit test for removeFromGroupByCode()
...
Added a unit test for removeFromGroupByCode()
2013-10-31 22:05:13 -04:00
Damian Mooyman
c74f7e7640
BUG Fixes issue where items could be deleted from a has_many relation by an entirely unrelated HasManyList calling delete on that item.
2013-11-01 11:39:13 +13:00
Will Rossiter
a0b7bfc7a5
Merge pull request #2604 from chillu/pulls/versioned-single-stage
...
Fixed support for single stage in Versioned
2013-10-29 01:40:40 -07:00
Ingo Schommer
dfabd54bdb
Fixed support for single stage in Versioned
...
This used to work in 2.4, so is considered a regression.
To test, simply add a Versioned("Stage") extension to
some record in 2.4 vs. 3.1.
2013-10-24 17:09:17 +02:00
Ingo Schommer
7cf8e65309
Merge pull request #2598 from halkyon/test_execution_error
...
i18nSSLegacyAdapterTest setting wrong arguments for manifest.
2013-10-24 04:24:19 -07:00
Sean Harvey
e3542fead3
i18nSSLegacyAdapterTest setting wrong arguments for manifest.
...
Currently if you run i18nSSLegacyAdapterTest twice in a row you
get errors about classes not existing, because the class manifest
doesn't get set correctly during the test setUp() method.
2013-10-24 17:22:16 +13:00
Damian Mooyman
b6b3cd9889
API GridState_Data values can have default values specified during retrieval.
...
Fixes issues with GridStata_Data being returned from various states when value types are necessary.
Pruning of dead code from GridFieldAddExistingAutocompleter
Documentation for GridState
2013-10-24 16:15:33 +13:00
Ingo Schommer
628b920ea7
Fixed merge error in MemberTest
2013-10-23 18:26:05 +02:00
Ingo Schommer
b56ca812dc
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
tests/security/MemberTest.php
2013-10-23 14:53:29 +02:00
Ingo Schommer
d7e10e620a
Merge pull request #2537 from wilr/membervalidator
...
FIX: Use Injector API for managing Member_Validator instance.
2013-10-23 03:01:15 -07:00
Ingo Schommer
6f41b6fae6
Merge pull request #2566 from NicoHaase/master
...
BUG: An enum field in the search panel model admin misses an option to not filter on that field
2013-10-22 06:43:36 -07:00
Nico Haase
ab10c2ecdc
BUG: An enum field in the search panel model admin misses an option to not filter on that field
2013-10-22 15:39:37 +02:00
Ingo Schommer
39efaca54f
Disable "lost password" feature, breaks on "php -S"
...
PHP's built-in webserver doesn't reliably expose SCRIPT_NAME,
see https://github.com/silverstripe/silverstripe-framework/issues/2580 .
This breaks URL routing on /Security/passwordsent/admin%40test.com
2013-10-22 15:26:20 +02:00
Ingo Schommer
f2d362b629
Merge pull request #2576 from halkyon/fulltextsearch_test
...
FulltextSearchableTest doesn't clean up after itself.
2013-10-22 01:56:29 -07:00
Sean Harvey
acaf0e40cc
FulltextSearchableTest doesn't clean up after itself.
...
The extension doesn't get unloaded correctly at the end of the test,
resulting in tests afterwards sometimes failing because the table
type is reset back to InnoDB.
See silverstripe/silverstripe-cms ed8ee4e9b for a similar fix done
in the cms module.
2013-10-22 17:52:51 +13:00
mandrew
56d7c1fde2
Behat tests for lost password
2013-10-22 00:06:36 +02:00
Ingo Schommer
5c1a9d9da5
Using Behat EmailContext by default
2013-10-21 00:50:29 +02:00
Ingo Schommer
d75f545887
Clear DB caches in SecurityTest
2013-10-20 14:23:23 +02:00
Ingo Schommer
25b6175e67
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
forms/FormField.php
2013-10-20 13:52:56 +02:00
Ingo Schommer
36e7282f6f
Merge pull request #2561 from TomSpeak/patch-3
...
BUG FailedLoginCount reset
2013-10-18 07:20:48 -07:00
Thomas Speak
d22ca62c6f
BUG FailedLoginCount reset
...
If you fail your maximum login attempts and are locked out, further failed login attempts add to your already existing FailedLoginCount as it is only reset if you log in successfully. This means that if you're locked out, then try again, one failure will automatically lock you out again, regardless of what you set your max limit to.
Example:
lock_out_after_incorrect_logins: 3
FailedLoginCount: 0
The user fails three login attempts.
lock_out_after_incorrect_logins: 3
FailedLoginCount: 3
The user is now locked out.
Lockout time passes.
The user fails their 4th login.
lock_out_after_incorrect_logins: 3
FailedLoginCount: 4
This will continue to happen until the user successfully logs in, without giving them the pre-defined amount of login attempts again due to this condition being met after every incorrect login:
```php
if($this->FailedLoginCount >= self::config()->lock_out_after_incorrect_logins) {
```
FailedLoginTestCount Test Added
2013-10-18 13:48:11 +01:00
Che Van Lawrence
2be25e70ba
Merge pull request #2545 from hafriedlander/fix/protocol_and_oembed
...
FIX oembed to avoid mixed media issues
2013-10-17 19:09:35 -07:00
Nathan J. Brauer
fee54c75f0
API: Change DropdownField::getSource() to not return the emptyString value.
2013-10-18 11:16:27 +13:00
Will Rossiter
1c983bc16d
API: LookupField::Field now returns an HTMLText instance.
...
Moved LookupField into a template, removed getSource() as the DropdownField getSource() has been simplified to just a getter
2013-10-18 10:28:17 +13:00
Hamish Friedlander
8801a50704
FIX oembed to avoid mixed media issues
2013-10-17 17:06:40 +13:00
Damian Mooyman
24950692cd
BUG Fixes serious issue with FieldList::addFieldsToTab failing to accept multiple field groups.
...
Additional groups beyond the first are ignored.
Test cases included.
2013-10-17 15:38:22 +13:00
Will Rossiter
813d34b15e
FIX: Use Injector API for managing Member_Validator instance.
...
Updates the CMS profile page and SecurityAdmin to give developers a few ways to customise the required fields.
Added extension hook updateValidator for getValidator for things like modules to inject required fields to go along with Injector for replacing the entire class for project specific use.
2013-10-16 11:29:43 +13:00
Marcus Nyeholt
7bcb180f27
BUG Director::test now calls RequestProcessor
...
This fixes https://github.com/silverstripe/silverstripe-framework/issues/2517
and provides some testing around the use of RequestProcessor in general.
2013-10-15 07:53:34 +11:00
Devlin
1e5679f20f
BUGFIX i18n module load order in i18n::include_by_locale()
...
The "project" module (normally mysite) is considered with the highest priority. Yet, the project's i18n is loaded first and cannot overwrite existing translations. I've added a array_reverse(), so the iteration keeps the translation of the module with the highest priority.
Old $sortedModules: mysite, (other_modules,) cms, admin, framework.
New $sortedModules: framework, admin, cms, (other_modules,) mysite.
2013-10-11 15:20:51 +02:00
Ingo Schommer
8727d1b1eb
Merge remote-tracking branch 'origin/3.1'
2013-10-10 12:11:50 +02:00
Loz Calver
51be1e858a
Unit tests for Email
...
It's not much, but it's a start
2013-10-09 11:51:29 +01:00
Andrew Short
a339687493
API: Pass extra context information to shortcode handlers.
...
This allows shortcodes to perform more complex actions on the element
which contains them. For example, the element reference can be used
to add extra classes or attributes to links which provide additional
metadata.
2013-10-09 15:05:17 +11:00
Ingo Schommer
62fa2739e6
Merge remote-tracking branch 'origin/3.1'
2013-10-08 11:22:04 +02:00
Ingo Schommer
e489384eea
Moved manage-files.feature to cms module
2013-10-08 11:21:36 +02:00
Ingo Schommer
d485faf0c9
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
forms/Form.php
2013-10-08 11:17:06 +02:00
Ingo Schommer
8d5209aef6
Migrated page-specific behat features to cms module
2013-10-08 00:24:05 +02:00
Ingo Schommer
6a665b4ca2
Behat jQuery reference
2013-10-07 23:44:13 +02:00
Ingo Schommer
6e8ec778c3
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
admin/templates/Includes/LeftAndMain_Menu.ss
lang/en.yml
2013-10-07 16:19:40 +02:00
Ingo Schommer
795d3e4b3b
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
dev/install/install.php5
docs/en/index.md
tests/core/CoreTest.php
2013-10-07 16:18:20 +02:00
Ingo Schommer
7f0e589bf5
Behat test for language switching
2013-10-07 00:04:50 +02:00
Ingo Schommer
60fc7e5346
Merge remote-tracking branch 'origin/3.1'
2013-10-06 19:07:39 +02:00
Damian Mooyman
f67b549b77
BUG Fixed cross-platform issues with test cases and file utilities
2013-10-04 13:54:33 +13:00
Sean Harvey
38e4070ff7
Merge pull request #2477 from tractorcow/pulls/3.1-sqlquery-sort-order
...
BUG Sort column order maintained correctly when using expressions
2013-10-03 14:27:38 -07:00
Damian Mooyman
4b850fb41c
BUG Fixed cross-platform issues with test cases and file utilities
2013-10-03 14:49:18 +13:00
Damian Mooyman
afaf7f6b4e
BUG Sort column order maintained correctly when using expressions in SQLQuery and DataQuery
2013-10-03 14:20:31 +13:00
Ingo Schommer
a534b7c784
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-10-02 12:21:35 +02:00
Ingo Schommer
06b5f142b6
Increased CacheTest time delay, avoid flickering tests
...
Setting a cache lifetime of half a second seems to be
unreliable on Travis when just waiting a second,
so let's wait a bit longer.
2013-10-02 12:13:22 +02:00
Andrew Short
c26c9e641a
Fix test relying on specific member title format.
...
If a custom member title format was used, the test would fail as it
only expected the default member title format.
2013-10-02 15:16:33 +10:00
Damian Mooyman
fb5bb646fe
BUG Fixed cross-platform issues with test cases and file utilities
2013-10-02 17:31:06 +13:00
Ingo Schommer
21c226a5d2
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-09-30 23:44:12 +02:00
Ingo Schommer
a68e0ba365
Check for jQuery in Behat tests
...
Identified as one potential cause for flickering tests
on our own Selenium box.
2013-09-30 23:36:46 +02:00
Ingo Schommer
c7f656cd00
API Removed "PastMember" cookie and template getter
...
The functionality is easy to replicate in custom controllers,
and is too rarely used to be placed in core.
This also removes the `Member::is_repeat_member()` getter
and the `PastMember`/`IsRepeatMember` template globals.
See https://groups.google.com/forum/#!topic/silverstripe-dev/b8K3wU64TXg
2013-09-27 20:06:25 +02:00
Daniel Hensby
6c943007a1
removeRequiredField() limits field ( fixes #2165 )
...
Added tests to RequiredFields and fixed bugs that were found
Now you:
1. Can't add the same field name many times
2. Can use append RequiredFields correctly without fear of duplicates
I've also added a Deprecation warning to $useLabels as it's not used
*anywhere* in framework
2013-09-27 19:58:59 +02:00
Ingo Schommer
455e550d9a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/topics/testing/create-silverstripe-test.md
forms/Form.php
i18n/i18n.php
model/Image.php
2013-09-27 19:22:14 +02:00
Ingo Schommer
48021e9fd3
Merge pull request #2166 from dhensby/patch-2
...
FormFields now allow setting of extra CSSClasses en masse
2013-09-24 11:50:01 -07:00
Ingo Schommer
5b3f8bc04d
Merge pull request #2435 from hafriedlander/fix/join_links_query_params
...
FIX Use last of duplicate query params in join_links
2013-09-20 02:27:49 -07:00
Hamish Friedlander
b1f03db4ff
FIX Improve recent RestfulService fix for proxies
2013-09-20 16:26:39 +12:00
Mateusz Uzdowski
7ddd5b57c3
BUG Do not rely on broken curl header size calculation.
...
Header parsing now takes into account situations like a proxy or
redirections. Works around the curl issue.
Also fixes the issue when a redirected request would cause a double
amount of headers coming out of the parser - it would merrily process
anything that's in key:value format even if it was two distinct headers.
2013-09-20 15:02:40 +12:00
Hamish Friedlander
a8c1dd7f53
FIX Use last of duplicate query params in join_links
...
When using Controller::join_links to join two links with identical query
params, both query params would be used in the result, ending up with
links that look like `../edit/show/14?locale=en_NZ&locale=mi_NZ`
This patch eliminates duplicate query params, so only the last one
for any key is present in the output.
2013-09-20 11:33:03 +12:00
Ingo Schommer
ba5984e2bf
Only compare array notations in SQLQuery->getOrderedJoins()
...
If more than two $from were added through SQLQuery->addFrom(),
the getOrderedJoins() comparison kicks in. It assumes all $from
parts are in array notation, which isn't always the case.
For legacy reasons, and because we don't have full API support,
you can still add literal joins through addFrom('INNER JOIN ...').
On PHP 5.3, the ordering comparison still works because it
allows array access in strings, with string rather than numeric indexes.
Thankfully that's no longer supported in PHP 5.4.
2013-09-17 22:08:48 +02:00
Ingo Schommer
a87000170a
Behat: "apply formatting" steps
2013-09-15 01:50:10 +02:00
Ingo Schommer
849f2c1cb1
Behat: "insert external link" feature
2013-09-14 19:50:22 +02:00
Ingo Schommer
d68a016026
Behat: Friendler field reference
2013-09-14 19:50:21 +02:00
Ingo Schommer
2fbe0c39f2
Behat: Correctly quote selector in dropdown step
2013-09-14 19:50:21 +02:00
Ingo Schommer
c9047a386f
Behat: "insert link" feature
2013-09-14 19:50:21 +02:00
Ingo Schommer
7a4a1bbadb
Behat: More "insert image" steps
...
Still needs definitions
2013-09-14 19:50:21 +02:00
Ingo Schommer
e202d4b3b0
Behat: Avoid false positives in dropdown traversal
...
Was identifying fields like <input value="Select a page">
when querying for a drop down labelled "Page"
2013-09-14 19:50:21 +02:00
Ingo Schommer
8de227554e
Behat: More verbose error message in HTML field assertion
2013-09-14 19:50:21 +02:00
Ingo Schommer
fde6b65769
Behat: Allow quoted HTML in assertion
2013-09-14 19:50:21 +02:00
Ingo Schommer
35a32d608d
More specific behat tree assertion
2013-09-14 19:50:21 +02:00
Ingo Schommer
5a0b4b0f03
Shorter behat feature name
...
Looks better in relishapp ;)
2013-09-13 18:52:02 +02:00
Ingo Schommer
819eebb5dc
Behat: Profile feature (steps only)
2013-09-13 18:44:17 +02:00
Ingo Schommer
aa80c4eed2
Behat feature indentation (no content changes)
2013-09-13 18:42:27 +02:00
lukepercy
e6f7f637f3
Added feature file for behat test
...
- Added content formatting behat feature file Updated Given statement for Insert link behat feature file
- Added Behat test feature file for alignment buttons Updated formatting buttons feature file to include strikethrough formatting
2013-09-13 17:00:43 +02:00
Sean Harvey
17fb7752db
Skipping SQLQueryTest::testZeroLimitWithOffset() for MSSQLDatabase.
...
This test doesn't work on MSSQLDatabase.
2013-09-13 15:50:36 +12:00
Sean Harvey
bf1110d911
Adding a test for SQLQuery::setLimit() parsing OFFSET string clause.
2013-09-13 15:44:46 +12:00
Russell Michell
bbda63a16f
MINOR: Corrected tests to use assertFalse|True()
2013-09-13 12:27:37 +12:00
Russell Michell
3aaa12f114
FIX: Fixes #2398
...
- hasAmount() failed to return true for values <= 0.99 and >= 0.01
- Added unit tests
2013-09-13 12:21:21 +12:00
Ingo Schommer
c2b312d76f
Merge remote-tracking branch 'origin/3.1.0' into 3.1
2013-09-12 17:24:42 +02:00
Ingo Schommer
05757efceb
FIX Privilege escalation through APPLY_ROLES assignment (SS-2013-005)
...
See http://www.silverstripe.org/ss-2013-005-privilege-escalation-through-apply-roles-assignment/
2013-09-12 15:42:43 +02:00
Ingo Schommer
720c149aee
FIX Privilege escalation through Group hierarchy setting (SS-2013-003)
...
See http://www.silverstripe.org/ss-2013-003-privilege-escalation-through-group-hierarchy-setting/
2013-09-12 15:42:42 +02:00
Ingo Schommer
cfa88adf4b
FIX Privilege escalation through APPLY_ROLES assignment (SS-2013-005)
...
See http://www.silverstripe.org/ss-2013-005-privilege-escalation-through-apply-roles-assignment/
2013-09-12 15:42:36 +02:00
Ingo Schommer
68ca47b0dd
FIX Privilege escalation through Group hierarchy setting (SS-2013-003)
...
See http://www.silverstripe.org/ss-2013-003-privilege-escalation-through-group-hierarchy-setting/
2013-09-12 15:42:35 +02:00
Sean Harvey
95bb799e6f
BUG Fixing SQLQuery::aggregate() adding ORDER BY when no limit.
...
DataQuery::initialiseQuery() will add a default sort to a query,
and when calling up an aggregate it will make a query like this
which doesn't make sense:
SELECT MAX("LastEdited") FROM "Member" ORDER BY "ID"
In this case there is no need to add the ORDER BY, and it will
break databases like MSSQL in cases such as
GenericTemplateGlobalProvider
which provides a default List() function for adding aggregates
into SSViewer template cacheblocks.
If we add a limit, however, then it does make sense:
SELECT MAX("LastEdited") FROM "Member" ORDER BY "ID" LIMIT 10
This fixes SQLQuery::aggregate() to NOT add an ORDER BY to an
aggregate call if there is no limit.
2013-09-06 18:11:11 +12:00
Ingo Schommer
1c31c098ee
FIX Correct Zend_Locale fallbacks in i18n/DateField/DateTimeField
...
Due to the recent change of translations to transifex, some
locales changed their names, which prompted a fix to
i18n::get_available_translations() (see 00ffe7294
).
This caused a regression where short locales are determined
from the YAML file names (e.g. "en"), but weren't matched up
with fully qualified locales from get_available_translations() (e.g. "en_US").
Since this list is used in the admin/myprofile dropdown for the Member.Locale value,
it didn't match up with any entries and defaulted to the first one ("Africaans").
Note that the behaviour of admin/myprofile is still a bit weird:
It defaults the locale on new members to the one set for the current administrator.
So if a site defaults to en_US in _config.php, but the admin happens to view
his backend in de_DE, all members he creates default to de_DE as well.
Thanks to @tractorcow for contributing and peer reviewing!
2013-08-30 10:18:00 +02:00
Johannes Hammersen, x75
b8495da5d9
BUG Cached images stored in wrong folder
...
If multiple image manipulations are performend the resulting cached image is stored in assets/_resampled because the cached version of the image has no ParentID, which cacheFilename needs to set the correct path.
2013-08-26 10:16:42 +02:00
Ingo Schommer
8092dfa3d5
Merge remote-tracking branch 'origin/3.1'
2013-08-22 14:11:45 +02:00
Ingo Schommer
eb311691be
Fixed 3.1-specific switchToWindow() behat feature
2013-08-22 14:10:54 +02:00
Ingo Schommer
a4c6ae3e90
Merge remote-tracking branch 'origin/3.1'
2013-08-22 13:56:33 +02:00
Ingo Schommer
4a3a88710f
Merge remote-tracking branch 'origin/3.1.0' into 3.1
...
Conflicts:
dev/BehatFixtureFactory.php
model/Hierarchy.php
tests/behat/features/bootstrap/FeatureContext.php
tests/core/CoreTest.php
2013-08-22 13:00:25 +02:00
Ingo Schommer
40c239076b
Merge remote-tracking branch 'origin/3.0' into 3.1.0
...
Conflicts:
model/Hierarchy.php
2013-08-22 12:55:47 +02:00
Ingo Schommer
54edc0ddac
Fix Behat window switching in chrome
...
Workaround only, see https://groups.google.com/forum/#!topic/behat/QNhOuGHKEWI
2013-08-22 12:49:38 +02:00
Simon Welsh
c66cc952d2
Correct line length and indentation
2013-08-21 21:27:16 +12:00
Simon Welsh
4cb98f1afd
Only have Scrutinizer check PHP files
2013-08-21 21:02:12 +12:00
Simon Welsh
151baeede1
Correct line length and indentation
2013-08-21 18:54:05 +12:00
Simon Welsh
4db6520357
Only have Scrutinizer check PHP files
2013-08-21 17:57:31 +12:00
Ingo Schommer
a6da1f5570
Merge pull request #2294 from wilr/fixgridexport
...
FIX: Remove limit on GridField export
2013-08-20 14:08:18 -07:00
Ingo Schommer
46362175f0
Merge remote-tracking branch 'origin/3.1.0' into 3.1
2013-08-20 20:59:31 +02:00
Ingo Schommer
a592c36adf
Merge remote-tracking branch 'origin/3.0' into 3.1.0
...
Conflicts:
docs/en/changelogs/index.md
2013-08-20 20:49:01 +02:00
Ingo Schommer
699cbfe851
Merge branch '3.1.0' into 3.1
...
Conflicts:
thirdparty/jquery-entwine/dist/jquery.concrete-dist.js
thirdparty/jquery-entwine/spec/SpecRunner.html
thirdparty/jquery-entwine/spec/spec.entwine.eventcapture.js
thirdparty/jquery-entwine/spec/spec.entwine.namespaces.js
thirdparty/jquery-entwine/src/domevents/jquery.entwine.domevents.addrem.js
thirdparty/jquery-entwine/src/jquery.entwine.eventcapture.js
thirdparty/jquery-entwine/src/jquery.entwine.js
thirdparty/jquery-entwine/src/jquery.focusinout.js
2013-08-20 16:58:40 +02:00
Ingo Schommer
2fd5558a70
Fixed "insert image" behat feature
...
Was using wrong button label, and ignoring the
"unsaved changes" warning dialog
2013-08-20 16:19:30 +02:00
Hamish Friedlander
4a7aef0e25
FIX Double slashes in ParameterConfirmationToken
2013-08-19 11:35:34 +12:00
Will Rossiter
c7bdfcd76a
Merge pull request #2293 from robert-h-curry/empty-arraylist
...
Preempt fatal errors when making some function calls on an empty ArrayList
2013-08-17 16:53:48 -07:00
Ingo Schommer
7ae75c1a89
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
forms/HtmlEditorField.php
2013-08-16 13:37:44 +02:00
Ingo Schommer
de3b1b22d3
Fixed behat tests for confirming grid field dialogs
2013-08-16 13:34:23 +02:00
Ingo Schommer
362d35742f
Fixed behat tests to confirm file deletion dialog
2013-08-16 13:34:23 +02:00
Ingo Schommer
c8aabd33ac
Removed debug code
...
Regression from 82401b56
2013-08-07 17:37:59 +02:00
Ingo Schommer
2a35f2f928
Merge remote-tracking branch 'origin/3.1'
2013-08-07 17:34:11 +02:00
Ingo Schommer
afe06661ef
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
admin/templates/Includes/LeftAndMain_Menu.ss
admin/templates/Includes/ModelAdmin_ImportSpec.ss
admin/templates/Includes/ModelAdmin_Tools.ss
admin/templates/LeftAndMain.ss
admin/templates/ModelSidebar.ss
i18n/i18n.php
templates/ComplexTableField.ss
templates/ComplexTableField_popup.ss
templates/FileIFrameField_iframe.ss
templates/Includes/GridFieldItemEditView.ss
templates/Includes/TableListField_PageControls.ss
templates/RelationComplexTableField.ss
templates/TableField.ss
templates/TableListField.ss
2013-08-07 17:14:47 +02:00
Ingo Schommer
00ffe72944
Translations: Switch to Transifex format
...
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
which SilverStripe's i18n system can't handle
(needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
- Only allow selection of locales registered through i18n::$all_locales to avoid
issues with unknown locales in Zend's CLDR database
2013-08-07 00:25:16 +02:00
Hamish Friedlander
2110493466
Merge branch '3.0' into 3.1
2013-08-07 09:43:52 +12:00
Will Rossiter
65d96e8d7c
FIX: Remove limit on GridField export
...
Allow DataList::limit() to take a null value to remove the limit.
Added tests for limit(). Note the one failure, currently the ORM doesn't support unlimited values with an offset.
2013-08-05 19:59:12 +12:00
Robert Curry
d69520bd70
Preempt fatal errors when making some function calls on an empty ArrayList
...
The function "first" on ArrayList uses the PHP function "reset", which
returns false if there aren't any elements in the array. Two functions
inside ArrayList use this function, "canFilterBy" and "byID". I've
changed these functions to catch the possibility of a false return from
first().
2013-08-05 15:47:58 +12:00
Hamish Friedlander
342058742c
FIX Flush on memory exhaustion and headers sent
2013-08-02 09:41:16 +12:00
Hamish Friedlander
d44024b1cf
Merge branch 'origin/3.1'
2013-07-24 13:29:55 +12:00
Hamish Friedlander
541436feb0
Merge branch 'origin/3.0' into 3.1
2013-07-24 12:09:44 +12:00
Hamish Friedlander
a1ea905ca8
FIX Nice errors and allows flush on module removal
2013-07-24 09:57:01 +12:00
Hamish Friedlander
0a79ac3592
Merge branch 'origin/3.1'
...
Conflicts:
templates/forms/CheckboxSetField.ss
templates/forms/FormField_holder.ss
templates/forms/OptionsetField.ss
2013-07-19 16:25:38 +12:00
Hamish Friedlander
d38bd7d5cb
Merge branch 'origin/3.0' into 3.1
2013-07-19 14:18:49 +12:00
Hamish Friedlander
1298d4a5bd
FIX Prevent DOS by checking for env and admin on ?flush=1 ( #1692 )
2013-07-19 12:24:32 +12:00
Ingo Schommer
920edf88e7
Test allowedExtensions in UploadField, return correct HTTP status
2013-07-12 13:16:34 +02:00
Ingo Schommer
b58e2dbe3a
Member.lock_out_delay_mins configurable, password security docs
2013-07-11 09:47:28 +02:00
Daniel Hensby
378d829e8f
Adding test to prove issue with HTTP Header parsing in RestfulService
...
I have a header like:
X-BB-Auth: xxxx
and it is being given back to me as X-Bb-Auth - i want to prove the issue and the fix
2013-07-10 12:47:13 +01:00
Andrew Short
8a62593754
Merge branch '3.1'
2013-07-10 18:27:19 +10:00
Cam Spiers
b44641336b
FIX ConfigManifest regenerating every request if variantKeySpec is an empty array()
2013-07-10 11:53:44 +12:00
Andrew Short
bfdf14fafa
Merge branch '3.1'
2013-07-09 13:42:32 +10:00
Cam Spiers
2d30592f72
Improve memory performance when generating config static and class caches
2013-07-08 21:24:14 +12:00
Jeremy Thomerson
f6ff39369f
FEATURE: <% include %> inherits iterator scope of parent template
2013-07-07 12:39:42 +00:00
Sam Minnée
0173707cd1
Merge pull request #2164 from tractorcow/3.1-datetimefield-fixes
...
BUG Fixed DateTimeField where time value was being parsed incorrectly.
2013-07-06 19:03:33 -07:00