Commit Graph

13807 Commits

Author SHA1 Message Date
Nik
6141930f15 Copy SSViewer rewrite_hash_links regexp to SSTemplateParser
As this is meant to represent the same functionality in two different
areas, it should behave the same way in both.
2014-09-02 15:20:47 +12:00
Damian Mooyman
35fcb551d9 Refactor / Cleanup Versioned 2014-09-02 09:17:13 +12:00
Damian Mooyman
c140459ac6 BUG Fix versioned
Versioned is not writing Version to _version tables for subclasses of Version dataobjects which have their own DB fields
- Fix disjoint of ID / RecordID (which should be the same)
- Fix calculation of new record version
- Fix use of empty vs !isset to check for existing version
2014-09-02 09:14:08 +12:00
Ingo Schommer
26d7febe05 Merge pull request #3461 from NightJar/testfix
Fix some edgecase test issues
2014-09-02 08:52:56 +12:00
Nightjar
e4b563e596 Fixing the failure of some tests if the framework dir is named something other than 'framework' (which is a legitimate option) 2014-09-01 13:53:06 +01:00
Ingo Schommer
da61229221 Merge pull request #3430 from kinglozzer/pulls/retina
Add "retina" graphics for high-dpi screens
2014-09-01 23:09:40 +12:00
Will Rossiter
265a34141e GridFieldDeleteAction missing button text without icons
The text on the button is hidden from view via CSS already. This allows the button to have text in the event that the GridField does not provide icons (and likely is better for your screen readers).
2014-09-01 21:58:07 +12:00
Will Rossiter
3644110349 FIX: Ensure that columns are unique within a gridfield 2014-09-01 21:50:36 +12:00
Will Rossiter
0991477e5a Add support for directly saving into a File object
saveInto() assumed you were either saving into a hasOne or if you wanted to create a new object.

This made it impossible to have a FileField on an object that you wanted to upload to. This adds a check so that if the local object is a file, save to that.
2014-08-31 15:59:17 +12:00
Will Rossiter
4b6a03bb0b Fix deprecation warning with word_list 2014-08-31 15:59:16 +12:00
Simon Welsh
7bacaa8c6b Merge pull request #3453 from uniun/patch-1
RSS feed should be sent with charset=utf-8 header
2014-08-30 13:18:47 +10:00
Sean Harvey
98ab540aba Merge pull request #3454 from christopherdarling/patch-1
add .yml indentation
2014-08-29 21:57:04 +12:00
Christopher Darling
d993ea8cd0 add .yml indentation
added some extra rules for any _config/*.yml files so that they use 2 space indents.
2014-08-29 09:48:40 +01:00
Elvinas L.
64490129c2 RSS feed should be sent with charset=utf-8 header 2014-08-29 11:04:44 +03:00
Will Rossiter
7b0ae41916 Merge pull request #3452 from assertchris/add-editorconfig
Add editorconfig.
2014-08-29 15:32:25 +12:00
Christopher Pitt
e391ed5b91 Add editorconfig. 2014-08-29 10:28:05 +12:00
Simon Welsh
6fed1f6791 Merge pull request #3449 from camspiers/patch-2
Fix deprecation warnings in internal SQLQuery usage
2014-08-28 12:43:06 +10:00
Cam Spiers
298017c6d1 Fix deprecation warnings in internal SQLQuery usage 2014-08-28 14:26:17 +12:00
Loz Calver
5f653a00eb Add "retina" styles for high-dpi screens 2014-08-27 17:06:57 +01:00
Simon Welsh
935eabc1f9 Merge pull request #3436 from dnadesign/fixsortonrelations
FIX: Sorting a DataQuery over a relation.
2014-08-26 15:54:38 +10:00
Will Rossiter
7993875f16 FIX: Sorting a DataQuery over a relation.
When sorting a DataQuery over a relation, the SQLQuery automatically included the sort column. The issue with the implement is that potentially the joined record has a field with the same name as the source record causing it to be overridden.

In the attached test case, without the patch the title will be set to 'Bar' rather than 'Foo'.

This patch aliases the sort column. Alternativally a patch would be to
2014-08-26 17:41:38 +12:00
Sean Harvey
70dfc55d34 Minor correction to documentation 2014-08-26 14:55:45 +12:00
Damian Mooyman
e301279358 Merge pull request #3425 from halkyon/removing_deprecated2
Removing deprecated class/functions marked for deprecation in 3.0/3.1
2014-08-26 09:13:08 +12:00
Sean Harvey
89245ef443 Merge pull request #3433 from chillu/pulls/authenticate-backurl-master
Don't clear BackURL after MemberAuthenticator::authenticate()
2014-08-26 08:59:58 +12:00
Ingo Schommer
e56ad9b37c Don't clear BackURL after MemberAuthenticator::authenticate()
It breaks logic flow, e.g. when

Its called by BasicAuth:requireLogin() when basic auth is enabled,
before any controller logic kicks in (on every HTTP request).
This means you can't use session-based BackURLs with basic auth enabled,
breaking flows like redirection after Facebook logins.

I can't see why a clear() was necessary here, looks like a overly
cautious way to prevent infinite loops? Can't see how those
would be caused by requireLogin() though.

Been there since all the way back in 2007: a377a67e54
2014-08-25 23:12:52 +12:00
Sean Harvey
07eef2ece2 Removing deprecated class/functions marked for deprecation in 3.0/3.1 2014-08-25 12:06:05 +12:00
Damian Mooyman
9ec4669a59 Merge remote-tracking branch 'origin/3.1.6' into 3.1 2014-08-25 11:38:13 +12:00
Damian Mooyman
9da3357e3a add 3.1.6 docs 2014-08-25 11:25:01 +12:00
Damian Mooyman
f3974f0e63 Merge pull request #3412 from halkyon/redundant_config
Removing redundant aggregatestore cache config (#3404)
2014-08-25 11:21:18 +12:00
Damian Mooyman
96d0874953 BUG Fix issue with inheritance of Injector service configuration 2014-08-25 10:23:01 +12:00
Damian Mooyman
5b553616dc API DateTime.Ago better infers significance of date units.
BUG Fixes missing i18n translation in Date::TimeDiffIn
BUG Fixes Date::TimeDiffIn not respecting mocked SS_Datetime::now
This provides less vague date periods. I.e. "36 days" has a lot more relevance that "1 month"
Reduced duplication of time period calculation code
(ref: CWPBUG-141)
2014-08-25 10:04:24 +12:00
Sean Harvey
afa6612074 Merge pull request #3428 from chillu/pulls/contrib-docs
Updated contrib docs, mention "DO NOT MERGE" pull requests
2014-08-25 09:00:38 +12:00
Ingo Schommer
5c9e88b9a0 Updated contrib docs, mention "DO NOT MERGE" pull requests
These should be avoided because they undermine the process of
peer review and merging in github, we should strive to have
zero open pull requests, as opposed to treating it as a stage
for work in progress. Intermediary code review can happen in github forks instead.

Also remove some checklist items which were based on the Trac bugtracker,
e.g. its not longer possible to assign yourself to issues because
of github's limited permission abilities.
2014-08-25 08:29:25 +12:00
Sean Harvey
13ca45411c Merge pull request #3427 from dhensby/patch-4
Use injector to create `ValidationResult`
2014-08-23 11:53:57 +12:00
Daniel Hensby
c5956d6ac4 Use injector to create ValidationResult 2014-08-22 15:19:01 +01:00
Sean Harvey
0e07f1a7f5 Merge remote-tracking branch 'origin/3.0' into 3.1 2014-08-22 17:50:36 +12:00
Sean Harvey
6e0d9df331 Merge pull request #3406 from ss23/patch-2
Update urlvariabletools.md
2014-08-22 17:24:36 +12:00
Stig Lindqvist
c8c1833e09 Merge pull request #3418 from halkyon/remove_supression
Remove @ suppression operator on session_start()
2014-08-22 17:08:10 +12:00
Ingo Schommer
1661213e5b FIX Opt-out pf form message escaping (fixes #2796)
This fixes a limitation introduced through http://www.silverstripe.org/ss-2013-008-xss-in-numericfield-validation/.
Form messages used to accept HTML, now they’re escaped by default, effectively removing the ability
to pass in HTML and take care of escaping manually.

We pass through HTML to message in core through the CTF system, so this needs to be fixed.
It’s an alternative fix to https://github.com/silverstripe/silverstripe-framework/pull/2803.
2014-08-22 16:59:34 +12:00
Damian Mooyman
0d169d5c8d Merge pull request #3424 from halkyon/director_test_relative
BUG Fixing Director::test() failing on BASE_URL prefixed URLs
2014-08-22 15:46:54 +12:00
Sean Harvey
8063b349c8 BUG Fixing Director::test() failing on BASE_URL prefixed URLs
Example: you have a site in a sub-directory off the webroot, you call
->Link() on a SiteTree record, which returns "/[sitedir]/my-page", and
you pass this URL to Director::test(). It's a valid URL, but
Director::test() will throw a 404.

Director::test() should be ensuring that all URLs passed to it are
properly made relative, not just in the case where it thinks the URL
is absolute.
2014-08-22 15:21:53 +12:00
Sean Harvey
73b1537a89 Merge pull request #3423 from tractorcow/pulls/3.1/travis
Reformat .travis.yml
2014-08-22 14:04:08 +12:00
Damian Mooyman
3cfb285122 Reformat .travis.yml 2014-08-22 13:49:10 +12:00
Joel Marcey
0c85680371 Support PHPUnit 3.8+ compatibility
Summary:

PHPUnit 3.8+ adds a method to its PHPUnit_Framework_TestListener called addRiskyTest(). Need to stub it out to avoid "must implement this interface method" fatals when using 3.8+

Test Plan:

Reviewers:

CC:

Task ID: #

Blame Rev:
2014-08-22 13:43:23 +12:00
Damian Mooyman
2368b2af2f Merge pull request #3419 from halkyon/hhvm_tidy_fix
Fixing HHVM builds not having tidy support built-in to PHP (#3414)
2014-08-22 12:02:01 +12:00
Sean Harvey
03c7231fcd Fixing HHVM builds not having tidy support built-in to PHP (#3414)
Installs cli tidy, which is used as a fallback for CSSContentParser.
2014-08-22 11:41:51 +12:00
Damian Mooyman
aec8430395 Merge pull request #3393 from halkyon/flushable
NEW Provide a consistent way of triggering flush
2014-08-22 10:28:26 +12:00
Sean Harvey
64fbb512da Merge pull request #3421 from christopherdarling/patch-1
DOCS: correct notes on TEMP_FOLDER
2014-08-22 09:41:45 +12:00
Sean Harvey
2b316e79e5 NEW Provide a consistent way of triggering flush
Provides an interface for classes to implement their own flush()
functionality. This function gets called early in a request on
all implementations of Flushable when flush=1|all is requested in the
URL.

This fix came out of an issue where Requirements combined files were not
being cleaned up after dev/build?flush=1, due to the fact that flush
would only occur when you called it while on a page that used those
combined files, but not in any other contexts. This will now call flush
on any implementors of Flushable regardless of the context of where
flush was called.
2014-08-22 09:24:27 +12:00
Christopher Darling
d89ed7c4a7 DOCS: correct notes on TEMP_FOLDER
getTempParentFolder() in framewor/core/TempPath.php checks for silverstripe-cache directory in webroot first, failing that it falls back on the sys_get_temp_dir() folder.

also, getTempFolder() is no longer in framework/core/Core.php since #b075fa29c59f970bea31bbe8be1bd6560a8778b6, it is now located in framework/core/TempPath.php
2014-08-21 14:31:55 +01:00