Commit Graph

13211 Commits

Author SHA1 Message Date
Ingo Schommer
36d8a9f62d Chinese translation encoding 2013-10-08 12:20:10 +02:00
Ingo Schommer
93558a6d62 Globalization in TreeDropdownField JS 2013-10-08 12:12:25 +02:00
Ingo Schommer
9288bdc5ea Updated Te Reo translations 2013-10-08 11:37:11 +02:00
Ingo Schommer
62fa2739e6 Merge remote-tracking branch 'origin/3.1' 2013-10-08 11:22:04 +02:00
Ingo Schommer
e489384eea Moved manage-files.feature to cms module 2013-10-08 11:21:36 +02:00
Ingo Schommer
d485faf0c9 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	forms/Form.php
2013-10-08 11:17:06 +02:00
Ingo Schommer
aa6ca49651 Merge pull request #2493 from kinglozzer/2449-form-validation-exemptions
NEW: Allow setting of specific form actions that do not require validation on CMSForm
2013-10-08 01:51:11 -07:00
Ingo Schommer
8d5209aef6 Migrated page-specific behat features to cms module 2013-10-08 00:24:05 +02:00
Ingo Schommer
6a665b4ca2 Behat jQuery reference 2013-10-07 23:44:13 +02:00
Ingo Schommer
7542a205f6 Merge pull request #2504 from chillu/travis-behat-test
Travis behat tests
2013-10-07 14:15:57 -07:00
Ingo Schommer
cd8eb646a7 Skip @assets and @todo in Travis behat 2013-10-07 22:55:24 +02:00
Ingo Schommer
a2cfe6e7ea Updated 3.1.1 changelog 2013-10-07 20:50:39 +02:00
Ingo Schommer
6e8ec778c3 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	lang/en.yml
2013-10-07 16:19:40 +02:00
Ingo Schommer
795d3e4b3b Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	dev/install/install.php5
	docs/en/index.md
	tests/core/CoreTest.php
2013-10-07 16:18:20 +02:00
Ingo Schommer
9824168b45 Removed link to non-functional dokuwiki install 2013-10-07 16:17:21 +02:00
Ingo Schommer
11fd15c87d Added 3.1.2 changelog 2013-10-07 15:21:56 +02:00
Ingo Schommer
0e5524af44 Merge remote-tracking branch 'origin/tmp-3.1.0' into 3.1
Conflicts:
	docs/en/changelogs/3.1.1.md
	tests/behat/features/profile.feature
2013-10-07 15:19:07 +02:00
Ingo Schommer
d3b5b11942 Added 3.1.1 changelog 2013-10-07 14:57:56 +02:00
Ingo Schommer
e4c2d64877 Updated translations 2013-10-07 14:28:02 +02:00
colymba
75f2b17f30 FIX gridfield delete alert selector specificity 2013-10-07 14:24:16 +03:00
Andrew Short
4f428497dd Merge pull request #2500 from halkyon/doc_updates
Updating unit and integration testing documentation.
2013-10-06 18:28:05 -07:00
Ingo Schommer
548d784397 Added 3.1.1 changelog 2013-10-07 02:02:01 +02:00
Ingo Schommer
e4adff48bc Added 3.0.8 changelog 2013-10-07 01:31:28 +02:00
Ingo Schommer
afc81fe7af Updated translations 2013-10-07 01:18:00 +02:00
Ingo Schommer
7f0e589bf5 Behat test for language switching 2013-10-07 00:04:50 +02:00
Ingo Schommer
bead05acba More mappings for i18n::tinymce_lang 2013-10-06 23:50:20 +02:00
Ingo Schommer
dc7e2df20a Corrected translation references in templates
Were using old entity naming scheme (*.ss) instead
of underscored version which doesn't create a new YML
namespace. This means all existing translations should indeed be used.
Was already fixed in master, but not in 3.1
2013-10-06 23:25:47 +02:00
Sean Harvey
2aba81321a Merge pull request #2488 from tractorcow/pulls/3.0-platform-compatibility
BUG 3.0 Fixed cross-platform issues with test cases and file utility
2013-10-06 13:16:09 -07:00
Ingo Schommer
18eb9718f3 Merge branch 'refs/heads/3.1.0' into 3.1 2013-10-06 20:06:20 +02:00
Ingo Schommer
ba360497aa Updated translations 2013-10-06 19:58:08 +02:00
Ingo Schommer
60fc7e5346 Merge remote-tracking branch 'origin/3.1' 2013-10-06 19:07:39 +02:00
Ingo Schommer
6f8ff5cafe Merge branch 'refs/heads/3.1.0' into 3.1 2013-10-06 19:06:53 +02:00
Ingo Schommer
487de0bf5a Renamed "ja_JP" locale to "ja"
Better compat with transifex with generic locale
2013-10-06 19:06:07 +02:00
Ju
e49d247fba fixed wrong ID output for many_many and has_many relations 2013-10-06 17:36:31 +02:00
madmatt
951152e1c6 Update datamodel.md to use an array argument to Enum instead of the more error-prone string
The previous argument to the Enum was: 
"Status" => "Enum('Active, Injured, Retired')"

This would cause issues where the 'Injured' and 'Retired' statuses would actually be stored in the database as ' Injured' and ' Retired' respectively, at least in 3.0.

Using an array() to specify the enum, and using normal array syntax (albeit within a string) is less likely to cause errors.
2013-10-05 00:53:08 +13:00
Loz Calver
3172c7732e Allow setting of specific form actions that do not require validation
Move validation exemptions into CMSForm

Also fix buttonClicked() to skip CompositeField

Whitespace

Adding unit tests
2013-10-04 10:30:20 +01:00
Ingo Schommer
902c8db859 FAQ docs about composer install vs. archives
See http://www.silverstripe.org/installing-silverstripe/show/21447?start=8#post324638
2013-10-04 11:21:04 +02:00
Sam Minnee
00d1c3f0e9 Proof-of-concept of running Firefox Behat in Travis-CI 2013-10-04 16:48:34 +13:00
Sean Harvey
0e5eb54fb5 Updating unit and integration testing documentation.
Updating introduction summary, and fixing broken links.
2013-10-04 14:29:14 +13:00
Damian Mooyman
f67b549b77 BUG Fixed cross-platform issues with test cases and file utilities 2013-10-04 13:54:33 +13:00
Ingo Schommer
dcf9f2c133 Merge pull request #2311 from unclecheese/patch-12
API Change: Make GridFieldConfig objects decoratable
2013-10-03 16:46:13 -07:00
Ingo Schommer
1a002b7bbf Merge pull request #2487 from halkyon/installer_error_check_30
BUG Fixing installer not checking display_errors correctly.
2013-10-03 16:41:50 -07:00
Sean Harvey
5e5a2f8845 Merge pull request #2288 from chillu/pulls/browser-spellcheck
API Disable discontinued Google Spellcheck in TinyMCE (#2213)
2013-10-03 14:42:45 -07:00
Sean Harvey
8b2e1f2e7c Merge pull request #2328 from chillu/pulls/versioned-archivemode-validation
Validate 'archiveDate' user data in Versioned
2013-10-03 14:33:22 -07:00
Sean Harvey
38e4070ff7 Merge pull request #2477 from tractorcow/pulls/3.1-sqlquery-sort-order
BUG Sort column order maintained correctly when using expressions
2013-10-03 14:27:38 -07:00
Sean Harvey
40ba269b1d Merge pull request #2472 from tractorcow/pulls/3.2-platform-compatibility
BUG 3.2 Fixed cross-platform issues with test cases and file utility
2013-10-03 14:14:43 -07:00
Sean Harvey
f3c713668a Merge pull request #2478 from tractorcow/pulls/3.1-platform-compatibility
BUG 3.1 Fixed cross-platform issues with test cases and file utilities
2013-10-03 14:14:12 -07:00
Sean Harvey
dd49834b9e BUG Fixing installer not checking display_errors correctly.
Fixes issue #2479. Installer sets display_errors on, but it checks
the changed value and not the original one set in php.ini.
2013-10-04 10:05:28 +13:00
Tom Densham
37e032df86 API: Change CreditCardField to use AttributeHTML 2013-10-03 15:26:31 +01:00
Andrew Short
deb1bfbcba Fix Versioned::augmentSQL() when the data query was null. 2013-10-04 00:04:55 +10:00