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
11,419 Commits 31 Branches 527 Tags 162 MiB
c64b419f88
Commit Graph

11419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Naomi Guyer
be5eaf1353 BUG: Fix alignment of media button 2013-05-25 13:40:37 +12:00
Stephen Shkardoon
aa3699ff0a Deprecate magic_quotes and fix bad install opts 
Change the in_array call to not do bad things with strict casting off
Add a deprecated message if you run with magic_quotes on
Change the requirement for magic_quotes to an error
 2013-05-25 12:42:52 +12:00
Sean Harvey
53115d93c6 Merge pull request #1997 from chillu/pulls/1950-oembed-resize 
OEmbed resize on correct attrs (fixes #1950)
 2013-05-24 16:35:44 -07:00
Ingo Schommer
4aafe47fbb OEmbed resize on correct attrs (fixes #1950) 2013-05-25 01:26:34 +02:00
Ingo Schommer
016368afdc Merge pull request #1994 from mateusz/logout-cleanup 
BUG Clean up the logOut and session destructon routines.
 2013-05-24 16:01:42 -07:00
Ingo Schommer
b9b83a784c Merge pull request #1989 from dhensby/patch-environment-regression 
Regression due to previous patch
 2013-05-24 15:56:53 -07:00
Ingo Schommer
e6b0b327e5 Merge pull request #1988 from uniun/patch-3 
FIX: Form::set_current_action() never gets called.
 2013-05-24 15:53:23 -07:00
Ingo Schommer
afd93547fd Merge pull request #1986 from phptek/bug/099 
BUGFIX: Pages set as 'deletedindraft' were allowed to be published throu...
 2013-05-24 15:49:15 -07:00
Simon Welsh
5202e85217 Merge pull request #1995 from ss23/patch-2 
Fix misleading composer link
 2013-05-24 15:48:30 -07:00
Stephen Shkardoon
45462baff1 Fix misleading composer link 
Fix misleading composer link
 2013-05-25 10:41:56 +12:00
Will Rossiter
438066dc14 Merge pull request #1990 from JayDevlin/1971-text-contextsummary 
FIX #1971: Text->ContextSummary
 2013-05-24 15:19:48 -07:00
Will Rossiter
50936ee799 Merge pull request #1992 from jthomerson/fix_unsaved_relation_list_constructor 
FIX: UnsavedRelationList did not call its constructor
 2013-05-24 15:19:19 -07:00
Jeremy Thomerson
5512d7c0d0 FIX: UnsavedRelationList did not call its constructor 
This resulted in Object extensions not working for it, and methods not existing
where they should have.  It also resulted in poor error messages appearing when
thrown from Object since $this->class was empty since the constructor was never
called in Object.
 2013-05-24 21:14:45 +00:00
Devlin
edaf709783 FIX #1971: Check if the search term is set 2013-05-24 16:57:38 +02:00
Daniel Hensby
ac989cc3c0 Regression due to previous patch 
Fixing installer regression due to patch #1972
 2013-05-24 15:29:39 +01:00
uniun
5596442081 FIX: Form::set_current_action() never gets called. 2013-05-24 11:25:36 +03:00
Russell Michell
9741d1f63b BUGFIX: Pages set as 'deletedindraft' were allowed to be published through CMS batch-actions leaving an empty title in the SiteTree. 2013-05-24 15:40:46 +12:00
Sean Harvey
916de30204 Merge pull request #1980 from feejin/bugfix-ignore-underscored-themes 
FIX: exclude directory from available themes when underscore is first character
 2013-05-23 15:10:00 -07:00
Colin Richardson
b2934d7ebf FIX: exclude directory from available themes when underscore is first character 
Change FALSE to lowercase
 2013-05-23 16:49:35 +01:00
Tom Densham
d36fbfb1b2 BUGFIX: singleton('Group')->Members() fails 
Running Members() on a Group that has no Db record causes UnsavedRelationList to be returned by DirectMembers() which in turn causes alterDataQuery() to fall over when called on an UnsavedRelationList. This just adds a simple check to prevent it.
 2013-05-23 17:31:19 +02:00