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,368 Commits 31 Branches 527 Tags 162 MiB
dd4c5417e7
Commit Graph

16368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
765f45eaf1
Check for shortcode tag before trying to parse shortcodes 2016-07-04 15:10:42 +01:00
Daniel Hensby
2cdfe6cc21
FIX Use RAW for DBField template helpers 2016-07-04 14:39:56 +01:00
Daniel Hensby
b0f237bb3a
FIX Use RAW instead of Value for parsing shortcodes 2016-07-04 13:53:56 +01:00
Daniel Hensby
e7da798914 Merge pull request #5770 from tractorcow/pulls/3/restore-icons 
BUG Fix missing icons (3 branch)
 2016-07-04 10:27:02 +01:00
Daniel Hensby
3cb8b5cae5 Merge pull request #5769 from tractorcow/pulls/3.4/restore-icons 
BUG Fix missing icons (3.4 branch)
 2016-07-04 10:26:55 +01:00
Damian Mooyman
0b7dab3f66 BUG Fix missing icons 
Fixes #5657
 2016-07-04 18:09:22 +12:00
Damian Mooyman
637167f2f9 BUG Fix missing icons 
Fixes #5657
 2016-07-04 18:07:11 +12:00
Damian Mooyman
4dadc276b5 Merge pull request #3916 from dhensby/nfauchelle-gd-padding-improvementt 
NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color
 2016-07-04 17:35:47 +12:00
Daniel Hensby
ee326f6394
Merge branch 'hailwood/patch-5' into 3 2016-07-01 14:53:02 +01:00
Matthew Hailwood
4f0969f119
Make lost password url a config option like login_url and logout_url 
Also makes the login_url, logout_url and new lost_password_url functions
return their link relative to the base url rather than assuming the base tag
 2016-07-01 14:47:51 +01:00
Daniel Hensby
9b061edb44 Merge pull request #5605 from open-sausages/pulls/3.3/fix-cmsall-perm 
BUG fix CMS_ACCESS permission being ignored if in incorrect order in array
 2016-06-29 15:25:21 +01:00
Daniel Hensby
390b1fc6c4
Merge branch '3.4' into 3 2016-06-29 11:43:02 +01:00
Daniel Hensby
2ab0dcf618
Merge branch '3.3' into 3.4 2016-06-29 11:42:05 +01:00
Daniel Hensby
da0b62f853
Merge branch '3.2' into 3.3 2016-06-29 11:40:58 +01:00
Daniel Hensby
3fe8d30c2c
Merge branch '3.1' into 3.2 2016-06-29 11:40:27 +01:00
Daniel Hensby
c11ac5d248 Merge pull request #4162 from kinglozzer/pulls/object-parse-class-spec 
FIX: Object::parse_class_spec failed to parse associative arrays
 2016-06-28 16:07:12 +01:00
Damian Mooyman
f1a0aef0d7
BUG fix CMS_ACCESS permission being ignored if in incorrect order in array 2016-06-28 17:45:15 +12:00
Ironcheese
9b1a4b328c Moving a field between tabs, wrong variable name 2016-06-15 15:36:43 +02:00
Damian Mooyman
7a462cecef Merge pull request #5684 from patricknelson/issue-5683-iframe-backport-pr-fix-5163 
FIX for #5683: Address security warning in CMS on 3.3 and above.
 2016-06-15 14:47:03 +12:00
Stevie Mayhew
7acce81295 Merge pull request #5686 from robbieaverill/feature/extendable-textparser 
Allow extensions for TextParser
 2016-06-14 08:10:29 +12:00
Daniel Hensby
0d36899afa
Merge branch '3.4' into 3 2016-06-13 12:30:33 +01:00
Daniel Hensby
4e392a4d43
Merge branch '3.3' into 3.4 2016-06-13 12:30:16 +01:00
Daniel Hensby
695c18ac6d
Merge branch '3.2' into 3.3 2016-06-13 12:29:45 +01:00
Robbie Averill
df3680295c Allow extensions for TextParser 
* Call Object::__construct to make it extendable
* Resolves #5685
 2016-06-13 13:31:58 +12:00
Patrick Nelson
f0d4951815 FIX for #5683: Address security warning in CMS when attempting to access <iframe> contents (Back-porting fix from PR #5163) 2016-06-12 17:26:36 -07:00
Stevie Mayhew
65afd6c354 Merge pull request #5681 from dhensby/pulls/3/injector-login-form 
NEW Use injector for MemberLoginForm fields
 2016-06-12 16:19:05 +12:00
Daniel Hensby
91aa818bd8 Merge pull request #5662 from kinglozzer/viewabledata-definemethods-pt2 
FIX: ViewableData::setFailover() didn't remove cached methods
 2016-06-11 10:28:56 +01:00
Daniel Hensby
19b9413432
NEW Use injector for MemberLoginForm fields 2016-06-10 22:50:38 +01:00
Damian Mooyman
bf00810e1f
BUG Fix buttonClicked() error 
Fixes #3208
 2016-06-08 12:26:11 +12:00
Loz Calver
0ad64387c7
Refactor duplicate code in Object 2016-06-07 16:17:58 +01:00
Loz Calver
429ce55756
FIX: ViewableData::setFailover() didn't remove cached methods 2016-06-07 16:17:49 +01:00
Daniel Hensby
f9ad2e2bbe Merge pull request #5658 from kinglozzer/5656-up-top 
FIX: Regression with <% with $Up/$Top %> (fixes #5656)
 2016-06-06 11:21:14 +01:00
Loz Calver
946495bcf5
FIX: Regression with <% with / %> (fixes #5656) 2016-06-06 10:14:07 +01:00
Nick
dae2295e16
NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color 2016-06-05 00:05:37 +01:00
Damian Mooyman
8a99b4f74e Merge 3.4.0 into 3.4 2016-06-03 11:33:44 +12:00
Damian Mooyman
8008fcbe97 Update changelog 2016-06-03 10:59:29 +12:00
Damian Mooyman
3fbeab94c8 Added 3.4.0 changelog 2016-06-02 17:27:21 +12:00
Damian Mooyman
ff3b970b71 Update translations 2016-06-02 17:07:41 +12:00
Damian Mooyman
2ea07f9c84 Merge pull request #5626 from sminnee/no-default-error-email 
FIX: Remove default from address for error emails
 2016-06-01 18:36:30 +12:00
Sam Minnee
8a58041fba FIX: Remove default from address for error emails 
errors@silverstripe.com has previously been set as the default email
address for error emails. This means that people across the world are
sending from that domain, and if we put SPF records in place it would
stop error emailing.

This change means that emails will be sent from the server-configured
default, which matches the behaviour of the Mailer class.

Leaving until 3.x (3.5, presumably) as it’s a feature change.

Fixes #5360.
 2016-06-01 18:05:55 +12:00
Antony Thorpe
39d1ef7a4b Bugfix: BulkLoader_Result class - Deleted Items (#5598) 
* Bugfix: BulkLoader_Result class - Deleted Items

The Deleted function, within BulkLoader_Result class, calls mapToArrayList, which tries to find the recently deleted dataobjects.
To correct:
- when calling addDeleted, store a map of each dataobject within the $this->deleted array; and,
- have the Deleted function return an ArrayList based upon the $this->deleted array.

* Added tests

- created a new test file for the BulkLoader_Result class
- included tests for other methods of this class
- slightly altered the addDeleted function to be consistent other methods of this class
 2016-06-01 09:55:06 +12:00
Daniel Hensby
0dcffda0e8 Merge pull request #5620 from webbuilders-group/field-visibility-refocus-fix 
BUGFIX: Fixed lookup of next closest visible field for focus restoring (fixes #5618)
 2016-05-31 15:57:58 +01:00
UndefinedOffset
341f49c630 BUGFIX: Fixed lookup of next closest visible field for focus restoring (fixes #5618) 2016-05-31 11:09:40 -03:00
Loz Calver
11aad47eeb Fix invalid syntax in TinyMCE config (#5593) 2016-05-27 13:35:46 +12:00
Daniel Hensby
4afdb630b5 Merge pull request #5579 from tractorcow/pulls/3.3/fix-finalised-query 
BUG Fix getFinalisedQuery not including all queried columns
 2016-05-26 01:32:59 +01:00
Daniel Hensby
128eaaeefc Merge pull request #5586 from kinglozzer/tokenisedregex-perf 
Improve performance of TokenisedRegularExpression
 2016-05-24 17:44:42 +01:00
Loz Calver
4daaffbe21 Merge pull request #5584 from micmania1/patch-11 
DOCS incorrect method referenced
 2016-05-24 16:31:26 +01:00
Loz Calver
6811f0969b
Improve performance of TokenisedRegularExpression 2016-05-24 10:30:10 +01:00
Michael Strong
db4dc64fb4 DOCS incorrect method referenced 
ModelAdmin uses 'getDefaultSearchContext': http://api.silverstripe.org/3.3/source-class-ModelAdmin.html#173
 2016-05-24 13:25:02 +12:00
Damian Mooyman
decd7e5c57
BUG Fix getFinalisedQuery not including all queried columns 
Fixes #1669
 2016-05-23 08:41:58 +12:00