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
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
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
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
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
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
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
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
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
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
