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
Loz Calver
a3fd150bd0
Upgrade template translation syntax
2015-07-22 14:17:03 +01:00
Daniel Hensby
cd560eee12
Merge pull request #4397 from flashbackzoo/pulls/batch-actions-tree-status-fix
...
Update tree status after bulk action is applied
2015-07-22 13:53:41 +01:00
Peter Thaleikis
bf3f159800
harden addFilter method
2015-07-22 22:35:58 +12:00
Daniel Hensby
589a39f6ba
Merge pull request #4415 from kinglozzer/pulls/lazyload-template-parser
...
Lazy load template parser to save memory
2015-07-22 10:52:23 +01:00
Loz Calver
ea9434ffeb
API: Lazy load template parser
2015-07-22 10:28:33 +01:00
Sam Minnée
9d5b9a0e95
Merge pull request #3748 from tractorcow/pulls/3.1/fix-url-query
...
BUG Prevent url= querystring argument override
2015-07-22 11:37:40 +12: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
Daniel Hensby
79c4f63855
DOCS Fixing docs (and bad API usage)
2015-07-20 16:42:33 +01: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
230094e65a
Merge branch '3.1' into 3.2
2015-07-20 10:53:28 +01:00
Damian Mooyman
0636062915
Merge pull request #4413 from dhensby/pulls/travis-fix
...
Allow HHVM tests to run on new travis infrastructure
2015-07-20 21:51:13 +12: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
Daniel Hensby
b5eecd1829
Allow HHVM tests to run on new travis infrastructure
2015-07-18 22:16:27 +01:00
Ingo Schommer
712d796c14
Merge pull request #4412 from sminnee/4336-error-exit-code
...
Ensure proper exit code for exceptions & errors (fixes #4336 )
2015-07-18 11:46:13 +12:00
Sam Minnee
a0003825ad
Ensure proper exit code for exceptions & errors ( fixes #4336 )
2015-07-17 23:26:43 +01:00
Loz Calver
452eca1355
Merge pull request #4408 from jonom/upload-field-3.2
...
Tweak UploadField width for better alignment
2015-07-17 09:29:03 +01:00
Ingo Schommer
eb040cb1ac
Merge pull request #4377 from jonom/3.2-site-tree-label-width
...
Improved site tree tooltips
2015-07-17 08:46:25 +12:00
Jonathon Menz
1af939bcb0
Tweak UploadField width for better alignment
...
(fixes #3382 )
2015-07-16 11:09:08 -07:00
Jonathon Menz
272f6d7700
Improved site tree tooltips
...
Now shows full title and friendly singular name for page type
2015-07-16 08:49:43 -07:00
Daniel Hensby
271f64e9b2
Merge pull request #4405 from christopherdarling/patch-1
...
FIX: DataQuery uses an undefined variable $callerClass in user_error() message
2015-07-16 16:15:27 +01:00
Christopher Darling
a3201d6ed9
FIX: $callerClass is undefined
...
replaced with $this->dataClass
2015-07-16 14:36:23 +01:00
Ingo Schommer
188765bd45
Merge pull request #4353 from scott1702/cms-styling
...
Update styles for action buttons and tabs
2015-07-16 19:54:54 +12:00
David Craig
3c20b58067
Update tree status after bulk action is applied
2015-07-16 10:50:09 +12:00
