Commit Graph

14940 Commits

Author SHA1 Message Date
Damian Mooyman
f73ef1d5be Merge pull request #4470 from scott1702/update-alerts
Update batch archive warning to include children pages
2015-08-03 18:14:18 +12:00
scott1702
dfaaa3353e Update batch archive warning to incl children pages 2015-08-03 16:17:31 +12:00
Sam Minnée
4e8aa0c4f2 Merge pull request #4460 from JeroenDeDauw/rm-dead-assign
Remove dead assignment
2015-08-03 14:48:33 +12:00
Sam Minnée
09f9c81fbe Merge pull request #4461 from JeroenDeDauw/rm-dead-vars
Remove unused local vars
2015-08-03 14:47:20 +12:00
Sam Minnée
8425a2b5a3 Merge pull request #4458 from tractorcow/pulls/3.2/fix-change-detection-back
BUG Fix change detection on browser back button
2015-08-03 13:52:05 +12:00
Sam Minnée
dbc88f8ebf Merge pull request #4468 from tractorcow/pulls/3.2/cache-has-one
fixing has_one cache to use get_one rather byID
2015-08-03 13:50:52 +12:00
Sam Minnée
4485b266e2 Merge pull request #4467 from camfindlay/patch-28
DOCS create() makes objects not classes.
2015-08-03 13:36:31 +12:00
John Milmine
a6fdcd238a fixing has_one cache to use get_one rather byID
This helps becuase it uses the get_one internal Dataobject cache
2015-08-03 13:28:16 +12:00
Cam Findlay
ea16aca74b DOCS create() makes objects not classes.
Thanks to Matthew at Cabbage Tree Creative for reporting.
2015-08-03 12:50:24 +12:00
Damian Mooyman
66ca5405d0 BUG Fix change detection on browser back button 2015-08-03 08:31:51 +12:00
jeroendedauw
9a4ecbf41b Remove unused local vars 2015-07-31 21:52:21 +02:00
jeroendedauw
88c5e7f6e2 Remove dead assignment 2015-07-31 21:49:41 +02: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
fa76f98d0c Merge pull request #4441 from jonom/choose-file-thumbnails-3.2
FIX Missing thumbnails and inconsistencies
2015-07-31 14:37:10 +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
Jonathon Menz
aa286ef7d7 FIX Missing thumbnails and inconsistencies
Made thumbnails and columns in File list Grid Fields more consistent (fixes #4409)
2015-07-30 16:15:51 -07: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
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
97b226abe0 BUG Fix semver violation in create_table_options 2015-07-30 14:24:41 +12: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
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
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
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
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
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
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
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
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