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,393 Commits 31 Branches 527 Tags 162 MiB
6fe5c37d6a
Commit Graph

16393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Hensby
2e0a5245f8
Merge branch '3.4' into 3 2016-05-22 11:18:42 +01:00
Daniel Hensby
706be1210f
Merge branch '3.3' into 3.4 2016-05-22 11:17:28 +01:00
Daniel Hensby
2ae2675a47
Merge branch '3.2' into 3.3 2016-05-22 11:16:04 +01:00
Daniel Hensby
f3cf55074f
Merge branch '3.1' into 3.2 2016-05-22 11:10:37 +01:00
Loz Calver
4e6d0b3982 Merge pull request #5573 from dhensby/pulls/3.1/fix-no-db-tests 
FIX #5557 Tests with no DB requirements wont create test DB
 2016-05-20 16:43:33 +01:00
Daniel Hensby
8382685034
FIX #5557 Tests with no DB requirements wont create test DB 2016-05-20 15:37:52 +01:00
Daniel Hensby
e6f9e3a370
Merge branch '3.4' into 3 2016-05-20 12:35:58 +01:00
Daniel Hensby
016d39c81e
Merge branch '3.3' into 3.4 2016-05-20 12:34:10 +01:00
Daniel Hensby
4307aa36c8
Merge branch '3.2' into 3.3 2016-05-20 12:25:20 +01:00
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
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
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