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
15,490 Commits 31 Branches 527 Tags 162 MiB
43b00520fe
Commit Graph

15490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JorisDebonnet
51e9923c6c Fix incomplete functionality from #3734 
#3734 introduced the ability to *create* `mailto:` links with a subject in them, without the ability to *edit* them. This fixes that.
 2016-01-26 01:31:07 +01:00
Damian Mooyman
790a6da24e Merge pull request #4979 from dhensby/pulls/3/SilbinaryWolf-minor-optimization 
Replaced filterByCallback for 'Children' to just create a new array a…
 2016-01-26 10:13:58 +13:00
Silbinary Wolf
073e73a2f4 Replaced filterByCallback for 'Children' to just create a new array as function calls are exponentially expensive in PHP (the more functions that exist, the slower a function call becomes) and replaced 'array_key_exists' with op-code equivalent for speed. The best increase isn't really noticeable but we should work towards optimizing the core as much as possible. 2016-01-25 13:22:51 +00:00
Loz Calver
60c97dbf14 Merge pull request #4977 from tractorcow/pulls/3.2/fix-idlist-docs 
FIX PHPDocs on DataList::getIDList() and UnsavedRelationList::getIDList
 2016-01-25 09:27:16 +00:00
Damian Mooyman
d8555b73c4 Merge pull request #4978 from mediabeastnz/patch-3 
Removed PlayerCsvBulkLoader as importer
 2016-01-25 16:05:13 +13:00
Damian Mooyman
e091bb8474 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
#	tests/model/VersionedTest.yml
 2016-01-25 15:57:37 +13:00
Damian Mooyman
f79f99f14b Merge remote-tracking branch 'origin/3.3.0' into 3.3 2016-01-25 15:43:30 +13:00
Damian Mooyman
b4e76df531 Add upgrading notes to rc1 2016-01-25 15:35:42 +13:00
Myles Beardsmore
b0057c77f0 Removed PlayerCsvBulkLoader as importer 
Removed PlayerCsvBulkLoader as model importer class and replaced it with CsvBulkLoader instead.
 2016-01-25 15:26:25 +13:00
Damian Mooyman
5f511e5048 Added 3.3.0-rc1 changelog 2016-01-25 15:22:58 +13:00
Damian Mooyman
75493e79ff Update translations 2016-01-25 15:06:55 +13:00
Damian Mooyman
7c448bb4a2 Merge remote-tracking branch 'origin/3.2' into 3.3 
# Conflicts:
#	tests/model/DataObjectLazyLoadingTest.php
#	tests/model/VersionedTest.yml
 2016-01-25 14:11:37 +13:00
Damian Mooyman
d8e354d144 FIX PHPDocs on DataList::getIDList() and UnsavedRelationList::getIDList() 2016-01-25 11:09:37 +13:00
Damian Mooyman
f8ce2d7631 Merge pull request #4973 from dhensby/pulls/multibyte-char-fix 
Remove question marks, equal signs and hashes
 2016-01-25 10:00:07 +13:00
Daniel Hensby
e9d45b4d5f Merge pull request #4954 from tractorcow/pulls/3.3/version-fixes 
BUG Fix VersionedTest sometimes failing given certain querystring arguments
 2016-01-22 18:53:21 +00:00
Daniel Hensby
415318042d Merge pull request #4952 from silverstripe/local-bin 
Install sake into /usr/local/bin. /usr is now protected on OSX
 2016-01-22 18:49:40 +00:00
Will Rossiter
d9fd442b0e Install sake into /usr/local/bin. /usr is now protected on OSX 
https://support.apple.com/en-us/HT204899
 2016-01-22 18:48:58 +00:00
Daniel Hensby
f131b0d91e Merge pull request #4961 from silverstripe/tractorcow-patch-1 
DOCS Update branch names
 2016-01-22 18:20:15 +00:00
Daniel Hensby
119bd2f873 Merge pull request #4845 from tractorcow/pulls/3/extension-hook-byref 
API before/afterExtend now support parameters passed by reference
 2016-01-22 16:08:20 +00:00
Jarkko Linnanvirta
bc9aa09b1f Remove question marks, equal signs and hashes 
Those were not removed if multibyte was allowed.
 2016-01-22 15:40:11 +00:00
Daniel Hensby
cd42d070a0 Merge pull request #4968 from tractorcow/pulls/3.2/fix-versioned-rollback 
BUG Fix Versioned::doRollbackTo
 2016-01-22 15:12:33 +00:00
Daniel Hensby
8b0dc9786e Merge pull request #4970 from scott1702/update-background 
Update background colors
 2016-01-22 15:01:05 +00:00
scott1702
1a1c7b2f55 Update background colors 2016-01-22 17:50:01 +13:00
divzpatel123@gmail.com
7ead6f0ca9 Minor: changed px value on tabs (border-bottom) 2016-01-22 17:22:31 +13:00
Meeeeeeow
d8ee25c39c Minor: Remove Boxshadows 2016-01-22 17:18:02 +13:00
divzpatel123@gmail.com
fbc68f433f Minor: update background colors 2016-01-22 16:32:52 +13:00
Damian Mooyman
b2bd3ccca9 Merge pull request #4969 from scott1702/batch-actions 
Add default action for batch actions
 2016-01-22 16:20:06 +13:00
scott1702
e4222d8186 Add default action from batch actions 2016-01-22 16:02:27 +13:00
Damian Mooyman
bf8bf5e4d5 BUG Prevent Versioned::doRollbackTo from creating incorrect versions on subclasses of Versioned DataObjects 
Document correct configuration of Versioned DataObjects
Fixes #4936
 2016-01-22 15:35:58 +13:00
Damian Mooyman
2fb193cf7f Merge pull request #4967 from IgorNadj/patch-2 
Add special flag to CMS preview requests
 2016-01-22 15:15:12 +13:00
Ingo Schommer
88f8acff5a Merge pull request #4966 from tractorcow/pulls/3.2/fix-docs 
BUG Revert lost documentation
 2016-01-22 13:08:51 +13:00
Igor
3924db26d8 Add special flag to CMS preview requests 2016-01-22 13:02:59 +13:00
Damian Mooyman
cca7129385 BUG Revert lost documentation 
Resolves some regressions from #3735
 2016-01-22 11:45:00 +13:00
Damian Mooyman
7a2a969814 Merge pull request #4944 from Meeeeeeow/patch-1 
Docs: Fixed Typo
 2016-01-22 08:39:05 +13:00
Jarkko Linnanvirta
cf8e9f2427 Test removing some bad characters when multibyte is allowed 2016-01-21 12:57:50 +02:00
Damian Mooyman
bc2a4dd652 Merge pull request #4953 from lry6003/search-icon 
Search Icon Hover/Active/Focus changes
 2016-01-21 14:57:13 +13:00
Damian Mooyman
45c6d0284a Minor: Update branch names 2016-01-21 14:02:42 +13:00
Damian Mooyman
df76d783fe BUG Fix VersionedTest sometimes failing given certain querystring arguments 2016-01-20 14:49:46 +13:00
Luke Ryley
38e2cb5b6d Search Icon Hover/Active/Focus changes 
Changed the color of the search icon when it is in Hover/Active/Focus state and removed backgroup color changes in these states
 2016-01-20 14:35:54 +13:00
Damian Mooyman
eeb110a04f Merge pull request #4939 from lry6003/unbold-labels 
Minor: Unbolded labels in CMS
 2016-01-20 13:31:13 +13:00
Damian Mooyman
8e4db95f72 Fix merge regressions 2016-01-19 17:08:40 +13:00
Damian Mooyman
8c1cafd1a0 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
#	admin/scss/_tree.scss
#	javascript/TreeDropdownField.js
 2016-01-19 17:08:26 +13:00
Damian Mooyman
d561551a19 Merge pull request #4943 from Meeeeeeow/LinkColourChange 
Changed the link colours
 2016-01-19 16:33:21 +13:00
Meeeeeeow
e448774150 Fixed Typo 
Changed 'Gudes' to 'Guides'
 2016-01-19 16:18:35 +13:00
Meeeeeeow
4301ae20bf Changed the link colours 2016-01-19 15:46:29 +13:00
Damian Mooyman
5d240feaec Merge remote-tracking branch 'origin/3.2' into 3.3 2016-01-19 15:08:24 +13:00
Damian Mooyman
46cbe809ac Merge remote-tracking branch 'origin/3.1' into 3.2 
# Conflicts:
#	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
#	docs/en/02_Developer_Guides/14_Files/01_Image.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
#	docs/en/03_Upgrading/index.md
#	docs/en/05_Contributing/01_Code.md
#	forms/TreeMultiselectField.php
#	security/Permission.php
 2016-01-19 14:00:19 +13:00
Luke Ryley
2701248387 Minor: Unbolded labels in CMS 
- updated _forms.scss removed font-weight
- also removed drop-shadow include
Luke Ryley - open source academy
 2016-01-19 12:04:55 +13:00
Damian Mooyman
4de81a7bc8 Merge pull request #4935 from SpiritLevel/3.1-docs 
DOCS 3.1 : typos and broken internal links
 2016-01-18 15:23:15 +13:00
David Alexander
45d2b57a65 DOCS 3.1 : typose and broken internal links 2016-01-15 16:39:23 +13:00