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,788 Commits 31 Branches 527 Tags 162 MiB
6df276c843
Commit Graph

12788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Walls
b906442a9c Fixes issue #2669 
Add local setName() function to DatetimeField, which also sets Name
on the constituent DateField, TimeField and timezoneField.
 2013-11-15 14:18:48 -05: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
Ingo Schommer
802b64db20 Merge pull request #2665 from dhensby/patch-1 
Making ConfigStaticManifest::parseStatic error more meaningful
 2013-11-13 06:09:27 -08:00
Daniel Hensby
be4ff501f7 Making ConfigStaticManifest::parseStatic error more meaningful 
The error thrown by `parseStatic` when there's an unexpected token is now more meaningful as it states the type of token that was encountered as well as the class that it was found in.
 2013-11-13 10:49:55 +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
Andrew Short
bedf292612 Merge branch '3.1' 
Conflicts:
	docs/en/reference/execution-pipeline.md
	lang/nl.yml
 2013-11-11 18:18:25 +11:00
Zauberfisch
4b138cfe0b Check if remote class exists in DataObject->getRemoteJoinField() 2013-11-09 22:43:30 +00: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
Maks Feltrin
0e05353efc make setHeadingLevel a chainable method 2013-11-02 01:21:56 +01:00
Ingo Schommer
90017821a1 Merge pull request #2628 from chillu/pulls/remove-tinymce-chancedetection 
Remove TinyMCE change detection on insert (breaks IE8)
 2013-11-01 04:24:16 -07:00
andrewvt
953dec8863 Updated group filter 
Updated group filter
 2013-11-01 07:22:13 -04:00
Ingo Schommer
adccda35aa Merge pull request #2609 from chillu/pulls/js-i18n-3.1 
API JS i18n files with short locale names, generated by build task
 2013-11-01 04:15:17 -07:00
Ingo Schommer
c1a655792d Merge pull request #2631 from halkyon/installer_temp_folder 
Use getTempFolder() from core when checking for temp in installer.
 2013-11-01 01:17:26 -07:00
andrewvt
389bdb4ddf Added a unit test for removeFromGroupByCode() 
Added a unit test for removeFromGroupByCode()
 2013-10-31 22:05:13 -04:00
Sean Harvey
8e36290b56 Merge pull request #2205 from jthomerson/pulls/fix_gridfield_class_name 
FIX: wrong class name being returned
 2013-10-31 18:19:05 -07:00
Sean Harvey
fd2e7c1dd3 Use getTempFolder() from core when checking for temp in installer. 
Fix for issue #2420. Instead of using custom temp folder discovery
code in the installer, use the core getTempFolder() instead.
 2013-11-01 13:53:53 +13:00
Sean Harvey
d8f29fcc04 Merge pull request #2236 from chillu/pulls/isdev-infinite-loop 
FIX Avoid infinite loops on ?isDev=1 and Deprecation class
 2013-10-31 15:59:31 -07:00
Sean Harvey
42fa4d6005 Merge pull request #2574 from dhensby/patch-1 
Allowing chaining on `PasswordValidator`
 2013-10-31 15:54:18 -07:00
Sean Harvey
1951fdba0f Merge pull request #2225 from tractorcow/3.1-hasmany-delete-fix 
BUG Fixes issue with HasManyList::remove
 2013-10-31 15:52:07 -07:00
Damian Mooyman
c74f7e7640 BUG Fixes issue where items could be deleted from a has_many relation by an entirely unrelated HasManyList calling delete on that item. 2013-11-01 11:39:13 +13:00
Ingo Schommer
c547e426dd Merge pull request #2599 from tractorcow/pulls/3.1-uploadfield-formchanged 
BUG / API - Change tracking for UploadField
 2013-10-31 15:28:34 -07:00