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
16,707 Commits 31 Branches 527 Tags 162 MiB
2805baecd3
Commit Graph

16707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
0c3d30e621
Merge branch '3.1' into 3.2 2016-05-20 12:24:47 +01:00
Will Rossiter
0a67052d6c Merge pull request #5564 from dhensby/pulls/3.1/manifest-optimisation 
Efficiency improvement to class manifest
 2016-05-20 14:32:43 +12:00
Daniel Hensby
4c4154115f Merge pull request #5569 from silverstripe-terraformers/fixes/field-diff 
Switched Diff to the escaped variable created
 2016-05-20 01:26:41 +01:00
Christopher Joe
b4ac3ba141 Switched Diff to the escaped variable created 2016-05-20 10:51:59 +12:00
Daniel Hensby
3a9bb642d2 Merge pull request #5566 from stevie-mayhew/bugfix/uid 
BUGFIX: check token and UID before member autologin
 2016-05-19 23:46:09 +01:00
Stevie Mayhew
b1df9dcb1d BUGFIX: check that we have a token and a UID before attempting a member auto login 2016-05-20 09:19:08 +12:00
Daniel Hensby
118af06c3f
Efficiency improvement to class manifest 2016-05-19 12:47:29 +01:00
Michael van Schaik
3a277f3a5e Update ClassInfo to return arrays where expected (#5563) 
These methods are expected to return an array instead of null (if $class doesnt exist);
- getValidSubClasses
- dataClassesFor
- subclassesFor
- ancestry

Fixes: #5562
Also see: https://github.com/silverstripe/silverstripe-framework/issues/5171
 2016-05-19 12:28:35 +01:00
Daniel Hensby
be7e0db26e
Merge pull request #3835 from dnadesign/hideFromHierachy3 2016-05-19 11:52:47 +01:00
Ingo Schommer
de13e10787 Removed branch alias which should only apply to latest release branch (#5561) 
See 070ae2555b
for similar commit when going from 3.1 to 3.2.
 2016-05-19 09:54:30 +01:00
Damian Mooyman
0ccd33f9f1 Alias 3 as 3.5 2016-05-19 16:08:47 +12:00
Damian Mooyman
9c021c45b8 Merge 3.4.0 into 3 2016-05-19 15:48:06 +12:00
Damian Mooyman
0d356d078d Add release notes to changelog 2016-05-19 15:27:07 +12:00
Damian Mooyman
b4e8c595f5 Added 3.4.0-rc1 changelog 2016-05-19 15:08:09 +12:00
Damian Mooyman
d125d4e304 Update translations 2016-05-19 14:48:39 +12:00
Damian Mooyman
d8f6d94d30 Merge pull request #4974 from patricknelson/issue-4909-rss-via-injector 
FIX for #4909: Ensure RSSFeed_Entry is instantiated using the injector.
 2016-05-19 14:31:59 +12:00
Damian Mooyman
b634b1a67d Merge pull request #5537 from IgorNadj/patch-niceformats 
ENH: moving hardcoded nice date/time formats to config
 2016-05-19 14:12:22 +12:00
Damian Mooyman
6035be7e57 Merge pull request #5548 from kinglozzer/4661-extrafields-casting 
FIX: castingHelper failed to find many_many_extraFields data (fixes #4661)
 2016-05-19 14:10:37 +12:00
Damian Mooyman
5df9cb05f3 Merge pull request #5551 from AntonyThorpe/patch-1 
Updated 01_Data_Model_and_ORM.md for byID
 2016-05-19 14:08:45 +12:00
Cristian Torres
2f84c3431b UPDATE: Throw exceptions on file missing 
The class will throw exceptions whenever the css or js file is not found in any context and the site is in development mode
 2016-05-18 16:47:38 -06:00
Loz Calver
12f6bdcd1b Merge pull request #5559 from dhensby/pulls/3/retina-icons-pick 
FIX Remove old logout icon on retina screens
 2016-05-18 16:55:29 +01:00
scott1702
f373632d98
Remove old logout icon on retina screens 
Remove background rules for old preview icons
 2016-05-18 16:28:05 +01:00
Michael James
3870c499d6 DOCS Adding comma to array declaration (#5558) 2016-05-18 15:07:45 +01:00
Damian Mooyman
574bc6038b Merge 3 into master 
# Conflicts:
#	CONTRIBUTING.md
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/javascript/LeftAndMain.EditForm.js
#	admin/javascript/LeftAndMain.js
#	admin/scss/_forms.scss
#	dev/Debug.php
#	docs/en/05_Contributing/01_Code.md
#	forms/DropdownField.php
#	model/DataObject.php
#	model/Versioned.php
#	model/fieldtypes/DBLocale.php
#	tests/forms/gridfield/GridFieldExportButtonTest.yml
#	tests/model/MoneyTest.php
#	tests/model/MoneyTest.yml
#	tests/model/SQLQueryTest.php
 2016-05-18 18:36:10 +12:00
Damian Mooyman
66ef857cdf Manual merge of #5412 into master 2016-05-18 17:42:13 +12:00
Damian Mooyman
303f695751 Merge 3.3 into 3 
# Conflicts:
#	admin/javascript/LeftAndMain.EditForm.js
 2016-05-18 17:29:30 +12:00
Damian Mooyman
dad7981332 Merge 3.2 into 3.3 2016-05-18 17:27:28 +12:00
Damian Mooyman
8dfeeb0eb6 Merge 3.1 into 3.2 2016-05-18 17:25:42 +12:00
Hamish Friedlander
d350aa4153 Merge pull request #5555 from open-sausages/pulls/3.1/fix-display-errors 
BUG Fix suppression of display_errors in ErrorControlChain
 2016-05-18 16:04:57 +12:00
Hamish Friedlander
0dd1cc09d0 Merge pull request #5556 from open-sausages/pulls/3/errors-http-response 
API Enable Debug.friendly_error_httpcode to correctly set HTTP status code for errors
 2016-05-18 15:37:36 +12:00
Damian Mooyman
757cfae90c API Enable Debug.friendly_error_httpcode to correctly set HTTP status code for errors 2016-05-18 14:27:45 +12:00
Damian Mooyman
62bd26d11a BUG Fix suppression of display_errors in ErrorControlChain 2016-05-18 13:36:54 +12:00
Damian Mooyman
8ed25ae482 BUG Fix DataObject::isChanged() detecting non saveable changes (#5545) 2016-05-18 09:00:04 +10:00
mrb
3a93172c53 Add some excludes to codeclimate.yml 2016-05-17 17:46:02 -04:00
Antony Thorpe
f12258427a Updated 01_Data_Model_and_ORM.md for byID 
According to the framework's API documentation 'byID' is a method of DataList not 'byId'.  Both are used in the documentation.
 2016-05-18 08:30:29 +12:00
Loz Calver
0965226a15 Deprecate now-duplicated logic in ViewableData::castingHelper() 2016-05-17 16:04:55 +01:00
Loz Calver
7a81372294 FIX: castingHelper failed to find many_many_extraFields data (fixes #4661) 2016-05-17 16:04:28 +01:00
Damian Mooyman
8947bb0245 BUG Fix filtersOnId ignoring WHERE "ID" IN () (#5546) 2016-05-17 18:30:33 +12:00
Hamish Friedlander
c66a969c1d Merge pull request #5543 from open-sausages/pulls/3/fix-formfield-layout 
BUG Fix link dialog box layout in CMS
 2016-05-17 15:26:34 +12:00
Damian Mooyman
829f59e443 BUG Fix link dialog box layout in CMS 2016-05-17 12:04:03 +12:00
Ingo Schommer
2312d82123 Merge pull request #5540 from tractorcow/pulls/3.3/fix-locale-singleton 
BUG Fix singleton('DBLocale')
 2016-05-17 10:46:04 +12:00
Daniel Hensby
11f73de330 Merge pull request #5539 from sminnee/sitetree-docblock-improvements 
PHPDoc improvements for Hierarchy and Versioned
 2016-05-16 21:30:25 +01:00
Daniel Hensby
9e5a0b82a2 Merge pull request #5538 from TimeZoneOne/fix-export-zero 
Fix bug, export button cannot export value '0'
 2016-05-16 15:12:41 +01:00
Daniel Hensby
b68f5acd46 Merge pull request #5541 from silverstripe/revert-5480-subsites-breaks-tests 
Revert "Disable subsite filters when running unit tests"
 2016-05-16 09:44:29 +01:00
Damian Mooyman
b6e73689a5 Revert "Disable subsite filters when running unit tests" 2016-05-16 17:07:09 +12:00
Shawn Lin
2a856300c0 Fix bug, export button cannot export value '0' 2016-05-16 16:49:10 +12:00
John Milmine
c401d9daff new added hide_from_cms_tree and hide_from_hierarchy 2016-05-16 16:20:14 +12:00
Damian Mooyman
79d0590628 BUG Fix singleton('DBLocale') 2016-05-16 16:16:28 +12:00
Hamish Friedlander
2aec495a7c Merge pull request #5533 from open-sausages/pulls/3/require-existing-password 
BUG Prevent session hijackers from resetting a user password
 2016-05-16 14:23:53 +12:00
Igor
5b691d1835 Minor: update docs for PR branch guidelines #5345 (#5365) 2016-05-16 12:34:43 +12:00