Commit Graph

12925 Commits

Author SHA1 Message Date
Daniel Hensby
5e6c1b902b Making Director::test() ignore URL Anchors
Anchors should never make it to the server when they are in the browser URL bar, however tests are slightly different and some `Link()` functions may return a URL anchor. Instead of every test checking a link and stripping the anchor, I feel the Director::test() function should strip them off.
2014-02-26 12:04:47 +00:00
Will Rossiter
7cbd7edfb7 Merge pull request #2888 from willmorgan/patch-2
Removing broken reference to "getNextID()"
2014-02-22 09:15:15 +13:00
Will Morgan
6e0a65f293 Removing broken reference to "getNextID()"
It doesn't exist.
2014-02-21 15:24:01 +00:00
Ingo Schommer
d6da92edeb Merge pull request #2881 from sminnee/fix-forum-templates
FIX: Fixed regression in ContentController template selection.
2014-02-20 23:02:40 +13:00
Sam Minnee
f6b72a2091 FIX: Fixed regression in ContentController template selection.
47582b3e3c improved
template selection, but has introduced a regression.  Specifically, it applies to contorllers that are
created by making a direct subclass of Page_Controller (a pattern used in a few modules to make a page
that looks like a CMS page but doesn't appear in the sitetree).  Previously Page.ss would be used as a
template, because when Page_Controller was interrogated in the template stack, the strtok(Page_Controller,_)
was called before looking up the template.

The code was refactored to use SSViewer::get_templates_by_class(), which doesn't do this.  This function
is used by LeftAndMain as well, so rather than re-add the strtok() call, which might cause unintended
side-effects, I've instead just have it ignore _controller in a classname.  Strictly speaking, this is
an API change, but as long as people have followed page type class naming conventions, it will still
work in the relevant cases.
2014-02-20 18:14:46 +13:00
Ingo Schommer
d8361f9d3f Merge remote-tracking branch 'origin/3.1' 2014-02-18 22:06:59 +13:00
Ingo Schommer
1930add745 Note about SiteTree.ExtraMeta in security docs 2014-02-18 16:07:50 +13:00
Ingo Schommer
9b57609fcd Merge pull request #2853 from hafriedlander/feature/htmltext_whitelist
NEW Allow specifying element whitelist in HTMLText fields
2014-02-18 15:38:30 +13:00
Hamish Friedlander
d6630d240a NEW Allow specifying element whitelist in HTMLText fields 2014-02-18 14:02:04 +13:00
Ingo Schommer
a101d4edb3 Updated translations 2014-02-18 11:49:55 +13:00
Ingo Schommer
53a699527e Preliminary 3.1.3 changelog 2014-02-18 11:44:08 +13:00
Sean Harvey
30e3904e4c Merge pull request #2845 from kinglozzer/1429-summary-searchable-fields
FIX: searchable_fields inheritance from summary_fields includes methods called on fields (fixes #1429)
2014-02-17 15:14:54 +13:00
Sean Harvey
03f14565b5 Merge pull request #2841 from chillu/pulls/dateformat-simplified
API Default to "yyyy-MM-dd" for date format
2014-02-17 14:05:39 +13:00
Sean Harvey
3b9d49e32d Merge pull request #2852 from stojg/director-test-http-port
BUG: Director::test() don't respect port settings in $_FILE_TO_URL_MAPPING
2014-02-17 13:55:53 +13:00
Stig Lindqvist
0077e25352 BUG: Director::test() don't respect port settings in $_FILE_TO_URL_MAPPING
Director::test() don't set the HTTP_HOST with the port number if that has been set.
Later call to Director::makeRelative() will return wrong value because of the strict string matching
(http://localhost/ != http://localhost:8000)

This bug affects all modules that are using Director::test in CLI where the $_FILE_TO_URL_MAPPING
have been set to use a domain with a port in it, i.e. static publishers.
2014-02-17 11:54:10 +13:00
Ingo Schommer
a9e81a08db Updated master language file 2014-02-17 00:17:39 +13:00
Ingo Schommer
f63a78c0b9 Fixed Filesystem class capitalization 2014-02-17 00:12:26 +13:00
Ingo Schommer
6906c9bd1a API Removed auto-detection for i18n date/time formats
Default to "yyyy-MM-dd" for date format, and "H:mm" for time_format.
Switched to config API for setting/getting values.

Avoid using "MMM" in particular, since it causes
inconsistencies in month names between jQuery UI and Zend_Locale_Format.

Fixes https://github.com/silverstripe/silverstripe-cms/issues/544
2014-02-16 23:57:49 +13:00
Loz Calver
a91a4bbdc2 FIX: Searchable fields with dot notation can be inherited from summary_fields (fixes #1429) 2014-02-14 21:52:47 +00:00
Will Rossiter
5ec6cacf60 Merge pull request #2848 from nedmas/patch-2
Requirement documentation of MySQL driver
2014-02-15 08:44:33 +13:00
Tom Densham
8b3d74ed0f FIX Requirement documentation of MySQL driver
Currently the documentation states that the `mysql` module for PHP is required, however as of #84 (over 2 years ago) this is no longer the case and the required module is now `mysqli`.
2014-02-14 13:29:54 +00:00
Sam Minnee
346d3edb37 Merge branch '3.1' 2014-02-13 17:58:30 +13:00
Sam Minnee
4f7c6ebcff FIX: Fixed behat text selection rule, which broke some tests.
The behat rule for text selection wasn't working due to the JavaScript not executing properly. I have
also updated the code to traverse all childNodes, which is important if you have text like this:

<p>text1 <b>text2</b> text3</p>

And you are trying to select 'text3'
2014-02-13 17:36:46 +13:00
Hamish Friedlander
a0b21d7433 Merge pull request #2844 from chillu/pulls/security-mailinglist-docs
Documented security pre announce mailinglist
2014-02-12 15:32:24 +13:00
Ingo Schommer
5e29249593 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	search/filters/PartialMatchFilter.php
2014-02-12 15:18:27 +13:00
Ingo Schommer
3f9bd383d4 Removed SWFUpload, no longer used 2014-02-12 15:11:46 +13:00
Hamish Friedlander
82f65fded4 FIX Dont pop up basic auth dialog when trying to flush and isDev=1, just redirect to Security/login like normal 2014-02-12 14:51:33 +13:00
Ingo Schommer
1121603da9 Documented security pre announce mailinglist
See https://groups.google.com/forum/#!topic/silverstripe-dev/0mjNBaSP8vE
for details
2014-02-12 14:37:47 +13:00
Sean Harvey
9048eab4a2 Merge branch '3.1' 2014-02-12 11:06:54 +13:00
Ingo Schommer
5e38ef9e55 Merge pull request #2835 from kinglozzer/1891-csrf-friendly-error
NEW: Forms with invalid/expired SecurityIDs are repopulated (fixes #1891)
2014-02-12 09:44:03 +13:00
Andrew Short
b9ee4c4360 Merge pull request #2840 from yearofthegus/document-datetime
Fixed and documented SS_Datetime methods that returned date and/or time
2014-02-11 10:38:41 +11:00
Gus King
dad10b99f4 Fixed and documented SS_Datetime methods that returned formatted date/times. 2014-02-10 17:57:30 -05:00
Sean Harvey
e9f3073fc9 Merge pull request #2837 from chillu/pulls/2836-upload-filename-filter
Use filtered file paths in upload (fixes #2836)
2014-02-10 14:48:10 +13:00
Sean Harvey
c322cb2d65 Fixing SQLQueryTest failures on PHPUnit 3.7.30 2014-02-10 13:32:39 +13:00
Sean Harvey
51a936345a Merge pull request #2839 from tractorcow/pulls/3.1-fieldgroup-description
BUG Fix missing Description element on FieldGroup_holder.ss
2014-02-10 10:50:25 +13:00
Damian Mooyman
1c7af2fd04 BUG Fix missing description element on FieldGroup_holder.ss 2014-02-10 10:38:00 +13:00
Loz Calver
058219c0ee NEW: Forms with invalid/expired SecurityIDs are repopulated (fixes #1891) 2014-02-09 10:19:24 +00:00
Ingo Schommer
0f1ae75dd8 Correct JS i18n in UploadField (fixes #2370) 2014-02-09 20:43:08 +13:00
Ingo Schommer
74a010184e Merge pull request #2834 from mattkirwan/patch-1
Updated add-on URL.
2014-02-09 19:54:05 +13:00
Ingo Schommer
3d24079d15 Use filtered file paths in upload (fixes #2836) 2014-02-09 19:24:09 +13:00
Matt Kirwan
7b1f1a5e4d Updated add-on URL. 2014-02-07 15:48:34 +00:00
Ingo Schommer
caaf286767 Merge pull request #2821 from silverstripe-rebelalliance/rfc4180
BUG: Fixed out of date RFC 4180 URL
2014-02-07 17:51:03 +13:00
Ingo Schommer
27449c4545 cs_CZ transliteration chars (fixes #2816) 2014-02-07 17:43:41 +13:00
Ingo Schommer
71f6f8afc9 Injector updateSpec() instanciation (fixes #2829) 2014-02-07 17:00:27 +13:00
Ingo Schommer
4af9143d3b Merge remote-tracking branch 'origin/3.1'
Conflicts:
	docs/en/misc/contributing/code.md
2014-02-07 16:43:22 +13:00
Ingo Schommer
db07a8e1df Fix $disable_themes test state
Wasn't resetting the value after using it
2014-02-07 16:38:41 +13:00
Ingo Schommer
1e2a2ca969 Merge pull request #2831 from silverstripe-rebelalliance/fixingURLs
NEW: Updating out of date URLs in the framework source code and docs
2014-02-07 16:16:24 +13:00
Ingo Schommer
0e9868adfe Merge pull request #2832 from mateusz/behat-permissions
Behat permissions
2014-02-07 16:16:01 +13:00
madmatt
267786a7d1 Add behat test for security permission checkboxes. 2014-02-07 15:41:33 +13:00
Mateusz Uzdowski
e91f10b0ab Add Behat step to click on a row in the first GridField table. 2014-02-07 15:40:06 +13:00