Commit Graph

9580 Commits

Author SHA1 Message Date
TeamCity
276d856e81 MINOR Updated translations 2012-08-27 21:04:45 +12:00
TeamCity
916b073f1f MINOR Updated translations 2012-08-27 20:05:02 +12:00
Ingo Schommer
db28e88f23 Merge remote-tracking branch 'origin/master' into translation-staging 2012-08-27 09:26:50 +02:00
Ingo Schommer
a8f335360b Merge remote-tracking branch 'origin/3.0' 2012-08-27 09:25:59 +02:00
Ingo Schommer
c191f1f2ac Merge remote-tracking branch 'origin/master' into translation-staging 2012-08-27 09:17:40 +02:00
Ingo Schommer
dddc5bdf46 Removed accidental *.orig files 2012-08-27 09:06:10 +02:00
Sam Minnée
dd97da0ac2 Merge pull request #741 from silverstripe-rebelalliance/trac/7765
FIX several issues with the config system
2012-08-26 22:18:14 -07:00
Hamish Friedlander
8b6e4f5a90 Add some basic tests for ConfigManifest#relativeOrder 2012-08-27 16:42:25 +12:00
Hamish Friedlander
6009cfadc2 NEW Allow debugging of config cyclic errors
It is possible to specify before and after rules on config fragments
that conflict - A before B and B before A isnt possible to solve.

This used to just throw an error with no way to debug. Now if you
specify debug as a GET parameter and the site is not in live mode
youll get a basic dump of the remaining DAG graph
2012-08-27 16:08:10 +12:00
Hamish Friedlander
e0b8f15171 FIX Config wasnt filtering wildcards properly
When specifying a specific before rule and a wildcard after rule (or
vice versa), the config system was filtering out any fragment
from the list of fragments that matched the wildcard if it matched
_any_ componenet of the specific rule, not all of them.

Fixed, and added handling of two semi wild-card rules, where a
rule with less wildcards wins over a rule with more.

See http://open.silverstripe.org/ticket/7765 for more
2012-08-27 16:03:03 +12:00
Hamish Friedlander
c7ca47f2b1 FIX Config frag could only have one before or after rule
You should be able to specify multiple before and after rules in
a config fragment. This was intended to be a comma seperated string
but that wasnt being split properly

Now if you provide a comma seperated string it is split properly,
but you can also provide an array, which is actually cleaner
2012-08-27 16:00:54 +12:00
Ingo Schommer
30b9fa5404 Merge branch '3.0' 2012-08-27 00:13:45 +02:00
Ingo Schommer
0a6a3fa936 i18n for file type descriptors (see #7798) 2012-08-27 00:02:52 +02:00
Ingo Schommer
8dccb7f7d7 i18n for GridField pagination footer (see #7798) 2012-08-26 23:58:31 +02:00
Ingo Schommer
2fab657fce i18n for CMS section titles (see #7798) 2012-08-26 23:58:31 +02:00
Ingo Schommer
3b592122fd i18n for "select an anchor" string (see #7798) 2012-08-26 23:58:31 +02:00
Sean Harvey
674b52b4f7 Merge pull request #734 from silverstripe-rebelalliance/trac/7799
API Reverse config extra statics control flow
2012-08-26 14:24:05 -07:00
TeamCity
f7bc9b3e9f MINOR Updated translations 2012-08-26 04:04:37 +12:00
TeamCity
5aa32262a8 MINOR Updated translations 2012-08-25 00:04:36 +12:00
TeamCity
bf6980c7e2 MINOR Updated translations 2012-08-24 22:05:56 +12:00
TeamCity
4bad760964 MINOR Updated translations 2012-08-24 21:04:49 +12:00
TeamCity
26200e5d86 MINOR Updated translations 2012-08-24 20:05:49 +12:00
Ingo Schommer
0aa28943ff Updated translations 2012-08-23 23:34:42 +02:00
Ingo Schommer
6997be6658 Merge remote-tracking branch 'origin/translation-staging'
Conflicts:
	lang/de.yml
	lang/mi_NZ.yml
	lang/nl.yml
	lang/ru.yml
2012-08-23 23:33:02 +02:00
TeamCity
1b0212b9dc MINOR Updated translations 2012-08-24 03:04:39 +12:00
TeamCity
931da41e03 MINOR Updated translations 2012-08-24 02:19:42 +12:00
TeamCity
ee3ca61a05 MINOR Updated translations 2012-08-24 00:05:32 +12:00
TeamCity
094bd2f930 MINOR Updated translations 2012-08-23 23:16:19 +12:00
Sam Minnée
8560ccede5 Merge pull request #737 from simonwelsh/dotest-fix
FIX Use array_intersect() with expected values so that the order matches
2012-08-22 22:49:27 -07:00
Simon Welsh
cd61b61a84 FIX Use array_intersect() with expected values so that the order matches.
The values in $values aren't returned in any order, so this test can randomly fail. This
changes the check from expected = $values to $values \cap expected = $value. PHP's array_intersect
maintains the keys of the first array, so order is preserved. The intersect also guarentees that the
only accepted values are the expected ones.
2012-08-23 17:36:59 +12:00
Sam Minnee
f1c021ff22 Merge branch '3.0' 2012-08-23 12:56:17 +12:00
Sam Minnee
87685eefdd BUGFIX: Fix Versioned's stage_unique mode on PostgreSQL. 2012-08-23 12:56:06 +12:00
Sam Minnee
824afffd2e Merge branch '3.0' 2012-08-23 12:39:41 +12:00
Sam Minnee
ed0341e82f BUGFIX: Ensure that subtracting a sorted DataList works. 2012-08-23 12:38:54 +12:00
Sam Minnee
296ee1fa0f BUGFIX: Add double quotes to index columns for more reliable DB-schema management. 2012-08-23 12:38:44 +12:00
Sam Minnee
dd302a68a7 BUGFIX: Ensure that all_versions are sorted explicitly for better cross-db behaviour. 2012-08-23 12:38:37 +12:00
Sam Minnee
f6334dd017 Added default sort to test data for better cross-db performance. 2012-08-23 12:38:33 +12:00
Sean Harvey
5c6707df89 Merge pull request #735 from oddnoc/scheme-relative-requirements
Allow scheme-relative URLs in requirements
2012-08-22 16:56:18 -07:00
Fred Condo
3e0782267c Allow scheme-relative URLs in requirements
The Requirements class currently treats only absolute URLs as URLs, and
tries to interpret anything else as a filesystem path. This prevents
using scheme-relative URLs for requirements.

Example:
<% require javascript(//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js) %>

This forces the unfortunate choice of not using a CDN for common
scripts, always using an https absolute URL, or accepting that some
browsers will throw a security warning when viewing the site in https.

This change allows scheme-relative URLs & updates RequirementsTest.
2012-08-22 16:49:55 -07:00
Hamish Friedlander
fa37c448a5 API Reverse config extra statics control flow
Config system used to provide an add_static_source method, which was intended for
use by Extensions to add statics. But extensions for a class arent initialised
until at least one instance of that class is created, so before that the
Config system didnt include values from extensions

This patch reverses the control flow, so that the Config system explictly asks
each Object for its additional config sources via the new method
get_extra_config_sources. This method returns an array that can contain
string names of classes and also raw associative arrays.

The developer visible change is that Extension#add_to_class has been
deprecated. Instead there is a new method, get_extra_config, which has
the same method signature but needs to guarantee that it doesnt
cause side effects. Additionally there is no need to call
parent::get_extra_config - this is handled automatically.
2012-08-23 09:29:13 +12:00
Ingo Schommer
9ebac90864 Removed 'relation filters' from datamodel docs
Not implemented yet, so we shouldn't document it either
to avoid confusing devs. See #7595
2012-08-22 16:29:37 +02:00
Ingo Schommer
ae9c2e78a1 BUG Restore tree children after updateNode() (fixes #7761) 2012-08-22 15:38:54 +02:00
Will Rossiter
e9c8674739 Merge pull request #733 from adrexia/installer
BUG: Installer implies empty template used in tutorial
2012-08-22 00:07:45 -07:00
Naomi Guyer
69182c21ce BUG: Installer implies empty template used in tutorial
Have reworded the template options so that installers know that the
simple template is used for the tutorial
2012-08-22 13:42:53 +12:00
Sam Minnée
a45f4a4c29 Merge pull request #732 from jcwacky/3.0
BUGFIX: GridField delete icon now correctly deletes, rather than always ...
2012-08-21 15:40:43 -07:00
James Cocker
9a8313dce0 BUGFIX: GridField delete icon now correctly deletes, rather than always just unlinking (Fixes 7801)
Fixes the handleAction function of GridFieldDeleteAction which wasn't differentiating between a 'deleterecord' action and an 'unlinkrelation' action.

Fixes http://open.silverstripe.org/ticket/7801
2012-08-21 23:31:34 +01:00
Sam Minnée
af2eae760f Merge pull request #730 from unclecheese/patch-9
ENHANCEMENT: GreaterThanFilter should be consistent with LessThanFilter
2012-08-21 12:44:20 -07:00
unclecheese
66dfa38d0a ENHANCEMENT: GreaterThanFilter should be consistent with LessThanFilter
Numeric or float values weren't supported.
2012-08-21 12:48:01 -03:00
TeamCity
02758857a8 MINOR Updated translations 2012-08-22 01:42:35 +12:00
Sam Minnée
e0e96343cf Merge pull request #729 from silverstripe-rebelalliance/trac/7717
FIX Hierarchy#liveChildren couldnt handle lots of pages
2012-08-20 20:59:41 -07:00