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,361 Commits 31 Branches 527 Tags 162 MiB
763aa2fbf6
Commit Graph

12361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ingo Schommer
f18ece11ca Revert "Fixes silverstripe/silverstripe-framework#1910: shortcodes not parsed in RSS feeds" 
This reverts commit 306281ed44.
Breaks HTMLTextTest
 2013-09-30 22:40:47 +02:00
Ingo Schommer
b291f3d0cd Merge pull request #2446 from jamesgoodmandia/rss-feed-placeholders 
Fixes silverstripe/silverstripe-framework#1910: shortcodes not parsed in...
 2013-09-30 13:01:19 -07:00
Daniel Hensby
6c943007a1 removeRequiredField() limits field (fixes #2165) 
Added tests to RequiredFields and fixed bugs that were found

Now you:
1. Can't add the same field name many times
2. Can use append RequiredFields correctly without fear of duplicates

I've also added a Deprecation warning to $useLabels as it's not used
*anywhere* in framework
 2013-09-27 19:58:59 +02:00
Ingo Schommer
d3aa38f4b4 $.data() for GridField autocomplete (fixes #2440) 2013-09-27 19:51:32 +02:00
Ingo Schommer
0ea7042443 $privileged_permissions visibility (fixes #2464) 2013-09-27 18:56:38 +02:00
Ingo Schommer
e53f03cd94 Merge remote-tracking branch 'origin/3.1.0' into 3.1 
Conflicts:
	docs/en/changelogs/rc/3.1.0-rc3.md
 2013-09-27 18:52:37 +02:00
Ingo Schommer
2e3511bc5f Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	docs/en/changelogs/3.0.6.md
	forms/Form.php
	forms/FormField.php
	forms/TreeDropdownField.php
 2013-09-27 18:50:47 +02:00
Will Rossiter
8c958cd5fb Merge pull request #2460 from ajshort/long-cms-titles 
Fix the display of long CMS menu item titles.
 2013-09-27 01:28:55 -07:00
Will Rossiter
84cedcda44 Merge pull request #2462 from ajshort/has-many-list-foreign-getter 
Add a getter for the HasManyList foreign key.
 2013-09-26 23:06:46 -07:00
Will Rossiter
17b649c6b8 Merge pull request #2463 from ajshort/extend-batch-actions-form 
Add an extension hook for the batch actions form.
 2013-09-26 23:05:31 -07:00
Andrew Short
9e984b8c99 Add an extension hook for the batch actions form. 2013-09-27 15:46:01 +10:00
Andrew Short
43fab1088a Add a getter for the HasManyList foreign key. 2013-09-27 15:06:55 +10:00
Simon Welsh
1a4b812cbb Merge pull request #2461 from unclecheese/patch-1 
BUGFIX: Without casting TreeTitle as HTMLText, unescape HTML appears in ...
 2013-09-26 19:59:41 -07:00
unclecheese
b1ad10a42b BUGFIX: Without casting TreeTitle as HTMLText, unescape HTML appears in TreeDropdownField 2013-09-27 14:46:17 +12:00
Ingo Schommer
d963eac0a6 Merge tag '3.0.6' into 3.0 2013-09-27 00:20:08 +02:00
Andrew Short
cd9a4f9b3f Fix the display of long CMS menu item titles. 2013-09-26 22:24:59 +10:00
Ingo Schommer
652682c048 3.0.6 changelog 2013-09-26 11:33:42 +02:00
Ingo Schommer
237ed5c516 Improved 3.1 changelog 2013-09-26 10:33:16 +02:00
Sean Harvey
9b1211f071 Merge pull request #2459 from moveforward/patch-1 
Fixed typo
 2013-09-25 19:43:05 -07:00
moveforward
dd0296413f Fixed typo 2013-09-26 14:41:40 +12:00
Ingo Schommer
cbaa91ebd7 Tagged 3.1.0-rc3 2013-09-26 01:42:31 +02:00
Ingo Schommer
b3c91ecac9 Added 3.1.0-rc3 changelog 2013-09-26 01:42:27 +02:00
Ingo Schommer
ffb316dbc9 Added 3.0.7-rc1 changelog 2013-09-26 01:32:41 +02:00
Ingo Schommer
debd81d380 Merge pull request #2453 from chillu/pulls/escape-3.1.0 
Escaping 3.1
 2013-09-25 16:02:45 -07:00