Commit Graph

15489 Commits

Author SHA1 Message Date
Damian Mooyman
a4805bd6bb Merge remote-tracking branch 'origin/3.1.17' into 3.1 2016-02-19 12:48:17 +13:00
Damian Mooyman
af28b0a414 Added 3.2.2-rc1 changelog 2016-02-19 11:22:10 +13:00
Damian Mooyman
3738436d0e Update translations 2016-02-19 10:54:36 +13:00
Damian Mooyman
f32302522c Added 3.1.17-rc1 changelog 2016-02-19 10:30:25 +13:00
Damian Mooyman
cfd1a5d696 Update translations 2016-02-19 10:21:03 +13:00
Damian Mooyman
97089db8a6 Added 3.3.0-rc3 changelog 2016-02-18 17:29:18 +13:00
Ingo Schommer
893e49703d [ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers 2016-02-18 17:28:54 +13:00
Damian Mooyman
56e92f5a32 [ss-2016-002] Ensure Gridfield actions respect CSRF 2016-02-18 17:28:54 +13:00
Damian Mooyman
3398f670d8 [ss-2015-028] Block unauthenticated access to dev/build/defaults 2016-02-18 17:18:37 +13:00
David Alexander
903379bde2 DOCS 3.2 : fixing api: links now that api: tag parser working
fixed a couple of external links

fixed a docs link
2016-02-17 18:02:38 -07:00
Robbie Averill
0811e87ecc Typo fixes
* Fixed typo in `$dependencies`
* Updated "simplest example usage of the `Injector`" to specify the correct class name
2016-02-18 13:53:36 +13:00
David Alexander
febbd35b51 DOCS 3.1 : fixing api: links
missed one
2016-02-17 03:00:22 -07:00
Damian Mooyman
ace7f2cb2e Merge pull request #5039 from thezenmonkey/patch-2
FIX "where" method in SQLUpdate Example
2016-02-16 09:23:27 +13:00
Richard Rudy
87718597e8 FIX "where" method in SQLUpdate Example
Method should be addWhere
2016-02-15 02:27:04 -05:00
Damian Mooyman
9d9eb4d2dc Merge pull request #5025 from patricknelson/patch-1
Update 01_Caching.md
2016-02-11 09:34:08 +13:00
Patrick Nelson
35ce802ff6 Update 01_Caching.md
`'failure_callback' => ''` fails but providing `'failure_callback' => null` seems to work fine (since it expects a closure but gets a string, I think).
2016-02-10 12:59:58 -05:00
Damian Mooyman
35b5c03fbc Merge branch 3.3.0 into 3.3 2016-02-09 18:22:58 +13:00
Damian Mooyman
96a905aa09 Update changelog 2016-02-09 18:07:11 +13:00
Damian Mooyman
f66e21c10d Added 3.3.0-rc2 changelog 2016-02-09 18:02:22 +13:00
Damian Mooyman
adc7a59108 Update translations 2016-02-09 17:45:21 +13:00
Damian Mooyman
5515f4252a Merge pull request #5018 from mandrew/patch-3
Updating links
2016-02-09 15:10:57 +13:00
Michael Andrewartha
480eeb5be5 Updating links
Updated old hosting wiki link to point to new hosting page on silverstripe.org and fixing broken links
2016-02-09 12:16:47 +13:00
Daniel Hensby
cb39c41872 Merge pull request #5015 from webbuilders-group/3.3-datetime-search-fix
BUGFIX: Fixed issue #5002 DatetimeField styles in the new filter panel
2016-02-05 15:31:37 +00:00
Daniel Hensby
d339642cac Merge pull request #4972 from kinglozzer/pulls/back-button
Re-instate back button for item edit forms
2016-02-05 15:20:04 +00:00
UndefinedOffset
0c252af334 BUGFIX: Fixed issue #5002 DatetimeField styles in the new filter panel 2016-02-05 10:53:35 -04:00
Loz Calver
70f8343475 Re-instate back button for item edit forms 2016-02-05 09:39:57 +00:00
Daniel Hensby
39212f8b98 Merge pull request #5010 from GOVTNZ/4991-manymany-extrafields
BUG edge case on many many extra fields (fixes 4991)
2016-02-04 10:28:02 +00:00
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