tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-05 10:59:35 +02:00
Code Issues Projects Releases Wiki Activity
11,645 Commits 29 Branches 517 Tags 147 MiB
1edf45fbed
Commit Graph

11645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean Harvey
0c0e7a49ff Merge pull request #2024 from kinglozzer/leftandmain-themedcss-fix 
Fixes for LeftAndMain::require_themed_css()
 2013-05-28 14:04:59 -07:00
Daniel Hensby
295f76e331 FIX Making path names consistent 
I've changed the variables to use the absolute path as the path is unhelpful for debugging and this is more consistent with the other lines of code below
 2013-05-28 19:08:59 +02:00
Loz Calver
9be5f07231 Fixes for LeftAndMain::require_themed_css() 
LeftAndMain::require_themed_css() was setting an incorrect property, and a typo meant that those requirements would never be detected anyway
 2013-05-28 15:48:23 +01:00
g4b0
9fc58feb03 BUG: correct handling of multiple classes 2013-05-28 16:25:25 +02:00
Sean Harvey
80bcf5e713 Merge pull request #2020 from halkyon/uploadfield_missing_end_tags 
BUG Fixing missing </div> and </button> in UploadField_uploadtemplate
 2013-05-27 15:45:43 -07:00
Sean Harvey
f19ac42951 BUG Fixing missing </div> and </button> in UploadField_uploadtemplate 2013-05-27 22:40:22 +12:00
Damian Mooyman
0ee79d43db BUG Fixed major issue with testing dataobjects that implement TestOnly and extend non-TestOnly dataobjects. Database regeneration would incorrectly populate the ClassName column 2013-05-27 16:39:57 +12:00
Damian Mooyman
163917b83e Fixed scrutiniser issues 2013-05-27 15:42:10 +12:00
Damian Mooyman
7f057ce343 API UploadField functions on new records 
Fixed regression from 1e5d40474d (UploadField::canPreviewFolder).
Merged in pull request #2009 - (6018bdd631).
Merged pull request #1259 (34bfc862ee).
 2013-05-27 15:22:59 +12:00
Sean Harvey
2b9a44ef67 Merge pull request #2016 from mateusz/preview-trigger 
Add explicit extension trigger to preview iframe updates.
 2013-05-25 18:06:47 -07:00
Mateusz Uzdowski
37d6871c15 Add explicit extension trigger to preview iframe updates. 2013-05-26 12:51:25 +12:00
Sean Harvey
30063f0f7b Merge pull request #2014 from chillu/pulls/445-tree-statusflags 
Avoid collision of status flags in tree items when updating tree nodes
 2013-05-25 17:11:28 -07:00
Ingo Schommer
67d1327b90 Avoid collision of status flags in tree items when updating tree nodes 
Fixes silverstripe/silverstripe-cms#445
See https://github.com/silverstripe/silverstripe-framework/pull/1996
Thanks to Jean-Fabien for getting this started
 2013-05-25 11:27:50 +02:00
Ingo Schommer
6f2ba3fcac Merge pull request #2009 from sminnee/uploadfield-choose-new-file 
NEW 'Choose another file' button on upload field AAS-917
 2013-05-25 01:55:26 -07:00
Simon Welsh
e90012787d Merge branch 'hackfest_may_2013' of https://github.com/NightJar/sapphire into 3.1 
Conflicts:
	docs/en/changelogs/3.1.0.md
 2013-05-25 20:07:54 +12:00
Nightjar
5ec8158977 Check that Webserver is not Apache/1.x in light of installer assets/.htaccess alterations 2013-05-25 20:03:36 +12:00
Stephen Shkardoon
5e5b892043 Note for magic quotes change 2013-05-25 20:02:51 +12:00
Simon Welsh
c64b419f88 Merge pull request #2010 from ss23/fix-1892-session 
Fix #1892 - Stop session hijacking with UA check
 2013-05-25 00:49:24 -07:00
Stephen Shkardoon
d6c2c2e07f Fixes #1892 - Stop session hijacking with UA check 2013-05-25 19:29:08 +12:00
Sam Minnee
34bfc862ee Merge commit '22c7bbf' into 3.1 2013-05-25 19:07:37 +12:00
Sam Minnée
00e09f1493 Update commandline.md 2013-05-25 19:07:17 +12:00
Julian Seidenberg
22c7bbfcd4 NEW UploadField displays a warning before overwriting files (only relevant if config.yml: Upload:replaceFile = true). 2013-05-25 19:07:06 +12:00
Sam Minnée
5bbe48b799 Update commandline.md 2013-05-25 18:54:54 +12:00
Sam Minnée
99275ea783 Merge pull request #1760 from jedateach/patch-3 
CommandLine: Info about running regular tasks with cron
 2013-05-24 23:53:45 -07:00
Sam Minnée
f6fbd78cd9 Merge pull request #1786 from colymba/3.0-htaccess-fix 
vendor folder is blocked only if outside themes
 2013-05-24 23:50:41 -07:00
Sam Minnée
72fd984bf6 Merge pull request #2007 from adrexia/extraclass-on-media 
BUG: Classes applied to media are too generic to use
 2013-05-24 23:46:28 -07:00
Will Rossiter
f300e63f9f Merge pull request #2008 from adrexia/upload-tree 
BUG: Fix select from files treedropdown
 2013-05-24 23:38:15 -07:00
jean
6018bdd631 NEW 'Choose another file' button on upload field AAS-917 2013-05-25 18:38:02 +12:00
Naomi Guyer
60cad991dc BUG: Fix select from files treedropdown 2013-05-25 18:25:38 +12:00
Will Rossiter
2d8812dbd2 Merge pull request #2001 from adrexia/asset-upload 
BUG: Display of AssetUpload upload fields
 2013-05-24 23:17:25 -07:00
Naomi Guyer
8235afc3b7 BUG: Display of AssetUpload upload fields 
* Replaced file upload icon
* Fixed padding
* Replaced width of droparea with min-width
 2013-05-25 18:01:07 +12:00
Will Rossiter
9273df15ff Merge pull request #2003 from edlinklater/641-insert_link_styling 
Formatting tweaks, fixes silverstripe/silverstripe-cms#641
 2013-05-24 23:00:05 -07:00
Naomi Guyer
203cfa225e BUG: Classes applied to media are too generic to use 
* Added a surrounding media class to media to make it easier to style
without risking using .left, .right et al alone.
 2013-05-25 17:29:25 +12:00
Simon Welsh
ac3553deb4 Merge pull request #2006 from ss23/patch-4 
Fix return the member ID for logInWithPermission
 2013-05-24 22:18:08 -07:00
Stephen Shkardoon
ab224a0e1c Fix return the member ID for logInWithPermission 
Will now return the ID, as per the doc-block comment
 2013-05-25 17:16:10 +12:00
Will Rossiter
d31fa7eb1b Merge pull request #2004 from adrexia/logout-button 
Replace logout button with a more commonly used symbol
 2013-05-24 21:57:36 -07:00
Naomi Guyer
c445997f32 Replace logout button with a more commonly used symbol 
* Power icon swapped for door icon
* Minor hover/focus opacity effect added to button
 2013-05-25 16:45:49 +12:00
Ed Linklater
98ba6b331c Formatting tweaks, fixes silverstripe/silverstripe-cms#641 2013-05-25 15:54:49 +12:00
Sam Minnée
83be513f91 Merge pull request #1816 from silverstripe-rebelalliance/bug/emptyrules 
FIX Allow Director::$rules like //$Action
 2013-05-24 20:38:43 -07:00
Simon Erkelens
513270ca48 API: Allow array of fields passed to FieldList::removeByName() 
Supports passing an array to removeByName(), which is iterate and then removed. Useful for removing fields from a fieldlist that are not on a tab. Similar to removeFieldsFromTab();
This is cleaner than a new function.
 2013-05-25 15:31:30 +12:00
Sam Minnée
eedcacb256 Merge pull request #2000 from wilr/1640 
FIX: IE8 does not bubble reset form events (Fixes #1640)
 2013-05-24 19:51:20 -07:00
Sam Minnée
c26ddee191 Merge pull request #1861 from raket/dataobject-update-orphan 
Fix: Orphaned records when running DataObject::update
 2013-05-24 19:48:48 -07:00
Sam Minnée
370a07aef2 Merge pull request #1978 from kinglozzer/1783-uninitialised-tabs 
FIX: Attempting to select uninitialised tab on validation error (fixes #1783)
 2013-05-24 19:46:40 -07:00
Sam Minnée
628391e3f1 Merge pull request #1979 from nedmas/patch-1 
BUGFIX: singleton('Group')->Members() fails
 2013-05-24 19:45:54 -07:00
Sam Minnée
51c4992a98 Merge pull request #1982 from chillu/pulls/gridfield-filter-cols 
BUG GridFieldFilterHeader works without non-filterable cols
 2013-05-24 19:45:28 -07:00
Jeremy Thomerson
071d5b6fa0 FIX: error message doesn't always include class name 
When a method was not found on UnsavedRelationList I was getting the following error:
Object->__call(): the method 'nameOfMethod' does not exist on ''
(nameOfMethod has been replaced here since it was a method I added via an extension)
 2013-05-25 14:43:40 +12:00
Will Rossiter
d540c443bc FIX: IE8 does not bubble reset form events. Use click handler for reset button. (Fixes #1640) 2013-05-25 14:12:44 +12:00
Sam Minnée
71e348c7af Merge pull request #1998 from ss23/magic_quotes-deprecation 
Deprecate magic_quotes and fix bad install opts
 2013-05-24 19:11:56 -07:00
Sam Minnée
5a114b84c8 Merge pull request #1811 from uniun/fix-dropzone-title 
FIX: Longer dropzone title wraps to two lines
 2013-05-24 19:08:11 -07:00
Sean Harvey
3b0e9909b8 Merge pull request #1999 from adrexia/media-button 
BUG: Fix alignment of media button
 2013-05-24 18:47:06 -07:00