TeamCity
a4d5a8c774
Merge remote branch 'origin/master' into translation-staging
2012-10-31 06:55:02 +13:00
Ingo Schommer
08832261c1
Fixed merge errors in CMSProfileController
2012-10-30 18:03:49 +01:00
Ingo Schommer
efabde1416
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
admin/css/screen.css
admin/scss/_style.scss
security/Member.php
2012-10-30 17:52:49 +01:00
Ingo Schommer
a502b222cc
Merge remote-tracking branch 'origin/2.4' into 3.0
2012-10-30 17:24:52 +01:00
Ingo Schommer
945d8ba140
Merge commit '6a06965b3732a3a820913b7f119bf618a99635ab' into 3.0
2012-10-30 17:24:35 +01:00
Ingo Schommer
9e595db7f3
Changelogs
2012-10-30 17:00:41 +01:00
TeamCity
822d96d508
Updated translations
2012-10-30 03:19:54 +13:00
TeamCity
555760087f
Updated translations
2012-10-30 02:22:43 +13:00
TeamCity
e9c7b1f841
Updated translations
2012-10-30 00:20:17 +13:00
TeamCity
c6cf8908fc
Updated translations
2012-10-29 23:46:08 +13:00
Simon Welsh
624f427c2a
Removes line longer than 120c
2012-10-29 10:22:53 +13:00
Simon Welsh
3542b7ecf8
Merge pull request #900 from phptek/3.0
...
MINOR: Fixed typo; "SilverStripe" was mis-spelled.
2012-10-28 12:47:07 -07:00
Russell Michell
031681814b
MINOR: Fixed typo; "SilverStripe" was mis-spelled.
2012-10-29 08:13:43 +13:00
TeamCity
56aee1c43b
Merge remote branch 'origin/master' into translation-staging
2012-10-28 16:52:13 +13:00
Will Rossiter
69ea73b4ed
Merge pull request #777 from halkyon/field_edit3
...
Member_ProfileForm respect canEdit() permissions on Member
2012-10-27 20:11:46 -07:00
Naomi Guyer
a0f8d044c0
BUG: Border at top of tabs when no subtabs
2012-10-28 16:05:13 +13:00
Will Rossiter
d7bf6e781a
Merge pull request #719 from silverstripe-rebelalliance/open/7665
...
FIX: CMS Menu header now changes height (Fixes: 7665)
2012-10-27 19:41:27 -07:00
Jeremy Bridson
940236a392
BUG: CMS Menu header now changes height depending on the name. Fixes 7665
...
Position and height were being set inline so added !important to override this.
2012-10-28 15:38:25 +13:00
Will Rossiter
4f8d23b7f2
Merge pull request #704 from adrexia/IE7-left-panel-text
...
BUG: IE7 vertical text fix
2012-10-27 19:23:46 -07:00
TeamCity
3344b59c13
Updated translations
2012-10-28 06:19:40 +13:00
TeamCity
1b49c6ca19
Updated translations
2012-10-28 05:20:03 +13:00
Simon Welsh
b031188080
Updated gridfield docs
...
Fixes GridFieldConfig_RelationEditor example (was the same as RecordEditor) and fixes related links.
2012-10-27 11:30:26 +13:00
Sean Harvey
1834a32314
Merge pull request #899 from Juanitou/patch-5
...
Fix docs/en/changelogs/3.0.0.md
2012-10-25 13:42:06 -07:00
TeamCity
22a1b87285
Updated translations
2012-10-26 04:34:49 +13:00
Juan Molina
f6f96a630e
Update docs/en/changelogs/3.0.0.md
...
Fixed broken links. Hash links were not working. I don’t know how to hide heading-anchor-link links. Tried to correct some layout errors (code quotes).
2012-10-25 17:21:31 +03:00
Will Rossiter
f719cf76ef
Merge pull request #894 from nyeholt/datefield_ie8_bug
...
BUG Fixed DateField date format error for IE8
2012-10-25 01:09:36 -07:00
TeamCity
9409c54cef
Updated translations
2012-10-25 20:15:19 +13:00
TeamCity
f9d95f978c
Updated translations
2012-10-25 19:02:27 +13:00
Marcus Nyeholt
9c1b4693f7
BUG Fixed DateField date format error for IE8
...
On IE8, camel case element attributes are NOT included in the object returned
by $(elem).data(), meaning attrs defined in DateField.php (jqueryDateformat and
isoDateformat) are NOT seen by the code in DateField.js (ie the "config" var
doesn't have these set). Causing IE8 to fall back to using US date (mm/dd/yyyy)
formats. This can subsequently cause validation issues if the user's date
format is different.
DateField.js already explicitly checks for jquerydateformat (all lowercase)
so DateField.php has been modified to reflect the correct case for this
attribute name
2012-10-24 13:49:10 +11:00
Sean Harvey
ac489509be
BUG Fixing "+" characters being replaced with whitespace
...
SS_HTMLValue::getContent() uses urldecode() on the content returned
by saveHTML() -- this was done to fix encoded HTML entities like
square brackets, which are used by shortcodes. Unfortunately, this
also removes valid characters like "+" from the content.
This fixes it so square bracket entities are decoded *only*, and
leaves everything else as-is.
2012-10-24 14:44:14 +13:00
TeamCity
07d9daaf86
Updated translations
2012-10-24 07:21:09 +13:00
TeamCity
df57d8e339
Updated translations
2012-10-24 06:21:39 +13:00
TeamCity
f8fcb1e35d
Updated translations
2012-10-23 21:11:58 +13:00
TeamCity
e1f32a48ad
Updated translations master
2012-10-23 21:06:15 +13:00
TeamCity
a97ba7168d
Merge remote branch 'origin/master' into translation-staging
2012-10-23 21:05:50 +13:00
Will Rossiter
1692a1023d
Merge pull request #890 from adrexia/7956-remove-files-subnav
...
Remove sub navigation for "Files" (fixes 7956)
2012-10-22 23:19:56 -07:00
TeamCity
60f94d774c
Merge remote branch 'origin/master' into translation-staging
2012-10-23 18:57:14 +13:00
Simon Welsh
bedb579b07
Merge branch '3.0'
2012-10-23 15:21:20 +13:00
Simon Welsh
29c2fec977
Changes flush and build URLs for tutorials.
2012-10-23 13:38:53 +13:00
Naomi Guyer
84851c96a7
Remove sub navigation for "Files" (fixes 7956)
2012-10-23 09:55:08 +13:00
Sam Minnée
1b1f645157
Merge pull request #885 from Martimiz/3.0-DocUploadField
...
ENHANCEMENT - UploadField documentation
2012-10-22 13:20:14 -07:00
martimiz
3b65b38826
UPDATE: replace subclassing with a DataExtension, add has_many warning
...
I replaced the subclassing example by one using a DataExtension. This
is the preferred way to add extra functionality to the Image class. You
can now add any existing image from the assets section instead of only
those belonging to the subclass.
Added a warning not to use has_many relations, because the UploadField
doesn't fully support them.
2012-10-22 12:28:18 +02:00
Will Rossiter
e62a5116da
Merge pull request #888 from adrexia/7940-right-title-fix
...
BUG: No indent on Right Title (fixes #7950 )
2012-10-17 21:51:55 -07:00
Naomi Guyer
9158dead67
BUG: No indent on rightTitle ( fixes #7950 )
...
Added margin and made non checkbox right title's match similar labels
used elsewhere.
2012-10-18 16:23:49 +13:00
Sean Harvey
f593002b03
Merge pull request #879 from tractorcow/3.0-test-fixes
...
BUG / API Fixes to test cases requiring code for consolidating newlines
2012-10-17 15:24:22 -07:00
Sean Harvey
713fe809bb
Merge pull request #883 from mateusz/schema-updating-flag
...
API Add the ability to query if the schema update is in progress.
2012-10-17 12:58:51 -07:00
Martimiz
38b0c672ec
Merge pull request #1 from Zauberfisch/patch-1
...
MINOR: fixed docs
2012-10-17 01:56:22 -07:00
TeamCity
fd82ba943d
Merge remote branch 'origin/master' into translation-staging
2012-10-17 20:15:06 +13:00
Ingo Schommer
ee3954d5d7
Merge pull request #884 from icecaster/master
...
Fix: scaffolded Enum dropdown field always returning empty string
2012-10-16 23:28:10 -07:00
TeamCity
7d7d2eb85e
Updated translations
2012-10-17 18:19:16 +13:00
