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

15462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Stephens
3fcf1e2c98 BUG edge case on many many extra fields (fixes 4991) 
Fixes an edge case where extraFields are not returned if
one side of a many many is added via extension (although this
may not be the only failure case). Fixes a
downstream issue with dms breaking the CMS on framework 3.2.

The bug is where a many many relationship exists on a class,
and a sub-class attempts to get the extra fields of the
relationship. The change fixes the test for exact matching of
the relationship class to the instance class, to checking if
the instance is the class or a subclass of the relationship.

The unit tests check the dms failure case, which is a more
complex failure case.
 2016-02-04 12:47:07 +13:00
Damian Mooyman
ea00c670fd Merge pull request #5009 from scott1702/arrow-icons 
Add new font icons to set
 2016-02-04 11:24:36 +13:00
Damian Mooyman
d754884214 Update translations 2016-02-04 11:03:41 +13:00
scott1702
f39989a396 Add new font icons to set 
Add .no-text class for icons which have no text
 2016-02-04 10:34:30 +13:00
Damian Mooyman
50e508544b Merge pull request #5006 from scott1702/logout-icon 
Remove old logout icon on retina screens
 2016-02-03 17:59:00 +13:00
scott1702
15fba5a4cb Remove old logout icon on retina screens 
Remove background rules for old preview icons
 2016-02-03 16:36:21 +13:00
Damian Mooyman
63ea28c0f8 Merge pull request #5003 from ZarockNZ/patch-1 
Correct minor typo
 2016-02-03 13:15:45 +13:00
DouG
87a674a460 Correct minor typo 
had the word "fun" rather than "run"
 2016-02-01 16:25:17 +13:00
Damian Mooyman
7226524eb2 BUG Fix invalid sv translation yml 2016-01-29 10:15:21 +13:00
Damian Mooyman
49e5038927 Merge pull request #4986 from benmanu/pulls/wysiwyg-file-links 
BUG Fix TinyMCE insert link not respecting "open in new window" checkbox
 2016-01-29 09:36:08 +13:00
Ben Manu
361c9a03fe FIX: removing hardcoded target _blank for tinymce file links 
This will allow file links to respect content editor input
 2016-01-27 14:51:20 +13:00
Damian Mooyman
5952e38208 Merge pull request #4981 from JorisDebonnet/patch-1 
Fix incomplete functionality from #3734
 2016-01-26 18:52:44 +13:00
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
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
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
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
f131b0d91e Merge pull request #4961 from silverstripe/tractorcow-patch-1 
DOCS Update branch names
 2016-01-22 18:20:15 +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
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
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
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
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
Damian Mooyman
bd0716d1ee Merge pull request #4930 from SpiritLevel/3.1-docs 
DOCS 3.1 - fixes broken internal links
 2016-01-15 10:02:43 +13:00