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
6a45f4a1e1
BUG fix mismatched quotes
2015-07-31 15:07:44 +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
Daniel Hensby
1e20b7d698
Merge pull request #4390 from tractorcow/pulls/3.2/predictable-ids
...
API respect custom attributes on OptionsetField and CheckboxSetField
2015-07-30 11:15:15 +01:00
Daniel Hensby
4373c8716b
Merge pull request #4454 from tractorcow/pulls/3.2/dbid-semver
...
BUG Fix semver violation in create_table_options
2015-07-30 11:11:33 +01:00
Damian Mooyman
60f7c660d0
Merge pull request #4450 from sminnee/injector-method-calls
...
NEW: Add ‘calls’ section to Injector configs.
2015-07-30 21:35:06 +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
Damian Mooyman
4ca5237185
Merge pull request #4321 from dhensby/pulls/formfield-docs
...
DOCS Fixing docs (and bad API usage)
2015-07-30 15:29:28 +12:00
Damian Mooyman
f32fa4631a
Merge branch 'pr/4396' into 3.2
...
* pr/4396:
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:54:11 +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
Damian Mooyman
c170f90d5e
Merge pull request #4446 from spekulatius/codestyle
...
remove tailing spaces in view related classes
2015-07-30 14:42:09 +12:00
Damian Mooyman
09e605bb84
Merge pull request #4447 from jonom/force-resample-continued
...
Remove redundant force_resample logic
2015-07-30 14:40:59 +12:00
Damian Mooyman
97b226abe0
BUG Fix semver violation in create_table_options
2015-07-30 14:24:41 +12:00
Jonathon Menz
90b96e1fc4
Remove redundant force_resample logic
2015-07-28 14:28:33 -07:00
Peter Thaleikis
7efa13108d
remove tailing spaces in view related classes
2015-07-29 04:57:56 +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
Damian Mooyman
912b133ba1
Merge pull request #3949 from dhensby/pulls/case-sensitive-class-info
...
Ensuring classinfo is case insensitive
2015-07-28 22:36:53 +12:00
Daniel Hensby
ffbeac6b7d
Ensuring classinfo is case insensitive
2015-07-28 11:17:50 +01:00
Daniel Hensby
bc8662b241
Merge pull request #4410 from jonom/force-resampling
...
API Force resampling by default
2015-07-28 00:39:01 +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
Daniel Hensby
d8463f577f
Merge pull request #4437 from kinglozzer/pulls/deprecate-viewabledata-cachedcall
...
Deprecate ViewableData magic caching logic
2015-07-28 00:11:45 +01:00
Daniel Hensby
afe9cc68a4
Merge pull request #4438 from kinglozzer/pulls/deprecate-object-caching
...
Mark Object caching methods as deprecated
2015-07-28 00:10:57 +01:00
Sam Minnée
7986e94d1e
Merge pull request #4440 from spekulatius/remove-tailing-spaces-from-ssviewer
...
remove tailing spaces from ssviewer
2015-07-28 09:52:20 +12:00
Sam Minnée
c895797ccf
Merge pull request #4428 from Firesphere/3.2
...
Declare the global mapping
2015-07-28 09:21:26 +12:00
Damian Mooyman
ae783e9598
Merge pull request #4042 from selay/3.1
...
Hardcoded http:// cause browser warnings in admin panel
2015-07-28 09:14:34 +12: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
Loz Calver
688c4382f3
Mark Object caching methods as deprecated
2015-07-27 17:15:53 +01:00
Loz Calver
6847b0080f
Deprecate ViewableData magic caching logic
2015-07-27 17:14:18 +01:00
Daniel Hensby
aba1ffa82b
Merge pull request #4434 from spekulatius/codestyle
...
codestyle changes
2015-07-27 16:00:05 +01:00
Peter Thaleikis
bcac1a5afc
removing tailing spaces from model tests
2015-07-27 22:38:16 +12:00
Peter Thaleikis
914b54b0b3
remove tailing spaces from ssviewer
2015-07-27 22:37:19 +12:00
Peter Thaleikis
ffb25bd689
codestyle changes
2015-07-27 22:31:18 +12:00
Loz Calver
599c054d4f
Merge pull request #4215 from russellshome/patch-1
...
* russellshome-patch-1:
DataObject accept arrays or stdClass
2015-07-27 10:31:40 +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
7c09f82770
Merge pull request #4431 from tractorcow/pulls/3.1/temp-fix-cache
...
BUG Disable cache to prevent caching of build target
2015-07-27 09:04:34 +01:00
Sam Minnée
ff4a83f9c8
Merge pull request #4433 from spekulatius/codestyle
...
MINOR codestyle stuff
2015-07-27 19:31:00 +12:00
Peter Thaleikis
bd4fc4afcb
minor codestyle stuff
2015-07-27 19:17:37 +12:00
Sam Minnée
7b9bbe17dc
Merge pull request #4432 from JorisDebonnet/csv-export
...
Use fputcsv in GridFieldExportButton
2015-07-27 17:28:12 +12:00
JorisDebonnet
dd0c85c9cf
Use fputcsv in GridFieldExportButton
2015-07-27 04:23:49 +02:00
Damian Mooyman
a246391238
Merge pull request #4420 from spekulatius/adjustment-addFilter
...
harden addFilter method
2015-07-27 08:34:42 +12:00
Damian Mooyman
5f5ce8a82c
BUG Disable cache to prevent caching of build target
2015-07-27 08:26:01 +12:00
Simon Erkelens
1831947157
Declare the global mapping
...
Fix for #4426
2015-07-23 20:52:09 +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
Peter Thaleikis
e26ad64b75
remove the API change
2015-07-23 22:28:59 +12:00
Sam Minnée
c7c3e40a2f
Merge pull request #4296 from SpiritLevel/patch-1
...
Update 02_Release_Process.md
2015-07-23 13:38:53 +12:00
Sam Minnée
be60219ffc
Merge pull request #4421 from kinglozzer/pulls/templates-translate-syntax
...
Upgrade template translation syntax
2015-07-23 13:38:04 +12:00
Sam Minnée
639ebefa5c
Merge pull request #4423 from kinglozzer/member-cmsfields
...
FIX: Hide 'Logged Passwords' tab in member CMS fields (fixes #4422 )
2015-07-23 13:35:45 +12:00
Loz Calver
b7480b92a9
FIX: Hide 'Logged Passwords' tab in member CMS fields ( fixes #4422 )
2015-07-22 14:40:09 +01:00
