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
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
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
unclecheese
4fde42f72e
ENHANCEMENT: Add "jpeg" to list of allowed extensions
...
.jpeg is the correct extension for these files, and they were being filtered out of the list.
2012-08-17 13:17:26 -03:00
Sam Minnée
31d6070bb5
Merge pull request #720 from phptek/XHR-Installer-BUG
...
BUGFIX: Installer failed complaining about rewrite server-capability: XH...
2012-08-16 18:39:19 -07:00
Sam Minnée
9adf0a4155
Merge pull request #703 from patbolo/fix/7742_2
...
FIX 7742
2012-08-16 18:05:10 -07:00
Sam Minnee
e51937f1e8
Exclude a few branches from running in Travis
2012-08-17 09:55:20 +12:00
Ingo Schommer
29b62adec2
Merge branch 'augmentSQL-on-wrong-class' of git://github.com/creamarketing/sapphire into creamarketing-augmentSQL-on-wrong-class
2012-08-16 23:47:48 +02:00
Ingo Schommer
6d41cd8d09
Merge pull request #686 from wilr/3.0-rssfeed
...
FIX: use standard template rendering process for RSS feeds
2012-08-16 14:45:44 -07:00
Ingo Schommer
b5695e2cbf
Merge pull request #713 from tractorcow/3.0-translatable-compatibility-fixes
...
FIXED: Compatibility issues with the Translatable module
2012-08-16 14:44:35 -07:00
Ingo Schommer
472752361a
Added correct CSS class to GroupedDropdownField
2012-08-16 23:31:13 +02:00
Andrew Short
2503e481ff
Only initialise chosen elements when visible.
2012-08-16 23:26:33 +02:00
Andrew Short
b38735d536
Fix chosen dropdown width not being set.
2012-08-16 23:26:29 +02:00
Andrew Short
c1f27c18ee
Revert b9ed6f7f6d
.
2012-08-16 23:26:24 +02:00
Ingo Schommer
ea0554a466
Merge pull request #666 from silverstripe-droptables/versioned-param-order
...
BUG Correct wrong parameter order.
2012-08-16 14:03:16 -07:00
jakr
c2414aa7dd
API Debug::showError() no longer calls exit() ( fixes #2644 )
...
Remove exit() from showError to continue execution after an user_error of warning (warningHandler) or notice (noticeHandler) level.
2012-08-16 22:58:55 +02:00
Ingo Schommer
4598cc02aa
Merge pull request #659 from ajshort/instance-search-filters
...
BUG: Allow using instances for search filters.
2012-08-16 13:07:35 -07:00
Mateusz Uzdowski
70eaa270e4
API Allow to force URL reload, while replacing the history state
...
Comes with a wrapper for easy reloading of the current panel.
2012-08-16 22:02:19 +02:00
Francisco arenas
a58cb37f96
Fix TreeDropdownField toggle alignment in FF
...
See pull request #598
2012-08-16 21:13:44 +02:00
mightycoco
5f94d23000
ENHANCEMENT: Ntfcatn. image embedding(trac #7438 )
...
Adding an additional warning / notification message, when author embedds an external image.
2012-08-16 21:03:37 +02:00
Ingo Schommer
5a2247a440
Merge pull request #589 from simonwelsh/absolute_url
...
FIX Director::is_absolute_url() now ignores query string
2012-08-16 11:50:29 -07:00
Ingo Schommer
f79d2df104
BUG More robust url comparison in CMS
...
Avoid ajax reloads when URLs differ in irrelevant ways,
e.g. admin/?locale=de vs. admin?locale=de.
This caused problems with the translatable module
reloading page content where it didn't need to,
because some previous robustness patches to the same problem
didn't apply (they only removed trailing slashes, ignoring
query parameter strings). The visible problem for this was
a broken tree panel, because it was ajax-loaded in parallel
with its container. Depending on ajax response order,
this would break the inner panel (in this case the tree),
since its original container was replaced with a new DOM.
2012-08-15 21:22:15 +02:00
Ingo Schommer
55892fedd8
Merge remote-tracking branch 'origin/3.0'
2012-08-15 20:32:16 +02:00
Roland Lehmann
701da8b822
Updated translations; i18n for fieldLabels
2012-08-15 20:30:30 +02:00
Russell Michell
3ca24a89e9
BUGFIX: Installer failed complaining about rewrite server-capability: XHR response was 3 chars long and therefore !== "OK"
...
MINOR: Added charset <meta> declaration to prevent errors cluttering up browser-based debugger console output
2012-08-15 13:42:54 +12:00
Sam Minnee
2dadc77e99
Revert "Make PHPUnit bootstrap add flush=1"
...
This reverts commit e0037967c2
.
Conflicts:
tests/travis/_ss_environment.php
2012-08-14 19:01:30 +12:00
Sam Minnee
fe1434678b
Revert "Make PHPUnit bootstrap add flush=1"
...
This reverts commit e0037967c2
.
Conflicts:
tests/travis/_ss_environment.php
2012-08-14 19:00:57 +12:00
Sam Minnee
2c62dda47a
Fixed Travis CI and make it use SQLite
2012-08-14 17:02:28 +12:00
Sam Minnee
e0037967c2
Make PHPUnit bootstrap add flush=1
2012-08-14 17:02:12 +12:00
Sam Minnee
b9522114f5
Fixed bugs in Travis CI set-up
2012-08-14 17:02:06 +12:00
Sam Minnee
0e08840ff9
Fixed Travis CI and make it use SQLite
2012-08-14 16:45:13 +12:00
Sam Minnee
4d1c2ed4fc
Make PHPUnit bootstrap add flush=1
2012-08-14 16:44:32 +12:00
Sam Minnee
50b4d805cc
Fixed bugs in Travis CI set-up
2012-08-14 16:11:37 +12:00
Sam Minnee
8d92046769
Added support for Travis CI
2012-08-14 16:06:21 +12:00
Sam Minnee
04e3beddf5
Added support for Travis CI
2012-08-14 16:02:12 +12:00
Ingo Schommer
5bfaa65719
Merge remote-tracking branch 'origin/3.0'
2012-08-13 00:47:47 +02:00