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
8,845 Commits 31 Branches 527 Tags 162 MiB
ad6b7a40ee
Commit Graph

8845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
ad6b7a40ee BUGFIX Add Maori locale data (mi, mi_NZ) from CLDR 1.9 to avoid Zend_Locale complaining (fixes #7386) 2012-05-29 13:47:24 +02:00
Ingo Schommer
5b03f49245 BUGFIX Respecting server-overrides on X-Pjax responses during ajax redirects. Fixes GridFieldDetailForm redirect after delete, e.g. in ModelAdmin. Partially reverts 8b4b896. Closes pull request #488 2012-05-29 11:34:47 +02:00
Sean Harvey
909c5bd3b1 MINOR Fixed spelling error 2012-05-29 20:10:34 +12:00
Sean Harvey
f43273f217 MINOR Provide a better error if incorrect number of arguments are passed 
to filter() or exclude() on a DataList
 2012-05-29 20:09:36 +12:00
Sean Harvey
d7a8fa9266 BUGFIX If RequiredFields::php() is given any fieldName that is NULL, don't attempt to validate a NULL field. 2012-05-29 14:37:26 +12:00
Sam Minnée
dbbabe129b Merge pull request #494 from halkyon/tiny_mce_upgrade_3_5_1_1 
MINOR Upgrade TinyMCE dependency to 3.5.1.1
 2012-05-28 14:12:02 -07:00
Sean Harvey
0235a8c0c7 BUGFIX Partially reverting 28e43bdc which broke media insertion 2012-05-28 22:27:20 +12:00
Sean Harvey
9b9bd23820 MINOR Upgrade TinyMCE dependency to 3.5.1.1 2012-05-28 21:42:15 +12:00
Sean Harvey
23a3872e34 MINOR Fixed regression in DataListTest 2012-05-28 21:17:40 +12:00
Sean Harvey
c3eabffcb9 MINOR Use shorthand {class}::get() syntax instead of DataList::create() 
in core code.
 2012-05-28 21:13:42 +12:00
Sean Harvey
71256ea7f8 MINOR Update class docs for OptionsetField to use short DataList query 2012-05-28 21:12:59 +12:00
Sean Harvey
862d7f249b MINOR If $containerClass passed in to DataObject::get() isn't DataList, 
use Deprecation::notice() instead of throwing a notice
 2012-05-28 21:12:06 +12:00
Sean Harvey
ed1373d22b MINOR Use better syntax for querying DataList in 3.0 upgrading guide 2012-05-28 18:45:59 +12:00
Sam Minnee
f3467a3337 MINOR: Added test listeners to support TeamCity/PHPUnit executions. 2012-05-28 18:31:48 +12:00
Sam Minnee
07c4860031 MINOR: Fixed test 2012-05-28 16:20:28 +12:00
Sam Minnee
fb48ec54f4 BUGFIX: Fixed unreliability in SapphireTest::getCurrentAbsolutePath() 2012-05-28 14:25:34 +12:00
Sam Minnee
db79739023 BUGFIX: Fixed inconsistencies in en vs. en_US handling in i18n 2012-05-28 14:10:58 +12:00
Sam Minnee
1709a1dd6b MINOR: Updated beta3 changelog 2012-05-28 13:33:15 +12:00
Sam Minnee
867b9a37d2 Merge branch 'master' of github.com:silverstripe/sapphire 2012-05-28 13:26:06 +12:00
Sean Harvey
ddd2d3af95 MINOR Fixing broken i18nTest 2012-05-28 12:29:50 +12:00
Sam Minnee
7994b73cb7 MINOR: Added i18n to Delete action 2012-05-28 12:05:41 +12:00
Jeremy Bridson
fb78cab8e6 ENHANCEMENT:Trac#7218 - changed delete button on gridfield to cross and added tooltips for both edit and delete. 2012-05-28 12:03:38 +12:00
Sean Harvey
e3dee85635 MINOR Fix broken test 2012-05-28 12:03:13 +12:00
Sam Minnée
1c1a299cd1 Merge pull request #478 from halkyon/i18n_lang_fallback 
BUGFIX i18n::include_by_locale() doesn't include a fallback language, _t...
 2012-05-27 17:01:08 -07:00
Sam Minnée
881c186f6d Merge pull request #493 from halkyon/addnew_button_name 
ENHANCEMENT Allow calling setButtonName() on a GridFieldAddNewButton to ...
 2012-05-27 16:58:49 -07:00
Sean Harvey
0952df49fb ENHANCEMENT Allow calling setButtonName() on a GridFieldAddNewButton to customise the button name 2012-05-28 11:55:43 +12:00
Sam Minnée
f80091f16a Merge pull request #492 from ajshort/multisites 
Fix ModelAdmin When Managed Models Is Array
 2012-05-27 16:53:28 -07:00
Naomi Guyer
9a7980e357 ENHANCEMENT: Design fixes in insert media pop-up 
* Apply design to insert media/image pop-up
 2012-05-28 11:50:34 +12:00
Naomi Guyer
28e43bdc88 ENHANCEMENT: File/Image UI fixes 
* Replaced cancel/delete button in files area
* Consolidated Image upload styles with AssetUpload styles
* Changed name of step 2 in image upload
* Made image editing hidden by default, so multiple files can be seen,
and added ability top open and close
* Tweaked styles in on page upload field (status colour and file name
width)
 2012-05-28 11:50:34 +12:00
Sean Harvey
79680137b1 BUGFIX SecurityAdmin shows incorrect breadcrumbs for viewing Roles GridField. Partially reverts 16982ba17c. 2012-05-28 11:46:25 +12:00
Sean Harvey
74d444cf2f BUGFIX Ensure "Add [modelClass]" is shown instead of using the field name of the GridField, partially reverts 16982ba17c which broke breadcrumbs in SecurityAdmin 2012-05-28 11:43:47 +12:00
Andrew Short
b7ce610933 BUGFIX: Fixed ModelAdmin not working when managed models was defined as an array. 2012-05-27 21:45:42 +10:00
Sam Minnée
497aa9bfa9 Merge pull request #490 from simonwelsh/cms-oembed 
BUGFIX: Provide a default width and height of 100px for those endpoints ...
 2012-05-24 20:49:54 -07:00
Sam Minnée
736b5cbd1d Merge pull request #491 from mateusz/cms-oembed 
BUGFIX: Add comments and fix IE problems (class is a reserver JS word).
 2012-05-24 20:40:29 -07:00
Simon Welsh
15a5dab395 MINOR: Add a fallback thumbnail image for oEmbed inserts 2012-05-25 15:40:17 +12:00
Sam Minnee
e017813e6e MINOR: Updated en langfile 2012-05-25 10:40:12 +12:00
Sean Harvey
48212aa840 MINOR Adding upgrade docs on deprecated Director::redirect() and 
Director::redirectBack()
 2012-05-25 10:08:59 +12:00
Ingo Schommer
fb7cd328cf MINOR Fixed field naming in SecurityAdminTest (recently changed alongside new GridFieldAddButton commit) 2012-05-25 00:02:23 +02:00
Simon Welsh
31db970fb2 BUGFIX Set Editor if getEditor() is null rather than onmatch 2012-05-24 23:39:53 +02:00
Ingo Schommer
5b0734943f MINOR Fixed GridFieldAddNewButton label 2012-05-24 23:39:47 +02:00
Mateusz Uzdowski
d8fdda79be BUGFIX: Add comments and fix IE problems (class is a reserver JS word). 2012-05-25 09:31:15 +12:00
Ingo Schommer
fa445ad13f Merge pull request #452 from adrexia/sapphire 
---

* Added a separate component to grid field to hold buttons.
* Updated templates for changes
* Updated comments

Conflicts:
	css/AssetUploadField.css
	css/GridField.css
 2012-05-24 23:06:46 +02:00
Simon Welsh
30ecb9f531 BUGFIX: Provide a default width and height of 100px for those endpoints that don't provide one. 2012-05-24 18:16:00 +12:00
Sam Minnée
1772355ef3 Merge pull request #484 from simonwelsh/multipe-shortcodes 
BUGFIX: Handle consecutive shortcodes.
 2012-05-23 22:56:40 -07:00
Sam Minnée
25ddf2f879 Merge pull request #489 from mateusz/cms-oembed 
Cms oembed from Simon Walsh
 2012-05-23 22:22:53 -07:00
Mateusz Uzdowski
5b845248ed ENHANCEMENT: add test to Oembed 2012-05-24 17:00:22 +12:00
Mateusz Uzdowski
32817b4133 BUGFIX: replace foreach loop with a core function call 2012-05-24 17:00:22 +12:00
Mateusz Uzdowski
1c8d39be4c BUGFIX: add comments, make the code more readable 2012-05-24 17:00:22 +12:00
Mateusz Uzdowski
63ed0cba32 BUGFIX: return a meaningful translatable string when resource is invalid 2012-05-24 17:00:21 +12:00
Simon Welsh
bb29ff3611 FEATURE: Allow adding media to the CMS using oEmbed 2012-05-24 17:00:21 +12:00