TeamCity
21765c4ce5
MINOR Updated translations
2012-07-11 13:06:51 +12:00
TeamCity
090c489834
MINOR Updated translations
2012-07-08 12:04:31 +12:00
TeamCity
9e940461ef
MINOR Updated translations
2012-07-07 11:04:03 +12:00
TeamCity
9460a0a56c
MINOR Updated translations
2012-07-05 20:54:19 +12:00
TeamCity
18636c470a
MINOR Updated translations
2012-07-04 23:11:28 +12:00
TeamCity
24c00594a8
MINOR Updated translations
2012-07-04 09:04:23 +12:00
TeamCity
c7f249a6f7
MINOR Updated translations
2012-07-03 11:57:28 +12:00
TeamCity
177970ea1d
MINOR Updated translations
2012-06-30 02:45:13 +12:00
TeamCity
61c05d38a4
MINOR Updated translations
2012-06-29 20:14:05 +12:00
TeamCity
19ed6b4b69
MINOR Updated translations
2012-06-29 19:04:29 +12:00
TeamCity
4582a167c6
MINOR Updated translations
2012-06-28 04:04:15 +12:00
TeamCity
82253e7f5e
MINOR Updated translations
2012-06-27 21:04:53 +12:00
TeamCity
7a6d0700f7
MINOR Updated translations
2012-06-27 11:09:53 +12:00
TeamCity
90e88402e1
MINOR Updated translations
2012-06-27 02:57:59 +12:00
TeamCity
61c7db3039
MINOR Updated translations
2012-06-27 00:13:55 +12:00
TeamCity
119a42ff2c
MINOR Updated translations
2012-06-26 11:09:34 +12:00
TeamCity
56efa81acf
MINOR Updated translations
2012-06-26 04:00:20 +12:00
TeamCity
80a2290f2e
MINOR Updated translations
2012-06-26 00:06:37 +12:00
Ingo Schommer
b7dd6eb5d0
MINOR Updated translations
2012-06-25 10:27:44 +02:00
Ingo Schommer
4c3648e987
MINOR Updated translations
2012-06-25 09:22:41 +02:00
Ingo Schommer
5d39c4d7b0
MINOR Updated translations
2012-06-25 00:23:50 +02:00
Ingo Schommer
9b22eb06fc
Merge branch 'master' into translation-staging
2012-06-25 00:08:00 +02:00
Sam Minnée
2c5f4201b7
Merge pull request #566 from pitchandtone/patch-4
...
Added nginx buffer size
2012-06-24 15:05:41 -07:00
Sam Minnee
7685a0b59d
Merge branch '3.0'
2012-06-25 10:01:34 +12:00
Ingo Schommer
ba9c3c7b8e
BUGFIX Type checking in CMS URL params ( fixes #7187 )
...
Nasty issue where nested requests to sub-controllers within LeftAndMain->EditForm() would fail because of
LeftAndMain->currentPageID() being taken from the URL, even though it was a field action name.
Example: POST /admin/pages/edit/EditForm/field/MyGridField/item/1/ItemEditForm/field/MyUploadField/upload
The current ID would be detected as "field" in this case.
Bug was previously fixed for AssetAdmin.
2012-06-22 17:47:45 +02:00
Ingo Schommer
3e7bf77a70
MINOR Translation process docs
2012-06-22 15:07:25 +02:00
Ingo Schommer
f7cec02c3c
MINOR Updated translations master
2012-06-22 11:30:52 +02:00
John Milmine
a997099120
I found that I needed to increase nginx buffer size to accommodate the size of the ajax requests
2012-06-22 21:09:48 +12:00
Ingo Schommer
682a6a0d1b
BUGFIX "Insert media" loading indicator ( fixes #7542 )
...
No "working" indicator in insert media from web button.
Returning the $.ajax object to allow for deferred callbacks
on events other than 'success'
2012-06-22 10:25:15 +02:00
Naomi Guyer
5713a37a32
BUGFIX: Alignment of http label in insert media
2012-06-22 18:11:00 +12:00
Sam Minnée
f17bb8f52c
Merge pull request #561 from adrexia/7497-file-upload-fixes
...
BUGFIX: Make alignment of step 1 consistent in Insert Media panel (fixes #3 of #7497 )
2012-06-21 23:09:39 -07:00
Naomi Guyer
f01c1640c7
BUGFIX: Alignment of http label in insert media
2012-06-22 18:04:13 +12:00
Sam Minnee
4aa4cd2c28
Merge branch '3.0'
...
Conflicts:
admin/scss/ie7.scss
2012-06-22 17:20:07 +12:00
Naomi Guyer
cffb95280f
BUGFIX: Tab colour htmleditor in IE7
2012-06-22 17:10:52 +12:00
Naomi Guyer
f3933aa3fb
BUGFIX: Make entire tab clickable in htmleditor ( fixes #7407 )
2012-06-22 17:10:52 +12:00
Sam Minnée
e169fdc6c2
Merge pull request #565 from adrexia/7407-insert-media-tabs
...
BUGFIX: Make entire tab clickable in htmleditor (fixes #7407 )
2012-06-21 22:09:45 -07:00
Naomi Guyer
89bd7ebfba
BUGFIX: Tab colour htmleditor in IE7
2012-06-22 16:55:40 +12:00
Sean Harvey
32913d47f0
Merge pull request #564 from sminnee/trac-7529
...
BUG: exclude() clears previously selected filters() (Trac #7529 )
2012-06-21 21:45:34 -07:00
Sam Minnee
1b5768975c
BUG: exclude() clears previously selected filters() (Trac #7529 )
...
This bug was caused by the fact that SQLQuery::whereAny() removed existing filters. In line with addWhere() and setWhere(), I split this into addWhereAny() and setWhereAny(). Strictly speaking, this drops the method SQLQuery::whereAny(), but it was really just an internal function for exclude, and so I think that's acceptable.
2012-06-22 16:31:29 +12:00
Naomi Guyer
c2e8c2450d
BUGFIX: Make entire tab clickable in htmleditor ( fixes #7407 )
2012-06-22 16:23:01 +12:00
Sam Minnée
f3b8469f33
Merge pull request #559 from silverstripe-rebelalliance/feature/countrydropdownfield
...
ENHANCEMENT: Add back CountryDropdownField
2012-06-21 19:29:59 -07:00
Sam Minnée
bafda93957
Merge pull request #563 from silverstripe-rebelalliance/trac/7427-add-responses
...
BUGFIX: Add batch handler status messages (fixes #7427 )
2012-06-21 19:29:41 -07:00
Hamish Friedlander
03469230ff
BUGFIX: Add batch handler status messages ( fixes #7427 )
...
7427 was mostly fixed by Ingos previous patch. But two batch actions, delete from draft site and delete from published site werent returning
status messages. Abstracted out the status preperation code that the batch actions that were returning status messages were using, and
used that to add status messages to the problem two
2012-06-22 13:59:08 +12:00
Sam Minnée
5e47159a52
Merge pull request #562 from silverstripe-rebelalliance/bugfix/themedcss
...
Make themedCSS use {theme}_{module}/css/{name}.css files if they exist
2012-06-21 18:41:07 -07:00
Hamish Friedlander
0bea6974b6
BUGFIX: Make themedCSS use {theme}_{module}/css/{name}.css files if they exist
...
2.4 used to use a manifest to find css. One side-effect of that is that even without explicit support,
css files in module-specific themes (/themes/{theme}_{module}/) would get picked up. This broke in 3.
This fix does still require the module name to be explicitly passed as a parameter to themedCSS, but if
you do, and a css file of that name exists in the module-specific themes css directory, that will
be included in preference to the theme or module provided css
2012-06-22 13:34:03 +12:00
Sam Minnée
20da6efb68
Merge pull request #560 from silverstripe-rebelalliance/trac/7476
...
Trac/7476
2012-06-21 16:57:00 -07:00
Sam Minnee
0352a9191e
MINOR: Fixed filename glitch in changelog
2012-06-22 11:46:35 +12:00
Hamish Friedlander
daa226a9af
BUGFIX: Fix trac ticket #7476
...
We missed making an event delegatable in https://github.com/silverstripe/sapphire/pull/542
the result was 7476 wasnt actually fixed
2012-06-22 10:46:03 +12:00
Sam Minnée
bba7a7ad8c
Merge pull request #556 from silverstripe-rebelalliance/trac/7494
...
Trac/7494
2012-06-21 14:52:52 -07:00
Hamish Friedlander
01062c70a1
ENHANCEMENT: Add back CountryDropdownField
...
We removed this because it depended on GeoIP, which was weird, and had its own dependancies.
But Zend_Locale is included in core, and can give us all the data we need for CountryDropdownField
2012-06-22 09:51:33 +12:00
