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
4,787 Commits 31 Branches 527 Tags 162 MiB
aaf431fdd5
Commit Graph

4787 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
aaf431fdd5 Removed php5.2 incompatible syntax 2014-05-05 14:05:38 +12:00
Ingo Schommer
c5d4d7daf3 Merge pull request #3090 from tractorcow/pulls/2.4-phpunit 
BUG Allow PHPUnit installation with composer / Fix travis
 2014-05-05 13:15:56 +12:00
Will Morgan
ca62f73330 BUG Allow PHPUnit installation with composer / Fix travis 2014-05-02 18:25:54 +12:00
Ingo Schommer
be59fd9237 Merge pull request #2790 from silverstripe-rebelalliance/reEnableFilter 
BUG: Stop undefined error for $reEnableFilter being thrown
 2014-01-22 01:41:49 -08:00
Kirk Mayo
6f1dd138bc BUG: Stop undefined error for $reEnableFilter being thrown 
NEW: Switched reEnsbleFilter fix to match coding convention
 2014-01-21 08:39:46 +13:00
Ingo Schommer
d0c37b3a13 Merge pull request #2728 from xini/2.4 
BUGFIX: URL '/' ending up beeing redirected to '//'
 2013-12-19 11:02:45 -08:00
Florian Thoma
f0570c6ae8 BUGFIX: URL '/' ending up beeing redirected to '//' 2013-12-18 13:44:30 +11:00
Ingo Schommer
2426f781a3 Merge pull request #2716 from gbonanome/patch-1 
Fix empty $messageBlock on CheckboxField
 2013-12-13 01:54:34 -08:00
Giulio Bonanome
b29b49e7d7 Fix empty $messageBlock on CheckboxFields 
From 2.4.13 the Message attribute is set to Text, so every checkbox now show an empty $messageBlock,
See https://github.com/silverstripe/silverstripe-framework/issues/2489 or http://www.silverstripe.org/general-questions/show/25254
 2013-12-11 16:17:30 +01:00
Ingo Schommer
011ea99f3f Merge tag '2.4.13' into 2.4 2013-09-27 00:24:35 +02:00
Ingo Schommer
fdc7984e59 Merge tag '2.4.12' into 2.4 2013-09-27 00:24:33 +02:00
Ingo Schommer
ebcad2c8f3 Tagged 2.4.13 2013-09-26 01:12:03 +02:00
Ingo Schommer
f7373d1124 Added 2.4.13 changelog 2013-09-26 01:11:59 +02:00
Simon Welsh
c504fe0beb Merge pull request #2451 from chillu/pulls/escape-2.4 
Escaping 2.4
 2013-09-24 12:41:00 -07:00
Ingo Schommer
f69161efef FIX Auto-escape titles in TreeDropdownField 
Related to SS-2013-009. While the default "TreeTitle" was escaped
within the SiteTree->TreeTitle() getter, other properties like SiteTree->Title
weren't escaped. The new logic uses the underlying casting helpers
on the processed objects.
 2013-09-24 14:28:28 +02:00
Ingo Schommer
81ccb8d78e API Escape form validation messages (SS-2013-008) 2013-09-24 14:28:11 +02:00
Ingo Schommer
02ede1e811 Added 2.4.12 changelog 2013-09-24 14:28:11 +02:00
Stig Lindqvist
ac284eeff1 Merge pull request #2421 from ss23/patch-1 
Failed login message translation fallback
 2013-09-15 20:44:30 -07:00
Stephen Shkardoon
4f52f25d46 Failed login message translation fallback 
Without this, if you use a locale with no translation for this (e.g. en_NZ), users will never see a "failed login" message.
 2013-09-16 15:33:42 +12:00
Ingo Schommer
a4faba0662 Tagged 2.4.12 2013-09-12 16:29:35 +02:00
Ingo Schommer
d98c1db3a2 Retain 5.2 compatibility in DirectorTest 
parse_url() doesn't support schema-less URLs in 5.2
 2013-09-12 15:59:18 +02:00
Ingo Schommer
a914dee6d9 FIX Disallow permissions assign for APPLY_ROLES (SS-2013-005) 
See http://www.silverstripe.org/ss-2013-005-privilege-escalation-through-apply-roles-assignment/
 2013-09-12 15:38:59 +02:00
Ingo Schommer
ec8e8261f2 FIX Privilege escalation through APPLY_ROLES assignment (SS-2013-005) 
See http://www.silverstripe.org/ss-2013-005-privilege-escalation-through-apply-roles-assignment/
 2013-09-12 15:38:59 +02:00
Ingo Schommer
797951595b FIX Privilege escalation through Group hierarchy setting (SS-2013-003) 
See http://www.silverstripe.org/ss-2013-003-privilege-escalation-through-group-hierarchy-setting/
 2013-09-12 15:38:56 +02:00
Ingo Schommer
84a8b21936 Update 2.4.11 changelog 2013-08-07 20:27:18 +02:00
Ingo Schommer
a6a7b01afc Added 2.4 changelog 2013-08-07 15:23:46 +02:00
Ingo Schommer
83a9f35398 Removed composer dependency on CMS, workaround for composer/installers 
The installer dependency gets included too late for 2.4,
so framework ends up in the wrong path. That's a bug with composer,
see See https://github.com/composer/composer/issues/1147
Until its fixed, we remove the explicit dependency which seems
to trigger this path in the dependency resolver (works for 3.x)
 2013-08-07 14:51:45 +02:00
Ingo Schommer
ff9e4b3b10 composer/installers dep workaround 
Moved to end of requirements, to work around a bug in composer - see https://github.com/composer/composer/issues/1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.
 2013-08-07 14:36:26 +02:00
Ingo Schommer
fe3f58511d Merge pull request #2286 from hafriedlander/fix/flush_24 
FIX Flush on memory exhaustion and when headers sent
 2013-08-06 14:22:25 -07:00
Hamish Friedlander
15406dd559 FIX Constants magic_quotes needs function from Core 2013-08-05 14:58:06 +12:00
Hamish Friedlander
60a95cbe77 FIX Token redirect where in IIS a / needs adding between host & url 2013-08-05 09:14:10 +12:00
Hamish Friedlander
2f9689b8f8 FIX Flush on memory exhaustion and headers sent 2013-08-01 09:42:52 +12:00
Sam Minnee
a150989e6f FIX: Fixed escaping of date in view of archived site. 2013-07-30 18:30:51 +12:00
Sam Minnée
a787dddeab Merge pull request #2262 from hafriedlander/fix/flush_24 
FIX Nice errors and allows flush on module removal
 2013-07-23 16:44:36 -07:00
Hamish Friedlander
5212ab031a FIX Nice errors and allows flush on module removal 2013-07-24 09:16:42 +12:00
Sam Minnée
e993a0defe Merge pull request #2254 from hafriedlander/fix/flush_24 
Split Core.php into Constants.php and Core.php and adjust main.php startup
 2013-07-22 15:33:50 -07:00
Hamish Friedlander
09db9a659e FIX Only suppress fatal errors 2013-07-22 14:48:58 +12:00
Hamish Friedlander
122a9f898e Split Core.php into Constants.php and Core.php and adjust main.php startup 
The recent flush filter fix had a problem that you couldnt set a custom
BASE_PATH in _ss_environment because that file didnt get included until
after checking the confirmation token. This patch pulls the part of Core.php
that defines BASE_PATH into a seperate file that can be included earlier
in the startup sequence so that ParameterConfirmationToken can access it.

Core.php includes Constants.php with a require_once call, so for startup
scripts that dont pull in Constants.php themselves (like cli-script.php)
no change is needed.
 2013-07-22 14:02:37 +12:00
Sam Minnee
e782648b3a FIX: Fixed TempPath inclusion for phpunit & cli-script 2013-07-19 15:50:44 +12:00
Sam Minnée
7fe183ab20 Merge pull request #2247 from hafriedlander/fix/flush_24 
FIX: Have ParameterConfirmationToken work regardless of include path
 2013-07-18 20:46:47 -07:00
Hamish Friedlander
296b131171 FIX: Actually use argument in getTempFolder 2013-07-19 15:05:12 +12:00
Hamish Friedlander
ec8c4b8569 FIX: Ignore invalid tokens instead of throwing 403 2013-07-19 15:04:50 +12:00
Hamish Friedlander
d42d8d0fc2 FIX: Have ParameterConfirmationToken includes work regardless of include path 2013-07-19 14:30:59 +12:00
Sam Minnée
b774db43fb Merge pull request #2246 from hafriedlander/fix/flush_24 
FIX Prevent DOS by checking for env and admin on ?flush=1 (#1692) in 2.4
 2013-07-18 17:39:19 -07:00
Hamish Friedlander
8990788818 FIX Prevent DOS by checking for env and admin on ?flush=1 (#1692) 2013-07-19 12:31:37 +12:00
Hamish Friedlander
31429b7936 Move getTempFolder out of Core.php to own file 2013-07-19 11:01:20 +12:00
Ingo Schommer
5796ed225e Updated github path 2013-05-17 00:35:28 +02:00
Sean Harvey
813749e909 Fixing array to string conversion in dev/build for PHP 5.4 2013-05-12 21:28:17 +12:00
Ingo Schommer
a2394331af composer/installer dep workaround 
Moved to end of requirements, to work around a bug in composer - see https://github.com/composer/composer/issues/1147. This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.
 2013-04-30 19:08:50 +03:00
Ingo Schommer
ff63d7ae26 Merge pull request #1821 from oddnoc/csvbulkloader-findexisting-2.4 
Use the correct variable as the key into $record
 2013-04-30 06:48:54 -07:00