tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
14,839 Commits 31 Branches 527 Tags 162 MiB
2ae5d83f08
Commit Graph

14839 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Minnée
5c3bf3d0a2 Merge pull request #4482 from kinglozzer/classinfo-nonexistant-class 
Ensure ClassInfo is backwards compatible with non-existant classes
 2015-08-10 15:45:32 +12:00
Daniel Hensby
0469722435 Merge pull request #4498 from tractorcow/pulls/3.2/fix-duplicate 
BUG Fix duplicate primary key crash on duplicate
 2015-08-09 23:20:54 +01:00
Damian Mooyman
cf9d2d12ac BUG Fix duplicate primary key crash on duplicate 2015-08-10 09:54:30 +12:00
Sam Minnée
0e989e409d Merge pull request #4496 from stevie-mayhew/pulls/background-image 
MINOR: be more specific with background class for menu
 2015-08-08 12:18:03 +12:00
Damian Mooyman
b53c174efb Merge pull request #4497 from sminnee/fix-regression-from-classinfo 
FIX: Fixed regression from ClassInfo case-sensitivity fix.
 2015-08-07 14:42:39 +12:00
Sam Minnee
1f0602d42f FIX: Fixed regression from ClassInfo case-sensitivity fix. 
This fixes a bug introduced by ffbeac6b7d.
ClassInfo::subclassesFor() didn't previously throw an Exception if passed
an invalid class; it just returned no values. This will annoy minor-release
upgrades, and so I've made it return null instead in these situation.
 2015-08-07 14:20:01 +12:00
Stevie Mayhew
ea7b0714c2 MINOR: be more specific with background class for menu 2015-08-07 13:22:57 +12:00
Will Morgan
a28bf97cf4 Merge pull request #4488 from SpiritLevel/patch-4 
Spelling
 2015-08-06 16:23:14 +01:00
JorisDebonnet
18e163d985 Url-safe alternative for base64_encode in resampled Image filenames 2015-08-05 20:59:40 +02:00
David Alexander
44680d175c Spelling 2015-08-05 21:34:35 +12:00
Sam Minnée
d419b667ef Merge pull request #4485 from yabbagail/no-php7 
Explicitly don't support PHP7
 2015-08-05 18:06:52 +12:00
Abagail Yost
30bdcc5dc3 Explicitly don't support PHP7 2015-08-05 15:28:38 +10:00
Will Morgan
ca6a46f88d Merge pull request #4481 from dhensby/pulls/fix-default-perm-failure 
Fixing rubbish login message when trying to access the CMS
 2015-08-04 16:38:52 +01:00
Loz Calver
687de33d0d Ensure ClassInfo is backwards compatible with non-existant classes 2015-08-04 15:07:07 +01:00
Daniel Hensby
009458e342 Fixing rubbish login message when trying to access the CMS 2015-08-04 12:23:22 +01:00
Nick
1438a53900 Issue #4424 
Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces #4424
 2015-08-04 15:57:38 +10:00
Nick
9ad64716cc Issue #4424 
Model Admin : 'Show Specification for' toggle link breaks if Title contains spaces #4424
 2015-08-04 15:55:07 +10:00
Damian Mooyman
102892e247 Update translations 2015-08-04 13:02:20 +12:00
Damian Mooyman
55fa645269 Added 3.2.0-beta2 changelog 2015-08-04 10:39:12 +12:00
Damian Mooyman
3ee017a07f Remove old changlog file 
Add reference for 3.2.0-beta2
 2015-08-04 10:29:40 +12: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
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
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