Normann Lou
|
99e45e48c3
|
merge to 2.0_inform changeset 31642, 32399, 32478, 32480
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45384 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-22 02:17:16 +00:00 |
|
Normann Lou
|
378fc8a4ab
|
merge changest 35230
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45249 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-20 23:54:13 +00:00 |
|
Normann Lou
|
1ebefd7eff
|
merge changest 35230
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45248 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-20 23:53:53 +00:00 |
|
Normann Lou
|
8a143aaf9a
|
fix bug that cos translations lost on the way of switch between lang files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45225 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-20 22:10:49 +00:00 |
|
Sam Minnee
|
0c04f14f37
|
Fixed Versioned::get_latest_version when called on live site (parents upgrade issue)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45104 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 04:50:09 +00:00 |
|
Sam Minnee
|
0d5b5b36de
|
Fixed ->Groups()->setByCheckboxSetField for situation when nothing is checked (parents upgrade issue)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45103 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 04:49:43 +00:00 |
|
Sam Minnee
|
ef5aabf666
|
Versioned::get_version() didn't work if you were on the live site
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45079 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 03:15:11 +00:00 |
|
Sam Minnee
|
d80432972d
|
Session class updates with the changes, rather than completely overwriting. This makes it easier for legacy apps to access directly.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45077 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 03:12:29 +00:00 |
|
Sam Minnee
|
1eb087eade
|
If the credit card field is completely blank, then it's not invalid. Required-fields should be used to check for values
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45076 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 03:11:38 +00:00 |
|
Sam Minnee
|
c5bce8347c
|
parents-merge 43781 Ensure that Director::isTest/Live/Dev work in cli-script.php calls, #prnt:54 - Weekly Hot Tips didn't get sent.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45066 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 02:10:09 +00:00 |
|
Sam Minnee
|
cc97834409
|
parents-merge 41566 - Updated required validator to not allow a sequence of whitespace as a value
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45062 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 02:05:56 +00:00 |
|
Sam Minnee
|
202b7fd9b6
|
parents-merge 41017 - Added Text::LimitSentences
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45060 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 02:03:30 +00:00 |
|
Sam Minnee
|
528fb572fe
|
parents-merge 40044 - add resetData() function so that the payment can be reset and used the 'real' data after a order form submitted.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45059 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 02:02:25 +00:00 |
|
Sam Minnee
|
4a65391d09
|
parent-merge 36589 - Added check for default country for GeoIP.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45058 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 01:55:44 +00:00 |
|
Sam Minnee
|
2881bf34a4
|
parent-merge 36587 - Added check for default country for GeoIP.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45057 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 01:55:00 +00:00 |
|
Sam Minnee
|
a364c30540
|
parent-merge 36583 - Added check for default country for GeoIP.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45056 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 01:54:15 +00:00 |
|
Sam Minnee
|
3acdeb2441
|
parents-merge 36165 - Added javascript option Form.bypassValidation, which can be set to true in a button's onclick handler
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45055 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 01:52:13 +00:00 |
|
Sam Minnee
|
98fdd637ad
|
parents-merge 36164 - Added FieldGroup->subfieldParam option, defaulting to SmallFieldHolder
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45054 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 01:51:32 +00:00 |
|
Sam Minnee
|
be3ed220ac
|
parents-merge 35035 - Form::loadDataFrom() didn't like fields called 'Name'
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45050 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 01:27:35 +00:00 |
|
Sam Minnee
|
0b68356854
|
parents-merge 35012 - Form::loadDataFrom() didn't like fields called 'Name'
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45049 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 01:26:49 +00:00 |
|
Sam Minnee
|
a26099f6f5
|
parents-merge 34566 - Moved Level() from ContentController to SiteTree so that it can be accessed from anywhere
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45047 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 01:25:21 +00:00 |
|
Sam Minnee
|
afbca3a88f
|
parents-merge 33211 - Added getReportField & filter_onchange options to DataReports
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45045 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 01:21:44 +00:00 |
|
Sam Minnee
|
8547c5c333
|
parents-merge 33148 - Fixed decimal saving
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45040 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 01:15:05 +00:00 |
|
Sam Minnee
|
f246e4fbe2
|
parents-merge 33138 - Added IsEmail boolean to email templates
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45039 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 01:14:10 +00:00 |
|
Sam Minnee
|
5d6a4df183
|
parents-merge 33066 - Improved support for decimal/currency saving
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45038 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 01:12:35 +00:00 |
|
Sam Minnee
|
ae388c7d54
|
parents-merge: 32931
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@45037 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-19 01:09:01 +00:00 |
|
Andrew O'Neil
|
3c484557b0
|
Fixed typo (merged from branches/2.2.0, r44892)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44918 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:41:44 +00:00 |
|
Andrew O'Neil
|
104291466b
|
#1808 - Wrong CSS in TableListField.css (merged from branches/2.2.0, r44891)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44917 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:41:14 +00:00 |
|
Andrew O'Neil
|
329567c3fb
|
#1589 - Database Classes contains debug flags (merged from branches/2.2.0, r44883)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44916 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:40:48 +00:00 |
|
Andrew O'Neil
|
85d6566e32
|
#1730 - Caching in RestfulService (merged from branches/2.2.0, r44881)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44915 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:40:36 +00:00 |
|
Andrew O'Neil
|
b5098645fc
|
Renamed Sitemap controller to GoogleSitemap, to prevent it from clobbering developers' own classes called Sitemap (merged from branches/2.2.0, r44870)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44913 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:40:20 +00:00 |
|
Andrew O'Neil
|
87a4a1fcce
|
Error check on homepage redirector (merged from branches/2.2.0, r44869)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44905 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:35:02 +00:00 |
|
Andrew O'Neil
|
ff0cefe74a
|
Disable CRSF attack error message, as spambots causing this result in too many emails (merged from branches/2.2.0, r44857)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44904 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:34:34 +00:00 |
|
Andrew O'Neil
|
5a648fd31d
|
#1784 - Remove external links from sitemap (fixed a namespace warning) (merged from branches/2.2.0, r44848)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44903 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:34:03 +00:00 |
|
Andrew O'Neil
|
7acd5738be
|
the silverstripe-cache folder is now named according to the location of the silverstripe install, meaning that there are no clashes of permissions on shared servers (merged from branches/2.2.0, r44847)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44902 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:33:35 +00:00 |
|
Andrew O'Neil
|
f58a5c7992
|
#1784 - Remove external links from sitemap (merged from branches/2.2.0, r44846)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44901 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:32:52 +00:00 |
|
Andrew O'Neil
|
ce30a13130
|
#1755 - Can't upload any files using the 'Upload' tab on a folder in Files and Images section (merged from branches/2.2.0, r44824)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44900 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:31:57 +00:00 |
|
Andrew O'Neil
|
29c16511fe
|
SWFUpload works on linux if you have beta flash plugin (merged from branches/2.2.0, r44813)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44898 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:31:22 +00:00 |
|
Andrew O'Neil
|
9802f16afc
|
Revert r44795 (merged from branches/2.2.0, r44812)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44897 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:30:25 +00:00 |
|
Andrew O'Neil
|
8acb9a0f48
|
Update SWFUpload to 7.0-beta-3 (merged from branches/2.2.0, r44795)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44896 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:30:08 +00:00 |
|
Andrew O'Neil
|
c7415ad3d4
|
#1754 - Database upgrades problematic (merged from branches/2.2.0, r44770)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44895 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-15 22:29:10 +00:00 |
|
Romain Louis
|
c4ea119cd2
|
Alignement style changing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44767 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-13 23:07:54 +00:00 |
|
Romain Louis
|
28107f9904
|
font-size changing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44718 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-13 02:47:41 +00:00 |
|
Romain Louis
|
6889b6d7cf
|
Add bar in MemberTalbeField style changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44680 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-13 01:14:08 +00:00 |
|
Andrew O'Neil
|
1f1414a04a
|
#1723 - Export to CSV has semi-colons instead of commas
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44670 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-12 23:07:45 +00:00 |
|
Andrew O'Neil
|
4af3d215c5
|
#1670 - Commit translations into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44667 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-12 22:53:36 +00:00 |
|
Andrew O'Neil
|
dd71d6adad
|
Fixed open_basedir error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44665 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-12 22:26:34 +00:00 |
|
Romain Louis
|
e64e218bc7
|
IFrame height changes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44664 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-12 22:20:54 +00:00 |
|
Ingo Schommer
|
c1ee64a69a
|
fixed export-feature in MemberTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44625 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-12 03:27:13 +00:00 |
|
Andrew O'Neil
|
b636bf165a
|
#1705 - OpenID login details appearing in wrong place
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44621 467b73ca-7a2a-4603-9d3b-597d59a354a9
|
2007-11-12 02:58:27 +00:00 |
|