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,155 Commits 31 Branches 527 Tags 162 MiB
a67f853d7f
Commit Graph

13155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Rossiter
4e79159969 Merge pull request #2634 from pine3ree/patch-1 
make setHeadingLevel a chainable method
 2013-11-01 17:29:28 -07:00
Maks Feltrin
0e05353efc make setHeadingLevel a chainable method 2013-11-02 01:21:56 +01:00
Ingo Schommer
90017821a1 Merge pull request #2628 from chillu/pulls/remove-tinymce-chancedetection 
Remove TinyMCE change detection on insert (breaks IE8)
 2013-11-01 04:24:16 -07:00
andrewvt
953dec8863 Updated group filter 
Updated group filter
 2013-11-01 07:22:13 -04:00
Ingo Schommer
adccda35aa Merge pull request #2609 from chillu/pulls/js-i18n-3.1 
API JS i18n files with short locale names, generated by build task
 2013-11-01 04:15:17 -07:00
Ingo Schommer
c1a655792d Merge pull request #2631 from halkyon/installer_temp_folder 
Use getTempFolder() from core when checking for temp in installer.
 2013-11-01 01:17:26 -07:00
andrewvt
389bdb4ddf Added a unit test for removeFromGroupByCode() 
Added a unit test for removeFromGroupByCode()
 2013-10-31 22:05:13 -04:00
Sean Harvey
8e36290b56 Merge pull request #2205 from jthomerson/pulls/fix_gridfield_class_name 
FIX: wrong class name being returned
 2013-10-31 18:19:05 -07:00
Sean Harvey
fd2e7c1dd3 Use getTempFolder() from core when checking for temp in installer. 
Fix for issue #2420. Instead of using custom temp folder discovery
code in the installer, use the core getTempFolder() instead.
 2013-11-01 13:53:53 +13:00
Sean Harvey
d8f29fcc04 Merge pull request #2236 from chillu/pulls/isdev-infinite-loop 
FIX Avoid infinite loops on ?isDev=1 and Deprecation class
 2013-10-31 15:59:31 -07:00
Sean Harvey
42fa4d6005 Merge pull request #2574 from dhensby/patch-1 
Allowing chaining on `PasswordValidator`
 2013-10-31 15:54:18 -07:00
Sean Harvey
1951fdba0f Merge pull request #2225 from tractorcow/3.1-hasmany-delete-fix 
BUG Fixes issue with HasManyList::remove
 2013-10-31 15:52:07 -07:00
Damian Mooyman
c74f7e7640 BUG Fixes issue where items could be deleted from a has_many relation by an entirely unrelated HasManyList calling delete on that item. 2013-11-01 11:39:13 +13:00
Ingo Schommer
c547e426dd Merge pull request #2599 from tractorcow/pulls/3.1-uploadfield-formchanged 
BUG / API - Change tracking for UploadField
 2013-10-31 15:28:34 -07:00
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
3b8fb42654 Remove TinyMCE change detection on insert (breaks IE8) 
The detection is triggered on first load, and in IE8 the
inserted value doesn't equal the value already in the textarea field.
That's possibly due to whitespace or encoding differences,
but they have the same character length.

Tried fixing this by whitespace removal, didn't work:
if((original || '').replace(/[\s\t\n\r]/g, '') != (value || '').replace(/[\s\t\n\r]/g, '')) {

In the end, we're already detecting changes through a 5s interval
triggering the save() method on the editor if the field is focused.
The impact of this removal is that after inserting an image,
it'll take a few seconds for the change detection to kick in
(and thus highlight the "save" button and ask for confirmation
when navigating away without saving).

See d12ae82f70 for context.
 2013-10-31 14:40:28 +01:00
Ingo Schommer
2575450cc5 Added "be inclusive" sentence to contrib docs 2013-10-30 23:33:42 +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
Ingo Schommer
5b5f98a6fa Merge pull request #2625 from colymba/mysqli-backtrace-filtering 
BUG backtrace now filters MySQLi arguments
 2013-10-30 08:00:18 -07:00
colymba
4131f574fd BUG backtrace now filters MySQLi arguments 
Add MySQLi functions mysqli() and select_db() to the list of filtered
function arguments to avoid exposing sensitive data
 2013-10-30 12:36:07 +02:00
Devlin
6c6ab7b0ce Bad redirect in ChangePasswordForm->doChangePassword() 2013-10-30 09:57:28 +01:00
Will Rossiter
9633f49aaf Merge pull request #2612 from AlphaCactus/patch-1 
Replace new *Field with *Field::create()
 2013-10-29 23:15:05 -07:00
Will Rossiter
1a3a716352 Merge pull request #2623 from tractorcow/pulls/3.2-form-naming-fixes 
BUG 3.2 Issues with CMSForm not consistently respecting new form naming scheme
 2013-10-29 22:26:57 -07:00
Damian Mooyman
4102cc64a0 BUG Issues with CMSForm not consistently respecting new form naming scheme. 
Fixes for failing CMSFormTest cases
 2013-10-30 17:08:31 +13: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
Ingo Schommer
328a98dd25 Note about API changes on master 2013-10-28 21:01:12 +01:00
Tony Air
8343e77803 BUG onDemand plugin fixture 
Added trim() to decodePath function. Headers X-Include-* comes with a
space so some files are loaded twice. Looks like that depends on a
webserver. nginx has the space.
 2013-10-27 08:24:14 +07:00
Will Rossiter
e6cdf09519 Merge pull request #2611 from chillu/pulls/house-rules 
Written up some "House Rules" for the community, but particularly for the core team.
 2013-10-25 17:28:35 -07:00
AlphaCactus
133c6dd089 Replace some new *Field with *Field::create() 
Specifically intended to change new TreeDropdownField with TreeDropdownField::create but also replaced a few others as well.  This allows class replacement of TreeDropdownField in order to extend its functionality without having to override HTMLEditorField.
 2013-10-25 12:49:41 -07:00
Ingo Schommer
f65629ab73 "House rules" docs 2013-10-25 12:49:51 +02:00
Ingo Schommer
2c145cd454 API JS i18n files with short locale names, generated by build task 
The files are uploaded to transifex.com now, which means we needed
to consolidate the file names (= locales). Since Transifex doesn't allow
arbitrary JavaScript structures, we're using an intermediary JSON
format which gets transformed into the JS used by the framework.

See b59f3858af for generator logic.

Fixes https://github.com/silverstripe/silverstripe-framework/issues/2499
 2013-10-25 12:05:46 +02:00
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