tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-06 11:29:27 +02:00
Code Issues Projects Releases Wiki Activity
12,304 Commits 29 Branches 517 Tags 147 MiB
455e550d9a
Commit Graph

12304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
455e550d9a Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/topics/testing/create-silverstripe-test.md
	forms/Form.php
	i18n/i18n.php
	model/Image.php
 2013-09-27 19:22:14 +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
Ingo Schommer
047e325e27 Merge pull request #2452 from chillu/pulls/escape-3.0 
Escaping 3.0
 2013-09-25 16:02:30 -07:00
Ingo Schommer
12a4a8c9dc Merge pull request #2430 from wilr/gridfieldactions 
Add how to for custom GridField row actions.
 2013-09-25 12:47:27 -07:00
Ingo Schommer
7da1340cbb Merge pull request #2454 from dangerdan/doc_corrections 
Don't think the syntax highlighter likes my indentation with spaces.
 2013-09-24 13:15:37 -07:00
Dan Brooks
6145e5914b Don't think the syntax highlighter likes my indentation with spaces. 2013-09-24 21:09:30 +01:00
Ingo Schommer
e1f9458db1 Added 3.0.7 changelog 2013-09-24 21:54:34 +02:00
Ingo Schommer
c243418597 API Escape form validation messages (SS-2013-008) 2013-09-24 21:54:31 +02:00
Ingo Schommer
2b7a2a289e API Escape form validation messages (SS-2013-008) 2013-09-24 21:41:21 +02:00
Ingo Schommer
f3ef04a432 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-24 21:41:21 +02:00
Ingo Schommer
78ce99be09 FIX Escape breadcrumbs in SecurityAdmin (SS-2013-007) 2013-09-24 21:41:18 +02:00
Ingo Schommer
114fb59107 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-24 21:40:17 +02:00
Sean Harvey
b383a07f90 BUG Fixing tabindex added to CreditCardField when tabindex is NULL 
The tabindex increment *should* only be done if there is a tabindex
that has been set on a CreditCardField already, otherwise it breaks
the tab ordering.
 2013-09-24 21:40:17 +02:00
Ingo Schommer
48021e9fd3 Merge pull request #2166 from dhensby/patch-2 
FormFields now allow setting of extra CSSClasses en masse
 2013-09-24 11:50:01 -07:00
Ingo Schommer
d291a96326 Merge pull request #2152 from dhensby/patch-1 
FIX Empty Datefield with defined min or max has non-object error thrown
 2013-09-24 11:48:05 -07:00
Ingo Schommer
3edbfa5b99 Merge pull request #2443 from dangerdan/doc_corrections 
Documentation corrections
 2013-09-24 11:45:53 -07:00
Dan Brooks
3e5f788ddc Squashing previous corrections into one commit along with a couple more 
corrections to the docs, including changing the example seen in
fixtures.md
 2013-09-24 19:21:04 +01:00
Sean Harvey
f8eaf81ae2 Merge branch '3.1.0' into 3.1 2013-09-23 17:13:09 +12:00
Sean Harvey
5b47c3aa1c Merge pull request #2445 from tractorcow/pulls/3.1.0-http-add_cache_headers-fix 
BUG Fix regression introduced in #2356 (method call on non-object)
 2013-09-22 18:53:06 -07:00
Damian Mooyman
477c3c9de6 BUG Fix regression introduced in #2356 (method call on non-object) 2013-09-23 13:32:55 +12:00
Will Rossiter
981850890a Merge pull request #2442 from purplespider/patch-1 
Reverted incorrect CSS sprite location changes
 2013-09-21 14:28:03 -07:00
James Cocker
3e9c827603 Reverted incorrect CSS sprite location changes 
Reverted the sprite location, undoing the incorrect location that was added in 3a17e168cc, probably due to a local incorrect Compass setup.
 2013-09-21 14:22:46 +01:00
Will Rossiter
89cee10e0c Merge pull request #2439 from bhongong/patch-1 
Fix "cms-description-tooltip" reference in documentation example.
 2013-09-20 15:44:37 -07:00
bhongong
9fa8945f2a Fix "cms-description-tooltip" reference in code 
The instruction said to put "cms-description-tooltip" in the addExtraClass but in the sample code it is using "cms-help-tooltip"
 2013-09-20 21:12:59 +08:00
Ingo Schommer
5b3f8bc04d Merge pull request #2435 from hafriedlander/fix/join_links_query_params 
FIX Use last of duplicate query params in join_links
 2013-09-20 02:27:49 -07:00
Simon Welsh
4f7dc653d1 Merge pull request #2437 from hafriedlander/fix/restfulservice_proxies 
FIX Improve recent RestfulService fix for proxies
 2013-09-19 22:02:50 -07:00
Hamish Friedlander
b1f03db4ff FIX Improve recent RestfulService fix for proxies 2013-09-20 16:26:39 +12:00
Hamish Friedlander
5c82609802 Merge pull request #2436 from mateusz/restfulservice-headers 
BUG Do not rely on broken curl header size calculation.
 2013-09-19 20:28:03 -07:00
Mateusz Uzdowski
7ddd5b57c3 BUG Do not rely on broken curl header size calculation. 
Header parsing now takes into account situations like a proxy or
redirections. Works around the curl issue.

Also fixes the issue when a redirected request would cause a double
amount of headers coming out of the parser - it would merrily process
anything that's in key:value format even if it was two distinct headers.
 2013-09-20 15:02:40 +12:00
Ingo Schommer
2dd7baac16 Merge pull request #2434 from halkyon/cc_tabindex_fix_2 
BUG Fixing tabindex added to CreditCardField when tabindex is NULL
 2013-09-19 16:37:58 -07:00
Hamish Friedlander
a8c1dd7f53 FIX Use last of duplicate query params in join_links 
When using Controller::join_links to join two links with identical query
params, both query params would be used in the result, ending up with
links that look like `../edit/show/14?locale=en_NZ&locale=mi_NZ`

This patch eliminates duplicate query params, so only the last one
for any key is present in the output.
 2013-09-20 11:33:03 +12:00