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
12,238 Commits 31 Branches 527 Tags 162 MiB
07b15db3eb
Commit Graph

12238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean Harvey
07b15db3eb Allow ASSETS_PATH to be overridden like ASSETS_PATH (via jthomerson) 2013-11-01 11:27:03 +13:00
Damian Mooyman
fbf64c8c48 Merge pull request #2603 from chillu/pulls/htmleditor-upload-replace 
Default UploadField to replace files
 2013-10-31 15:25:22 -07:00
Sean Harvey
65fca4b1c5 Merge pull request #2565 from colymba/progressive-images 
NEW GDBackend can save interlaced images
 2013-10-31 15:02:03 -07:00
Sean Harvey
631d313d66 Merge pull request #2630 from chillu/pulls/uploadfield-id 
Conditionally send "ID" val in UploadField
 2013-10-31 14:48:18 -07:00
Ingo Schommer
fe6cc6e36e Conditionally send "ID" val in UploadField 
The "ID" form field is not always defined,
for example in the "Replace" tab of the "versionedfiles" module
(which uses GridFieldDetailForm). Since the path to that
detail form relies on the "ID" in AssetAdmin->currentPageID(),
and does an is_numeric() check to support the "root" folder,
we need to leave the "ID" param out completely.

Checked this without versionedfiles module in admin/assets
as well as a custom UploadField in CMSMain.
 2013-10-31 21:38:39 +01:00
Ingo Schommer
d445c7e369 Merge pull request #2620 from kinglozzer/patch-2 
Set default encoding for compass
 2013-10-30 09:36:46 -07:00
Loz Calver
5a74a2e4e1 Set default encoding for compass 
See https://github.com/haml/haml/issues/269. Seems that OS X Mavericks causes this to occur, even when system default is set to utf-8.

Force encoding in admin scss as well
 2013-10-30 16:11:11 +00:00
Ingo Schommer
23942e4782 Merge pull request #2624 from JayDevlin/bad-redirect-in-changepasswordform 
Bad redirect in ChangePasswordForm->doChangePassword()
 2013-10-30 09:08:13 -07:00
Devlin
6c6ab7b0ce Bad redirect in ChangePasswordForm->doChangePassword() 2013-10-30 09:57:28 +01:00
Ingo Schommer
ba1e688729 Merge pull request #2621 from tractorcow/pulls/3.1-undefined-index 
BUG Fix undefined index ID
 2013-10-29 15:26:34 -07:00
Damian Mooyman
22f5f4d644 BUG Fix undefined index ID 2013-10-30 10:34:09 +13:00
Will Rossiter
a0b7bfc7a5 Merge pull request #2604 from chillu/pulls/versioned-single-stage 
Fixed support for single stage in Versioned
 2013-10-29 01:40:40 -07:00
Simon Welsh
60bb9d81c5 Merge pull request #2411 from simonwelsh/circ_ref 
Revert "Merge pull request #2390 from phptek/2389"
 2013-10-28 14:05:13 -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
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
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
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
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
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
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
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
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
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
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
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
Ingo Schommer
d9aa7acfbd Merge pull request #2578 from JayDevlin/fix-session-get_timeout 
BUG Session::get_timeout()
 2013-10-22 05:56:29 -07:00
Devlin
112e08e5f2 FIX Session::get_timeout 2013-10-22 14:20:18 +02:00
Ingo Schommer
f2d362b629 Merge pull request #2576 from halkyon/fulltextsearch_test 
FulltextSearchableTest doesn't clean up after itself.
 2013-10-22 01:56:29 -07:00
Sean Harvey
acaf0e40cc FulltextSearchableTest doesn't clean up after itself. 
The extension doesn't get unloaded correctly at the end of the test,
resulting in tests afterwards sometimes failing because the table
type is reset back to InnoDB.

See silverstripe/silverstripe-cms ed8ee4e9b for a similar fix done
in the cms module.
 2013-10-22 17:52:51 +13:00
mandrew
56d7c1fde2 Behat tests for lost password 2013-10-22 00:06:36 +02:00
Daniel Hensby
2a6f1f1949 FIX #2496 ConfirmedPasswordField mismatch passwords saved 
Fixes #2496

Also fixes another issue where 'Password' is hard coded as field name in `validate()`
 2013-10-21 22:27:41 +01:00