tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
11,990 Commits 31 Branches 527 Tags 162 MiB
12a4a8c9dc
Commit Graph

11990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Will Rossiter
7a9ef16a0c Add how to for custom GridField row actions. 2013-09-19 23:38:35 +12:00
Stig Lindqvist
eb3cd197ac Merge pull request #2429 from chillu/pulls/cms-validation 
Form errors in LeftAndMain response negotiation
 2013-09-18 14:34:55 -07:00
Ingo Schommer
be8ee992b7 getCMSValidator() docs 2013-09-18 14:32:38 +02:00
Ingo Schommer
1bb993b0b3 Form errors in LeftAndMain response negotiation 
The session key for form errors changed from "Form_EditForm" to "CMSForm_EditForm",
causing a mismatch. See https://github.com/silverstripe/silverstripe-framework/pull/2084/files#r6338249 for discussion
 2013-09-18 14:30:37 +02:00
jaedb
3a17e168cc Styling admin notice popup 2013-09-18 11:42:26 +02:00
Ingo Schommer
b9e205abbf Allow <link/> in HTMLText->exists() (fixes #850) 2013-09-18 11:39:29 +02:00
Sean Harvey
c349322b7e Merge pull request #2428 from PutmanMedia/pulls/sqlquery-orderby-joins 
Only compare array notations in SQLQuery->getOrderedJoins()
 2013-09-17 18:15:58 -07:00
Ingo Schommer
ba5984e2bf Only compare array notations in SQLQuery->getOrderedJoins() 
If more than two $from were added through SQLQuery->addFrom(),
the getOrderedJoins() comparison kicks in. It assumes all $from
parts are in array notation, which isn't always the case.
For legacy reasons, and because we don't have full API support,
you can still add literal joins through addFrom('INNER JOIN ...').
On PHP 5.3, the ordering comparison still works because it
allows array access in strings, with string rather than numeric indexes.
Thankfully that's no longer supported in PHP 5.4.
 2013-09-17 22:08:48 +02:00
Ingo Schommer
f07ce0b25e Merge pull request #2423 from wilr/cliredirects 
FIX: Follow internal redirections for cli operations.
 2013-09-16 01:59:00 -07:00
Will Rossiter
63778550e5 FIX: Follow internal redirections for cli operations. 2013-09-16 20:11:28 +12:00
Will Rossiter
fd6a1619cb Remove StaticPublisher route. Now a module 2013-09-16 19:47:33 +12:00
Ingo Schommer
60966898e2 Trailing semicolon to fix TinyMCE bug (fixes #2408) 
Regression introduced by #2386
 2013-09-16 01:09:37 +02:00
Ingo Schommer
a87000170a Behat: "apply formatting" steps 2013-09-15 01:50:10 +02:00
Ingo Schommer
849f2c1cb1 Behat: "insert external link" feature 2013-09-14 19:50:22 +02:00
Ingo Schommer
d68a016026 Behat: Friendler field reference 2013-09-14 19:50:21 +02:00
Ingo Schommer
2fbe0c39f2 Behat: Correctly quote selector in dropdown step 2013-09-14 19:50:21 +02:00
Ingo Schommer
c9047a386f Behat: "insert link" feature 2013-09-14 19:50:21 +02:00
Ingo Schommer
7a4a1bbadb Behat: More "insert image" steps 
Still needs definitions
 2013-09-14 19:50:21 +02:00
Ingo Schommer
e202d4b3b0 Behat: Avoid false positives in dropdown traversal 
Was identifying fields like <input value="Select a page">
when querying for a drop down labelled "Page"
 2013-09-14 19:50:21 +02:00
Ingo Schommer
8de227554e Behat: More verbose error message in HTML field assertion 2013-09-14 19:50:21 +02:00
Ingo Schommer
fde6b65769 Behat: Allow quoted HTML in assertion 2013-09-14 19:50:21 +02:00
Ingo Schommer
35a32d608d More specific behat tree assertion 2013-09-14 19:50:21 +02:00
Simon Welsh
55fc0265f4 Merge pull request #2419 from bilekt3/patch-1 
Update 3.1.0-rc2.md
 2013-09-13 14:33:41 -07:00
Ingo Schommer
5a0b4b0f03 Shorter behat feature name 
Looks better in relishapp ;)
 2013-09-13 18:52:02 +02:00
Tomáš Bílek
65d5f10e60 Update 3.1.0-rc2.md 
Corrected RC number in heading of page.
 2013-09-13 18:50:45 +02:00
Ingo Schommer
819eebb5dc Behat: Profile feature (steps only) 2013-09-13 18:44:17 +02:00
Ingo Schommer
aa80c4eed2 Behat feature indentation (no content changes) 2013-09-13 18:42:27 +02:00
lukepercy
e6f7f637f3 Added feature file for behat test 
- Added content formatting behat feature file Updated Given statement for Insert link behat feature file
- Added Behat test feature file for alignment buttons Updated formatting buttons feature file to include strikethrough formatting
 2013-09-13 17:00:43 +02:00
Will Rossiter
2c11710832 Fix for duplicate class definition introduced in ddcfcf7. 2013-09-13 19:26:06 +12:00
Sean Harvey
17fb7752db Skipping SQLQueryTest::testZeroLimitWithOffset() for MSSQLDatabase. 
This test doesn't work on MSSQLDatabase.
 2013-09-13 15:50:36 +12:00