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
10,478 Commits 31 Branches 527 Tags 162 MiB
4138bdf238
Commit Graph

10478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
TeamCity
a921026381 MINOR Updated translations 2012-08-18 01:19:07 +12:00
TeamCity
38d43b8f63 MINOR Updated translations 2012-08-17 20:04:27 +12: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
33b9b18a4c Merge pull request #722 from sonet/2.4 
MINOR fixed array to string conversion to avoid PHP 5.4 warnings
 2012-08-16 11:23:14 -07:00
TeamCity
d897dce93b MINOR Updated translations 2012-08-16 21:04:56 +12:00
TeamCity
fc81aa189e MINOR Updated translations 2012-08-16 20:05:21 +12: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
Adam Skrzypulec
766987105d MINOR fixed array to string conversion to avoid PHP 5.4 warnings 2012-08-15 11:40:40 -05:00
TeamCity
53043dbdfd MINOR Updated translations 2012-08-16 01:35:36 +12:00
TeamCity
8f8a4697b6 MINOR Updated translations 2012-08-15 22:04:53 +12: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
Jeremy Bridson
c621a6d699 BUGFIX: fixed trac 7665 - CMS Menu header now changes height depending on the name of the admin and greeting message. position and height were being set inline so added !important to override this. 2012-08-15 11:28:31 +12:00
TeamCity
2cba3e7530 MINOR Updated translations 2012-08-15 09:06:35 +12:00
TeamCity
ef979df1df MINOR Updated translations 2012-08-15 01:07:19 +12:00
TeamCity
0e05200be4 MINOR Updated translations 2012-08-14 20:05:13 +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