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
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
colymba
e535c35542
API New JS sprintf and inject replacement functions
...
Fix sprintf issues when replacement was at start of string + introduce
new inject function using injection map similar to the PHP version of
_t()
2014-08-12 13:01:29 +12:00
JorisDebonnet
3b6fc08f0f
Update customize-cms-menu.md
...
Corrected a few typos.
2014-08-12 13:00:09 +12:00
JorisDebonnet
af333bd40d
Update dataobject.md
...
There's no way to make things like [api:DataObject->beforeUpdateCMSFields()] work, is there?
I removed those kind of api tags (the links yielded a 404 page), and corrected a few other link-rendering issues.
2014-08-12 12:59:44 +12:00
John Milmine
7d97df9db8
adding exclamation mark and question mark to delimiters, made text work the same as HTML Text
2014-08-12 12:59:21 +12:00
John Milmine
3e0d2cb646
Added hasMethod so that you can pass ArrayData to GridField
2014-08-12 12:58:39 +12:00
Shaun de Greeff
953992e896
Update composer.md
...
Add a link to the Windows wamp page so that people will find info on how to install composer on windows more readily
2014-08-12 12:57:51 +12:00
Stefan Neuser
f0ed9e78a9
Update customize-cms-tree.md
2014-08-12 12:57:16 +12:00