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
12,313 Commits 31 Branches 527 Tags 162 MiB
305fea8163
Commit Graph

12313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
305fea8163 Merge pull request #2660 from icecaster/patch-1 
Scaffolded Enum Search fields dont offer a null selection
 2013-11-22 11:55:56 -08:00
Ingo Schommer
784c766ee6 Revert "Don't rely on Behat/Selenium returning 'value' for textarea" 
This reverts commit 8245125349.
 2013-11-22 20:38:56 +01:00
Ingo Schommer
7e291133a0 Merge pull request #2663 from ajshort/has-many-prepopulate 
NEW: Pre-populate and disable foreign key field on has many lists.
 2013-11-22 11:18:11 -08:00
Ingo Schommer
053258b984 Merge pull request #2595 from kinglozzer/gridfield-sort-relation 
NEW: GridField can sort on relation columns
 2013-11-22 11:14:12 -08:00
Ingo Schommer
8245125349 Don't rely on Behat/Selenium returning 'value' for textarea 
Technically a textarea DOM node doesn't have a 'value' attribute,
but rather a HTML content. This used to work, but likely broke either
by updated browser handling or updated selenium logic.
Fixes "Scenario: I can edit title and content and see the changes on draft"
 2013-11-22 20:05:17 +01:00
Ingo Schommer
556090ccfa Generic “cancel” button behaviour with History.back() 
Used in “add page” dialog. See https://github.com/silverstripe/silverstripe-cms/pull/793 for context
 2013-11-22 12:47:35 +01:00
Ingo Schommer
70207b0c98 Merge pull request #2626 from Zauberfisch/filterByCallback 
filterByCallback added to SS_Filterable interface and implemented in ArrayList
 2013-11-21 05:34:36 -08:00
Zauberfisch
d9b74874fc added filterByCallback() to interface SS_Filterable and all implementing classes 2013-11-21 13:03:18 +00:00
Ingo Schommer
c6cf023b42 Merge pull request #2650 from Zauberfisch/GridFieldAddExistingAutocompleter 
Implove GridFieldAddExistingAutocompleter->doSearch() html output
 2013-11-21 04:42:28 -08:00
Ingo Schommer
358fd7eb4b Merge pull request #2675 from martinduparc/patch-1 
Update server-requirements.md
 2013-11-20 09:11:14 -08:00
Martin D.
b75064c09c Update server-requirements.md 
Typo fix
 2013-11-20 11:40:00 -05:00
Sean Harvey
be99d1532b Merge pull request #2674 from chillu/pulls/friendlyerror-contenttype 
FIX text/html type for Debug::friendlyError() in live mode
 2013-11-18 12:09:59 -08:00
Ingo Schommer
cbc45c0db3 Merge pull request #2671 from wilr/ssmapfixes 
API: Implement SS_Map::push() to append values.
 2013-11-18 08:06:57 -08:00
Ingo Schommer
a0dbfc61b6 FIX text/html type for Debug::friendlyError() in live mode 
Avoid unparsed HTML responses in case of httpError(4xx) or
httpError(5xx) in live mode. The SS_HTTPResponse_Exception constructor
automatically set "text/plain" a content type, which conflicts
with the later choice of Debug::friendlyError() to return HTML.

This is a hotfix, needs more work to properly separate
logic flow from presentation concerns (e.g. through request processors).
 2013-11-18 16:02:12 +01:00
Will Rossiter
0e89c4b6cd API: Implement SS_Map::push() to append values. 
FIX: SS_Map::count() not taking into account additional firstItems
 2013-11-18 20:38:57 +13:00
Sean Harvey
b48b08bb8d Merge pull request #2672 from tiaitsch85/tiaitsch85-patch-1 2013-11-18 14:37:09 +13:00
websTTer
cd3cc1b923 Fix installer isIIS() to include IIS versions greater than 7. 2013-11-18 14:34:32 +13:00
Mateusz U
651d3ea7fc Merge pull request #2657 from kinglozzer/cms-xhr-referer 
NEW: Add X-Backurl header to CMS AJAX requests
 2013-11-17 12:08:58 -08:00
Ingo Schommer
bd5fdf1f19 Fixing coding conventions in Behat files 2013-11-15 12:03:43 +01:00
Loz Calver
c8caeb8154 Add X-Backurl header to CMS ajax requests 2013-11-15 09:20:53 +00:00
Loz Calver
a1a402224f NEW: GridField can sort on relation columns 
Slightly improved logic

Add support for relations more than one 'level' apart

Add unit tests

Fixing PostgreSQL support

Throw exception if attempting to sort on a has_many/many_many relation
 2013-11-13 10:33:00 +00:00
Andrew Short
fc773c5c22 NEW: Pre-populate and disable foreign key field on has many lists. 
This is a common use case, and by default a form field is added which
has no effect. While this coupling is undesirable, it makes the default
behaviour much more sensible.

See #2662, #2651, #2637 for more information.
 2013-11-13 16:21:18 +11:00
Tim
2e369ecc53 FIX: scaffolded search field null selection by default 
Enum search fields should default to having an empty string set
 2013-11-13 15:13:27 +13:00
Ingo Schommer
dbf0514837 Merge pull request #2596 from camspiers/sstemplateparser-extendabilty 
Allow users to extend the SSTemplateParser by defining open & closed blocks
 2013-11-12 11:00:58 -08:00
Ingo Schommer
204dc9e7e2 Merge branch 'tmp-3.1.2' into 3.1 2013-11-12 19:51:45 +01:00
Ingo Schommer
054b35ded7 Added 3.1.2 changelog 2013-11-12 19:43:44 +01:00
Sean Harvey
ad52cc20c1 Merge pull request #2656 from madmatt/patch-2 
Update partial-caching doc to include note on using .Max and .Count together
 2013-11-11 20:25:11 -08:00
madmatt
f0ae1160ed Update partial-caching.md 2013-11-12 17:22:59 +13:00
madmatt
eed29a1557 Update partial-caching doc to include note on using .Max and .Count together. 2013-11-12 16:05:16 +13:00
Zauberfisch
2df5269ae5 disable source_file_comments in GridFieldAddExistingAutocompleter->doSearch() because they would be displayed as plaintext in the dropdown 2013-11-08 08:34:22 +00:00
Zauberfisch
54a58eff27 Replace HTML entities in GridFieldAddExistingAutocompleter->doSearch() with actual charaters as the DropDown does not play nicely with HTML entities 2013-11-08 07:54:47 +00:00
Will Rossiter
7ace631499 Merge pull request #2648 from tractorcow/pulls/3.1-build-defaults 
BUG fix missing permission for dev/build/defaults
 2013-11-07 16:14:09 -08:00
Ingo Schommer
008bd97828 Added 3.1.2-rc1 changelog 2013-11-08 01:11:57 +01:00
Ingo Schommer
65844e1f86 Updated translations 2013-11-08 00:58:24 +01:00
Ingo Schommer
99abe16c21 Added 3.1.2 changelog 2013-11-08 00:42:28 +01:00
Damian Mooyman
640d5beb44 BUG fix missing permission for dev/build/defaults 2013-11-08 11:09:46 +13:00
Sean Harvey
48673346ad Merge pull request #2647 from chillu/pulls/2644-myprofile-layout 
admin/myprofile layout after validation (fixes #2644)
 2013-11-07 13:02:41 -08:00
Ingo Schommer
8286ba346e admin/myprofile layout after validation (fixes #2644) 
Broke because the <form> tag was returned, while
the client logic was expecting the whole <div> including the <form>.
Fixed to display the button bar at the bottom,
and tested with validation errors as well as switching from/to
the panel via ajax.
 2013-11-07 16:19:40 +01:00
Will Rossiter
62bb6f1be4 Merge pull request #2646 from mseymour/patch-1 
Fixed a few spelling mistakes and removing an extra 'w' in WAMP's documentroot path
 2013-11-07 00:51:48 -08:00
Mark Seymour
f059b7b200 Fixing spelling mistakes and knocking out an extra 'w' in WAMP's document root path. 2013-11-06 23:27:09 -04:00
Damian Mooyman
252b6e53ac Merge pull request #2641 from chillu/pulls/2638-uploadfield 
UploadField changeDetection optional (fixes #2638)
 2013-11-06 17:15:59 -08:00
Ingo Schommer
61f99fa1ef UploadField changeDetection optional (fixes #2638) 2013-11-06 23:34:29 +01:00
Ingo Schommer
9d550f8938 Fixed merge error 2013-11-06 09:46:30 +01:00
Ingo Schommer
91f6039eed Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	control/Director.php
 2013-11-05 10:15:40 +01:00
Hamish Friedlander
e161439340 Merge pull request #2470 from sunnysideup/patch-19 
more meaningful error message in ConfigStaticManifest.php (depth < 0)
 2013-11-04 17:58:10 -08:00
Cam Spiers
14486902fb Allow users to extend the SSTemplateParser by defining open & closed blocks 
Currently the only way the extend SSTemplateParser is to define a class
extension of it and then tell the injector component to use your new
custom class. This new change allows a user to define new "open blocks"
and "closed blocks" for SSTemplateParser to use without needing to
recompile the real SSTemplateParser class.

The following example shows how the functionality can be used
to add a new <% minify %>…<% end_minify %> syntax to the template parser

In a config.yml file, define the new minify closed block to call the
static function "Minifier::minify"

```
Injector:
	SSTemplateParser:
		properties:
			closedBlocks:
				minify: "Minifier::minify"
```

Define a new class with the minify static method that returns the new
template code when regenerating templates:

```
class Minifier {
    public static function minify(&$res) {
        return <<<PHP
{$res['Template']['php']}
\$val = zz\Html\HTMLMinify::minify(\$val, array('optimizationLevel' => zz\Html\HTMLMinify::OPTIMIZATION_ADVANCED));
PHP;
    }
}
```
 2013-11-04 14:24:58 +13:00
Sean Harvey
b5b8cb25e0 Merge pull request #2632 from chillu/pulls/versioned-docs 
FIX "Draft" stage to fix dev/build, Versioned docs (fixes #2619)
 2013-11-03 12:31:12 -08:00
Ingo Schommer
65b4407337 FIX "Draft" stage to fix dev/build, Versioned docs (fixes #2619) 2013-11-03 21:27:26 +01:00
Sean Harvey
70c23f37de Merge pull request #2608 from andrewvt/3.1 
added removeFromGroupByCode() function to Member.php
 2013-11-03 12:27:10 -08:00
Will Rossiter
4e79159969 Merge pull request #2634 from pine3ree/patch-1 
make setHeadingLevel a chainable method
 2013-11-01 17:29:28 -07:00