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,618 Commits 31 Branches 527 Tags 162 MiB
538f09b94f
Commit Graph

12618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
538f09b94f Merge pull request #2670 from sekjal/issue2669 
Fixes issue #2669
 2013-11-17 12:02:12 -08:00
Ian Walls
b906442a9c Fixes issue #2669 
Add local setName() function to DatetimeField, which also sets Name
on the constituent DateField, TimeField and timezoneField.
 2013-11-15 14:18:48 -05:00
Ingo Schommer
802b64db20 Merge pull request #2665 from dhensby/patch-1 
Making ConfigStaticManifest::parseStatic error more meaningful
 2013-11-13 06:09:27 -08:00
Daniel Hensby
be4ff501f7 Making ConfigStaticManifest::parseStatic error more meaningful 
The error thrown by `parseStatic` when there's an unexpected token is now more meaningful as it states the type of token that was encountered as well as the class that it was found in.
 2013-11-13 10:49:55 +00:00
Andrew Short
bedf292612 Merge branch '3.1' 
Conflicts:
	docs/en/reference/execution-pipeline.md
	lang/nl.yml
 2013-11-11 18:18:25 +11:00
Will Rossiter
7ace631499 Merge pull request #2648 from tractorcow/pulls/3.1-build-defaults 
BUG fix missing permission for dev/build/defaults
 2013-11-07 16:14:09 -08:00
Ingo Schommer
008bd97828 Added 3.1.2-rc1 changelog 2013-11-08 01:11:57 +01:00
Ingo Schommer
65844e1f86 Updated translations 2013-11-08 00:58:24 +01:00
Ingo Schommer
99abe16c21 Added 3.1.2 changelog 2013-11-08 00:42:28 +01:00
Damian Mooyman
640d5beb44 BUG fix missing permission for dev/build/defaults 2013-11-08 11:09:46 +13:00
Sean Harvey
48673346ad Merge pull request #2647 from chillu/pulls/2644-myprofile-layout 
admin/myprofile layout after validation (fixes #2644)
 2013-11-07 13:02:41 -08:00
Ingo Schommer
8286ba346e admin/myprofile layout after validation (fixes #2644) 
Broke because the <form> tag was returned, while
the client logic was expecting the whole <div> including the <form>.
Fixed to display the button bar at the bottom,
and tested with validation errors as well as switching from/to
the panel via ajax.
 2013-11-07 16:19:40 +01:00
Will Rossiter
62bb6f1be4 Merge pull request #2646 from mseymour/patch-1 
Fixed a few spelling mistakes and removing an extra 'w' in WAMP's documentroot path
 2013-11-07 00:51:48 -08:00
Mark Seymour
f059b7b200 Fixing spelling mistakes and knocking out an extra 'w' in WAMP's document root path. 2013-11-06 23:27:09 -04:00
Damian Mooyman
252b6e53ac Merge pull request #2641 from chillu/pulls/2638-uploadfield 
UploadField changeDetection optional (fixes #2638)
 2013-11-06 17:15:59 -08:00
Ingo Schommer
61f99fa1ef UploadField changeDetection optional (fixes #2638) 2013-11-06 23:34:29 +01:00
Ingo Schommer
9d550f8938 Fixed merge error 2013-11-06 09:46:30 +01:00
Ingo Schommer
91f6039eed Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	control/Director.php
 2013-11-05 10:15:40 +01:00
Hamish Friedlander
e161439340 Merge pull request #2470 from sunnysideup/patch-19 
more meaningful error message in ConfigStaticManifest.php (depth < 0)
 2013-11-04 17:58:10 -08:00
Sean Harvey
b5b8cb25e0 Merge pull request #2632 from chillu/pulls/versioned-docs 
FIX "Draft" stage to fix dev/build, Versioned docs (fixes #2619)
 2013-11-03 12:31:12 -08:00
Ingo Schommer
65b4407337 FIX "Draft" stage to fix dev/build, Versioned docs (fixes #2619) 2013-11-03 21:27:26 +01:00
Sean Harvey
70c23f37de Merge pull request #2608 from andrewvt/3.1 
added removeFromGroupByCode() function to Member.php
 2013-11-03 12:27:10 -08:00
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