Commit Graph

13546 Commits

Author SHA1 Message Date
Sean Harvey
99f8fb29b5 Merge pull request #3507 from tractorcow/pulls/fix-mailer
API / FIX / Cleanup - Mailer and Convert::html2raw
2014-09-26 10:15:18 +12:00
Sean Harvey
f61bb186a7 Merge pull request #3007 from tractorcow/pulls/singleton
API Singleton method allowing type inference
2014-09-26 10:11:42 +12:00
Damian Mooyman
bf4e9eb044 API Singleton method allowing type inference
This pattern improves over the current usage of singleton by allowing type inference.
This also better supports refactor, code usage detection, and auto-completion of classes.
2014-09-26 09:10:25 +12:00
Sean Harvey
04e26d4a36 Merge pull request #3025 from tractorcow/pulls/3.2-date-relevance
API DateTime.Ago better infers significance of date units.
2014-09-25 18:28:30 +12:00
Damian Mooyman
e47800917a API Mailer can be configured to use different encoding mechanisms, and added support for unicode quoted-string encoding
API Mailer bounce email can now be configured
API Mailer no longer calls Convert::xml2raw on all email subjects
API Deprecate dead Mailer code and refactored duplicate or mis-documented code.
2014-09-25 16:04:56 +12:00
Damian Mooyman
29e3347562 API Convert::html2raw no longer wraps text automatically
BUG Convert::html2raw now correctly decodes single quotes
2014-09-25 16:04:48 +12:00
Sean Harvey
bbd4e8b8c1 Merge pull request #3462 from tractorcow/pulls/3.2/fix-versioned
BUG Fix versioned failing to generate new versions
2014-09-24 18:03:40 +12:00
Simon Welsh
7e58bbf6ce Merge pull request #3505 from halkyon/cookie_httponly
Cookies set via Cookie::set() are now HTTP only by default
2014-09-24 15:49:32 +10:00
Sean Harvey
563155391f API Cookies set via Cookie::set() are now HTTP only by default 2014-09-24 17:48:13 +12:00
Sean Harvey
4ba6d8153d Merge pull request #3490 from tractorcow/pulls/3.2/parameterised-joins
API Allow parameterised joins / subselects
2014-09-17 07:31:18 +12:00
Damian Mooyman
062ad8e685 API Allow parameterised joins / subselects 2014-09-16 17:54:30 +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
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
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
Loz Calver
5f653a00eb Add "retina" styles for high-dpi screens 2014-08-27 17:06:57 +01: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
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
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
c7fb61120e Removing redundant aggregatestore cache config (#3404) 2014-08-21 09:13:28 +12:00
Sean Harvey
c0abb08b61 Merge pull request #3397 from tractorcow/pulls/3.2/whitespace
Remove all redundant whitespace
2014-08-19 09:55:31 +12:00
Damian Mooyman
eb069e605d Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Damian Mooyman
64bf786958 Merge pull request #3396 from halkyon/deprecation_cleanup
Removing @deprecated 3.1 functionality and classes.
2014-08-19 08:40:14 +12:00
Sean Harvey
404478b07f Removing @deprecated 3.1 functionality and classes.
Changelog has been updated to include what was removed in terms of
major functionality, and what to use as a replacement.
2014-08-18 16:00:13 +12:00
Sean Harvey
b346d2b4d3 Merge pull request #3376 from mateusz/link-tracking
Move the link-tracking into the cms to remove the SiteTree dependency.
2014-08-14 14:11:22 +12:00
Sean Harvey
f8a77eeace Merge pull request #3385 from mateusz/viewable-data-getter
API Add a getter for customisedObject property.
2014-08-14 11:45:35 +12:00
Mateusz Uzdowski
784e292d4e API Add a getter for customisedObject property.
This is the only way to see if the ViewableData has been customised,
and is useful in situations when you want to further customise an
already-customised object.
2014-08-14 10:28:00 +12:00
Mateusz Uzdowski
efbc3b3a81 Move the link-tracking into the cms to remove the SiteTree dependency.
Depends on 8996b67c13a773c3339f45d91bf2378a39e5178a in the cms module.
2014-08-14 10:13:14 +12:00
Sean Harvey
5cd85f6496 Merge pull request #3379 from mateusz/merge-back
Merge 3.1 back
2014-08-14 09:44:07 +12:00
Mateusz Uzdowski
8bf3853887 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php
2014-08-14 09:08:26 +12:00
Damian Mooyman
0b6c68f903 Merge remote-tracking branch 'origin/3.1.6' into 3.1 2014-08-12 16:28:39 +12:00
Damian Mooyman
a8685d0aa6 Fix link 2014-08-12 15:12:44 +12:00
Damian Mooyman
2b25ab37f6 3.1.6-rc2 docs 2014-08-12 15:09:13 +12:00
Damian Mooyman
98907fb35f BUG Fix incorrect parsing of HTML content 2014-08-12 13:02:49 +12:00
Damian Mooyman
a369094db7 BUG Fix issue with generating tree data for missing pages 2014-08-12 13:02:38 +12:00
Michael
8ab12567a8 Update shortcodes.md
Replaced $args with $arguments as $args wasn't correct
2014-08-12 13:02:24 +12:00
Elliot Sawyer
ee489582e9 Fix typo in sitetree.md
Found a typo in the PHP class: StaggPage should be StaffPage
2014-08-12 13:02:13 +12:00
Michael Parkhill
f19b1ee453 FIX declarations matching PHPUnit_Framework_Assert
FIX for phpunit error message: ERROR [Strict Notice]: Declaration of SapphireTest::assertNotContains() should be compatible with PHPUnit_Framework_Assert::assertNotContains, and the same error for assertContains()
2014-08-12 13:02:01 +12:00