Damian Mooyman
3ee017a07f
Remove old changlog file
...
Add reference for 3.2.0-beta2
2015-08-04 10:29:40 +12:00
jeroendedauw
320c717358
Remove unused local vars
2015-08-03 20:42:43 +02:00
Daniel Hensby
d0d34bde4a
Merge pull request #4473 from kinglozzer/gf-sortableheader-method-exists
...
Check that method 'hasMethod' exists in GridFieldSortableHeader
2015-08-03 18:45:25 +01:00
Loz Calver
1b6442058d
Check that method 'hasMethod' exists in GridFieldSortableHeader
2015-08-03 16:49:18 +01:00
Sam Minnée
2fda9ec493
Merge pull request #4471 from tractorcow/pulls/3.2/batch-restore
...
API batch restore action
2015-08-03 22:08:50 +12:00
Damian Mooyman
f2c39aac20
API batch restore action
2015-08-03 18:26:44 +12:00
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
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
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
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
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
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
