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
12,285 Commits 31 Branches 527 Tags 162 MiB
a1a402224f
Commit Graph

12285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ingo Schommer
bb7c973e34 Merge pull request #2468 from nedmas/make-creditcardfield-use-template 
FIX: Make CreditCardField use template
 2013-10-03 03:22:06 -07:00
Tom Densham
d79d50770c FIX: Make CreditCardField use template 2013-10-03 10:51:39 +01:00
Damian Mooyman
4a0f9d5b7b BUG Issue with login form failing to login in certain situations. Fixes issue #2424 2013-10-03 10:16:31 +02:00
Ingo Schommer
5067a3dcd4 Merge pull request #2480 from tractorcow/pulls/3.1-dologin-security-fix 
BUG Issue with login form failing to login in certain situations. Fixes ...
 2013-10-03 01:15:25 -07:00
Damian Mooyman
5bbea12b45 BUG Issue with login form failing to login in certain situations. Fixes issue #2424 2013-10-03 17:12:30 +13:00
Damian Mooyman
4b850fb41c BUG Fixed cross-platform issues with test cases and file utilities 2013-10-03 14:49:18 +13:00
Damian Mooyman
afaf7f6b4e BUG Sort column order maintained correctly when using expressions in SQLQuery and DataQuery 2013-10-03 14:20:31 +13:00
Ingo Schommer
6e72262c96 Merge pull request #2476 from kinglozzer/treedropdownfield-undefined-var 
FIX: Undefined variable in TreeDropdownField.php
 2013-10-02 08:19:35 -07:00
Loz Calver
9b0564b7d6 FIX: Undefined variable in TreeDropdownField.php 
I'm guessing this was just a simple typo. Checked this by searching on SiteTree, behaves as expected after this change.
 2013-10-02 15:41:39 +01:00
Ingo Schommer
837304b81b Query param support in TreeMultiselectField (fixes #2438) 
Thanks to @bummzack for the initial fix
 2013-10-02 15:42:29 +02:00
Ingo Schommer
37ada61282 Merge pull request #2448 from g4b0/content-negotiator-object 
BUGFIX: added <param> tag to ContentNegotiator filtering
 2013-10-02 06:22:37 -07:00
Ingo Schommer
6ce97b959e Merge pull request #2037 from kinglozzer/feature-disable-treemultiselect-nodes 
FEATURE: Disable specific tree nodes in TreeDropdownField
 2013-10-02 05:09:36 -07:00
Loz Calver
6b3b61873a FEATURE: Disable specific tree nodes in TreeDropdownField 
DO NOT MERGE: to be reviewed.

This feature request was born out of wanting the ability to disable (for example) a top level page from being selected, while still being able to select a child page. Using setFilterFunction() simply removes the node and its children.

Extra styling for disabled nodes

Disable ability to select a disabled node for TreeDropdownField

Disable hover CSS changes

Fixing merge conflict during rebase

Return a boolean for nodeIsDisabled()
 2013-10-02 12:53:23 +01:00
Ingo Schommer
8c9563b99d Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-10-02 12:21:44 +02:00
Ingo Schommer
a534b7c784 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-02 12:21:35 +02:00
Ingo Schommer
06b5f142b6 Increased CacheTest time delay, avoid flickering tests 
Setting a cache lifetime of half a second seems to be
unreliable on Travis when just waiting a second,
so let's wait a bit longer.
 2013-10-02 12:13:22 +02:00
unclecheese
5c376a4a4a BUGFIX: Without casting TreeTitle as HTMLText, unescape HTML appears in TreeDropdownField 2013-10-02 11:49:19 +02:00
Ingo Schommer
e7953f3b41 Merge pull request #2474 from wilr/externalcmslink 
API: Add attributes argument for CMSMenuItem for external links
 2013-10-02 02:38:56 -07:00
Ingo Schommer
26ef1c1830 Merge pull request #2473 from ajshort/pull-1 
Fix test relying on specific member title format.
 2013-10-02 02:37:16 -07:00
Will Rossiter
2d0a354405 API: Add attributes argument for CMSMenuItem. 
Currently help menu item is the only external link in the CMS and the ability for it to work is hardcoded in the template. This request makes the target attribute definable by CMSMenu::add_link().

Adds documentation for how to add a basic external link to the CMS.
 2013-10-02 19:06:54 +13:00
Andrew Short
c26c9e641a Fix test relying on specific member title format. 
If a custom member title format was used, the test would fail as it
only expected the default member title format.
 2013-10-02 15:16:33 +10:00
Nicolaas
5af97aa885 more meaningful error message in ConfigStaticManifest.php (depth < 0) 
Changed error from: Fatal error: Hmm - depth calc wrong, hit negatives in /var/www/tangoio.maori.nz/framework/core/manifest/ConfigStaticManifest.php on line 242 

... to .... 


Fatal error: Hmm - depth calc wrong, hit negatives, see: /var/www/mysite.maori.nz/mymodule/code/MyClass.php in /var/www/mysite.maori.nz/framework/core/manifest/ConfigStaticManifest.php on line 240

The first error is completely meaningless and impossible to debug...
 2013-09-30 16:02:11 -10:00
Sean Harvey
92e98f0adb Removing "Unreleased" text from changelog. 2013-10-01 13:47:06 +13:00
Ingo Schommer
9709a5cd8c Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-10-01 01:45:27 +02:00
Ingo Schommer
6de517bf72 3.0.7 changelog 2013-10-01 00:26:11 +02:00
Ingo Schommer
304e5d192e Minor changelog fixes 2013-10-01 00:22:53 +02:00
Ingo Schommer
98d676bfdc Updated translations 2013-10-01 00:04:58 +02:00
Ingo Schommer
deadc154ca Don't link record in GridField form message 
This is no longer allows through Form->sessionMessage() to avoid XSS.
 2013-10-01 00:00:37 +02:00
Ingo Schommer
bda56eb9b0 Don't link record in GridField form message 
This is no longer allows through Form->sessionMessage() to avoid XSS.
 2013-09-30 23:55:32 +02:00
Ingo Schommer
21c226a5d2 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-09-30 23:44:12 +02:00
Ingo Schommer
2c8d8767b0 Merge branch '3.1.0' into 3.1 2013-09-30 23:43:21 +02:00
Ingo Schommer
a68e0ba365 Check for jQuery in Behat tests 
Identified as one potential cause for flickering tests
on our own Selenium box.
 2013-09-30 23:36:46 +02:00
Ingo Schommer
298de5a67d FIX Escape breadcrumbs in SecurityAdmin (SS-2013-007) 2013-09-30 22:53:43 +02:00
Ingo Schommer
d8d07d971e FIX Auto-escape titles in TreeDropdownField 
Related to SS-2013-009. While the default "TreeTitle" was escaped
within the SiteTree->TreeTitle() getter, other properties like SiteTree->Title
weren't escaped. The new logic uses the underlying casting helpers
on the processed objects.
 2013-09-30 22:53:21 +02:00
Ingo Schommer
a338e608b8 API Escape form validation messages (SS-2013-008) 2013-09-30 22:53:07 +02:00