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
13,515 Commits 31 Branches 527 Tags 162 MiB
c7fb61120e
Commit Graph

13515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Rossiter
7361d0a6ac Merge pull request #2605 from willmorgan/cachetofile-false-fix 
Strict type check for null cache values
 2013-10-24 17:49:44 -07:00
Sean Harvey
91e96ec1c0 Merge pull request #2607 from mateusz/fix-reset-message 
BUG Fix the password reset message to be shown consistently.
 2013-10-24 14:42:08 -07:00
andrewvt
9a11c643da added removeFromGroupByCode() function to Member.php 
I was using the addToGroupByCode() function today and it would have been handy to have a removeFromGroupByCode() so I decided to add one.
 2013-10-24 16:57:00 -04:00
Mateusz Uzdowski
1a39f61598 BUG Fix the password reset message to be shown consistently. 
If we detect any of the password reset GET params, it's safe to assume
that someone intended a password reset, regardless of other conditions.
 2013-10-25 09:29:21 +13:00
Will Morgan
ceab35a0be Strict type check for null cache values 
Previously, generated cache results that returned 0, '', array() etc
were being ignored. This change narrows it down to just false.

Ideally we would use a EmptyCacheHit object to be very specific for
these cases, but perhaps this approach is a bit overkill.
 2013-10-24 18:01:20 +01:00
Ingo Schommer
dfabd54bdb Fixed support for single stage in Versioned 
This used to work in 2.4, so is considered a regression.
To test, simply add a Versioned("Stage") extension to
some record in 2.4 vs. 3.1.
 2013-10-24 17:09:17 +02:00
Ingo Schommer
723c4e3f4e Merge pull request #2522 from tractorcow/pulls/3.2-gridstate-api-fix 
API GridState_Data values can have default values specified during retrieval.
 2013-10-24 04:26:16 -07:00
Ingo Schommer
7cf8e65309 Merge pull request #2598 from halkyon/test_execution_error 
i18nSSLegacyAdapterTest setting wrong arguments for manifest.
 2013-10-24 04:24:19 -07:00
Ingo Schommer
2266d77237 Revert "Style destructive actions destructively" 
This reverts commit 3851ef9f2c.
Breaks button alignment in CMS.
 2013-10-24 11:37:40 +02:00
Damian Mooyman
415f8a04b2 API Change tracker allows explicit dirty messages 
BUG Fixed issue with UploadField not detecting changes
 2013-10-24 17:53:40 +13:00
Sean Harvey
e3542fead3 i18nSSLegacyAdapterTest setting wrong arguments for manifest. 
Currently if you run i18nSSLegacyAdapterTest twice in a row you
get errors about classes not existing, because the class manifest
doesn't get set correctly during the test setUp() method.
 2013-10-24 17:22:16 +13:00
Damian Mooyman
b6b3cd9889 API GridState_Data values can have default values specified during retrieval. 
Fixes issues with GridStata_Data being returned from various states when value types are necessary.
Pruning of dead code from GridFieldAddExistingAutocompleter
Documentation for GridState
 2013-10-24 16:15:33 +13:00
Ingo Schommer
5dadb5a74f Default UploadField to replace files 
Honours the $overwriteWarning setting, rather than warning
about overwritten files, and when that warning is acknowledged by the user,
create a new file instead. We need to set this as close to
the Upload->load() call as possible, since it depends
on non-deterministic config state.
 2013-10-23 23:07:53 +02:00
Ingo Schommer
ed6e45610f Merge pull request #2572 from Zauberfisch/api-getRemoteJoinField-enhancement-2570 
API: DataObject->getRemoteJoinField() no longer defaults to ParentID but throws an exception instead
 2013-10-23 13:59:37 -07:00
Ingo Schommer
739d591e45 Merge pull request #2558 from chillu/pulls/uploadfield-874 
HTML attr encoding for UploadField config
 2013-10-23 13:00:39 -07:00
Ingo Schommer
68888f9105 Merge pull request #2592 from kinglozzer/docs-localhost-urls 
Update docs to consistently use http://localhost/ (fixes #1919)
 2013-10-23 12:37:53 -07:00
Loz Calver
01746d175a Update docs to consistently use http://localhost/ (fixes #1919) 2013-10-23 20:24:52 +01:00
Ingo Schommer
40a6620668 Merge pull request #2591 from colymba/tinymce-contextmenu-off 
API TinyMCE contextmenu is disabled by default
 2013-10-23 10:59:43 -07:00
Ingo Schommer
d02df71680 Document how to enable TinyMCE context menu 
Required since https://github.com/silverstripe/silverstripe-framework/pull/2591
 2013-10-23 19:59:17 +02:00
Ingo Schommer
628b920ea7 Fixed merge error in MemberTest 2013-10-23 18:26:05 +02:00
colymba
dda1441cce API TinyMCE contextmenu is disabled by default 
Allows for built-in browser spell-check to be used
 2013-10-23 19:15:16 +03:00
Ingo Schommer
4d1dd1e6c0 Merge pull request #2589 from kinglozzer/2188-treedropdownfield-overflow 
FIX: Allow TreeDropdownField to open upwards (fixes #2188)
 2013-10-23 06:11:41 -07:00
Ingo Schommer
b56ca812dc Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	tests/security/MemberTest.php
 2013-10-23 14:53:29 +02:00
Loz Calver
e46bcf792c FIX: Allow TreeDropdownField to open upwards (fixes #2188) 2013-10-23 13:32:01 +01:00
Ingo Schommer
634f73c710 Merge pull request #2395 from ARNHOE/patch-1 
i18n documentation - added note for caching in multi language modules
 2013-10-23 03:02:06 -07:00
Ingo Schommer
d7e10e620a Merge pull request #2537 from wilr/membervalidator 
FIX: Use Injector API for managing Member_Validator instance.
 2013-10-23 03:01:15 -07:00
Ingo Schommer
943c369110 Merge pull request #2526 from clyonsEIS/3.1 
Add backwards compatibility for has_extension
 2013-10-23 02:35:00 -07:00
Ingo Schommer
3f479ad282 Merge pull request #2575 from dhensby/patch-2 
FIX #2496 `ConfirmedPasswordField` mismatch passwords saved
 2013-10-23 02:29:42 -07:00
Ingo Schommer
55729dfc27 Removed deprecated log/email logic from Debug (fixes #2573) 
Was deprecated in 2009 with a682ab9c0e,
and removed in 2012 with 9eca2d676f
 2013-10-23 11:22:34 +02:00
Ingo Schommer
3422761a41 Adjust UploadField edit form size 
Thanks @kinglozzer for getting this started.
Fixes https://github.com/silverstripe/silverstripe-cms/issues/878
Replaces https://github.com/silverstripe/silverstripe-framework/pull/2221
 2013-10-23 11:16:56 +02:00
Stephen Shkardoon
d2360ec8aa MINOR typo where display_errors wasn't checked properly 2013-10-23 22:00:05 +13:00
Ingo Schommer
0e37eaf5fa Merge pull request #2586 from ss23/3.0-staging-fix 
FIX: Move stage choosing into a pre-request filter.
 2013-10-23 01:47:57 -07:00
Ingo Schommer
6694fc5980 Merge pull request #2585 from ss23/3.1-staging-fix 
FIX: Move stage choosing into a pre-request filter.
 2013-10-23 01:47:41 -07:00
Ingo Schommer
14196fc6a3 Merge pull request #2577 from colymba/fix-cacheFilename 
image cacheFilename checks for numeric strings
 2013-10-23 01:37:00 -07:00
colymba
f89f203392 Raised minimum PHP Veresion to 5.3.3 2013-10-23 11:10:42 +03:00
colymba
46272ffb93 image cacheFilename checks for numeric strings 
using JSON_NUMERIC_CHECK json_encode flag and avoid duplicate files
creation
 2013-10-23 10:16:18 +03:00
Andrew Short
156bb87d57 FIX: Move stage choosing into a pre-request filter. 
This ensures that the correct stage is selected, even if the request
does not come through the model as controller system. This fixes an
issue where custom controllers would always be on the "Stage" stage.
 2013-10-23 18:29:13 +13:00
Andrew Short
e7c8fed6ab FIX: Move stage choosing into a pre-request filter. 
This ensures that the correct stage is selected, even if the request
does not come through the model as controller system. This fixes an
issue where custom controllers would always be on the "Stage" stage.
 2013-10-23 18:22:15 +13:00
Simon Welsh
699272a2e7 Merge pull request #2584 from ss23/patch-3 
MINOR typo where display_errors wasn't checked properly
 2013-10-22 20:34:33 -07:00
Stephen Shkardoon
696e6f65ab MINOR typo where display_errors wasn't checked properly 2013-10-23 16:32:31 +13:00
Ingo Schommer
ea5b3e4269 Merge pull request #2520 from wilr/destructivestyles 
Style destructive actions destructively
 2013-10-22 17:07:38 -07:00
Ingo Schommer
77696e207a Merge pull request #2557 from camspiers/template-parser-configurable 
Feature to allow changing the SSTemplateParser used in SSViewer
 2013-10-22 17:00:03 -07:00
Ingo Schommer
ad09d4297f Merge pull request #2582 from kinglozzer/2567-add-existing-gridfield-styling 
GridField 'Add existing' action styling improvements (fixes #2567)
 2013-10-22 11:54:17 -07:00
Ingo Schommer
6f02c5bd98 Email fluent API regression (fixes #2581) 2013-10-22 20:31:29 +02:00
Loz Calver
e9fdfb05b2 GridField 'Add existing' action styling improvements 2013-10-22 16:44:28 +01:00
Ingo Schommer
fad8926785 Better definition of "pre-release" branch in docs 2013-10-22 16:20:00 +02:00
Ingo Schommer
927dd6c606 Removed duplicate "quickfire" section in docs 2013-10-22 16:20:00 +02:00
Ingo Schommer
6f41b6fae6 Merge pull request #2566 from NicoHaase/master 
BUG: An enum field in the search panel model admin misses an option to not filter on that field
 2013-10-22 06:43:36 -07:00
Nico Haase
ab10c2ecdc BUG: An enum field in the search panel model admin misses an option to not filter on that field 2013-10-22 15:39:37 +02:00
Ingo Schommer
39efaca54f Disable "lost password" feature, breaks on "php -S" 
PHP's built-in webserver doesn't reliably expose SCRIPT_NAME,
see https://github.com/silverstripe/silverstripe-framework/issues/2580.
This breaks URL routing on /Security/passwordsent/admin%40test.com
 2013-10-22 15:26:20 +02:00