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
9,556 Commits 31 Branches 527 Tags 162 MiB
6997be6658
Commit Graph

9556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Hamish Friedlander
d0bc9c6d23 FIX Hierarchy#liveChildren couldnt handle lots of pages 
Hierarchy#liveChildren was generating a list of all IDs of all pages
on staging. When a site had lots of pages, this basically killed the
tree.

Fix by adding new versioned mode, stage_unique, which uses a
subselect to only return items from a stage that are in no
other stage.
 2012-08-21 15:52:12 +12:00
Sam Minnee
cbdc3bf896 Fixed bug in Travis matrix definition 2012-08-21 14:41:12 +12:00
Sam Minnee
f9b1485640 Merge branch '3.0' 2012-08-21 14:38:19 +12:00
Sam Minnee
597bc080ff Fixed bug in Travis exclusion of 5.4/SQlite and 5.4/PostgreSQL 2012-08-21 14:34:21 +12:00
Sean Harvey
aaa95d2dd5 Merge pull request #728 from tractorcow/3.0-mssql-compatibility-fixes 
FIXED: Compatibility fixes for MS SQL Server.
 2012-08-20 18:55:16 -07:00
Damian Mooyman
f7ffb79542 FIXED: Compatibility fixes for MS SQL Server. Replaced back ticks (which are mysql specific) with double quotes 2012-08-21 13:46:19 +12:00
Sam Minnee
9f4fb1353e Added PHP 5.4 + MySQL to build grid 2012-08-21 10:51:28 +12:00
Sam Minnee
866d9a94ee Updated Travis-CI configuration to have a 3 database build grid. 2012-08-21 10:42:34 +12:00
TeamCity
5c78ecfb98 MINOR Updated translations 2012-08-21 08:04:38 +12:00
Ingo Schommer
f0340e698f Updated translations 2012-08-20 22:01:36 +02:00
Ingo Schommer
06cddb747a BUG Force refresh of GridFieldDetailEditForm after save 
Wasn't refreshing after ajax save operations on existing
content, as the URL didn't change, and hence the CMS
didn't reload the view. Return the view directly instead,
unless we're dealing with new records (= changed URL).
 2012-08-20 15:08:30 +02:00
TeamCity
c2f4f5efc9 MINOR Updated translations 2012-08-21 01:04:42 +12:00
TeamCity
80a18b6519 MINOR Updated translations 2012-08-20 23:26:38 +12:00
Ingo Schommer
315e84f8e0 MINOR Updated translations master 2012-08-20 13:05:14 +02:00
Ingo Schommer
7cfae71b08 Merge remote-tracking branch 'origin/master' into translation-staging 2012-08-20 13:04:57 +02:00
Ingo Schommer
4cc82e906b Merge remote-tracking branch 'origin/3.0' 2012-08-20 10:13:55 +02:00
Sam Minnée
47b56d4ef8 Merge pull request #716 from tractorcow/3.0-versioned-fixes 
FIXED: Crashed caused by viewing versioned page
 2012-08-19 19:02:24 -07:00
Damian Mooyman
89728acece UPDATED: Improved get_all_versions test case to test versions in the middle of version updates. 2012-08-20 13:48:48 +12:00
Damian Mooyman
56fe7f881a REMOVED: Unnecessary publish actions from test cases 
ADDED: Test case for get_all_versions
 2012-08-20 13:44:56 +12:00
Damian Mooyman
0f09305e3d FIXED: Issue where temporary table would cause unpredictable behaviour. Temporary table functionality was substituted with subqueries in each use case. 
ADDED: Test case for version archive functionality.
 2012-08-20 13:24:28 +12:00
Sam Minnée
1e7e7c65ba Merge pull request #723 from silverstripe-rebelalliance/entwine 
Re-enable entwine inspector
 2012-08-19 16:36:18 -07:00
Hamish Friedlander
b560d258d3 Re-enable Entwine Inspector in CMS & document 2012-08-20 11:26:11 +12:00
Hamish Friedlander
915ae1a966 Upgrade entwine to latest 
Fixes issue where inspector used document.write
 2012-08-20 11:26:11 +12:00
Will Rossiter
4916b361f1 Merge pull request #724 from unclecheese/patch-8 
FIX: Add "jpeg" to list of allowed extensions
 2012-08-17 13:37:49 -07:00