tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-20 02:13:52 +02:00
Code Issues Projects Releases Wiki Activity
11,464 Commits 29 Branches 519 Tags 147 MiB
5d97f615ce
Commit Graph

11464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
5d97f615ce Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-31 17:52:24 +02:00
Sean Harvey
9511d72aa9 Merge pull request #2040 from sminnee/session-timeout-fixes 
Session timeout fixes
 2013-05-30 21:36:08 -07:00
Sam Minnee
4548b67538 NEW: Add LeftAndMain.session_keepalive_ping config option. 
The Session-keepalive ping that is built into LeftAndMain (i.e. all of the CMS admin) can now be
turned off.  The main reason you would want to do this is if you have enabled Session.timeout,
and you want users to be locked out of the CMS after a period.
 2013-05-31 16:27:30 +12:00
Sam Minnee
f2c918dc45 FIX: Make session timeout inactive-time only. 
By default, the Session.timeout configuration option specifies the total
session time, regardless of the amount of activity.  This change means
that the timeout specifies how long without any further dynamic requests
before the session cookie expires.

The way it does this is to re-set the session cookie expiry with a
subsequent Set-Cookie command each time a request that necessitates
a session is called.

Strictly speaking, it's a change in session timeout semantics, but I think
it's a good one, because total-session-time-regardless-of-activity is a
stupid timeout to include, and has more to do with the mechanics of the
internet than with application security requirements.
 2013-05-31 16:26:04 +12:00
Simon Welsh
87694b7f72 Merge pull request #2034 from kinglozzer/1942-stringfield-newlines 
FIX: Convert newlines to <br /> tags in string fields (fixes #1942)
 2013-05-30 01:45:17 -07:00
Loz Calver
4a158454d6 FIX: Convert newlines to <br /> tags in string fields (fixes #1942) 2013-05-30 09:26:58 +01:00
Sean Harvey
1c7b4a0cab Merge pull request #2033 from sminnee/better-no-db-error 
NEW: More helpful message for 'sake dev/build' on new envs.
 2013-05-29 21:57:29 -07:00
Sam Minnee
f1e567eb93 NEW: More helpful message for 'sake dev/build' on new envs. 
This change alters the no-db message on cli execution to give a bit more of a helpful set-up instruction.
The main motivation for this is so that composer can be set to run dev/build on post-install and post-update.

With that feature added, this will ensure that users installing with composer create-project won't be left
in the dark.

An improvement on this would be a shell script that interactively asked for details to populate this file
with, but one step at a time.
 2013-05-30 16:49:43 +12:00
Sean Harvey
a29c51d2db Merge pull request #2032 from phptek/bug/revert-9741d1 
BUGFIX: Removed regression introduced in 9741d1.
 2013-05-29 21:13:22 -07:00
Russell Michell
b154c0f0e7 BUGFIX: Removed regression introduced in 9741d1. With the former in place, CMS authors can no longer perform batch publish actions 2013-05-30 16:05:56 +12:00
Ingo Schommer
1ffbbb5377 Merge pull request #2029 from nedmas/patch-2 
FIX: Add missing 'groupby' method
 2013-05-29 14:30:04 -07:00
Tom Densham
3290511141 FIX: Add missing 'groupby' and remove redundant conditional in 'having' 2013-05-29 22:19:39 +01:00
Che Van Lawrence
657c2033ae Improve docs (mostly spelling) 2013-05-29 18:23:25 +02:00
Ingo Schommer
fbfcb6d8aa New video formats in allowed_extensions 
See https://github.com/silverstripe/silverstripe-installer/pull/41
 2013-05-29 18:22:47 +02:00
Ingo Schommer
a5b1a566d2 Merge pull request #2017 from tractorcow/3.1-classname-test-fix 
BUG Fixed major issue with testing dataobjects that implement TestOnly
 2013-05-29 08:39:53 -07:00
Ingo Schommer
77d65ba761 Fixed UploadField width (same as textual fields) 
Was getting too wide due to padding which isn't applied
to other fields (e.g. TextField)
 2013-05-29 17:25:46 +02:00
Ingo Schommer
4b21f9f6ad Merge branch '3.1-uploadfield-enhancement' of git://github.com/tractorcow/sapphire into tractorcow-3.1-uploadfield-enhancement 2013-05-29 17:11:15 +02:00
Ingo Schommer
bd918915e2 Merge pull request #2023 from g4b0/left-and-main-classes 
BUG: correct handling of multiple classes
 2013-05-29 07:23:26 -07:00
Sean Harvey
41faaec2d7 Merge pull request #2025 from dhensby/patch-1 
FIX Making path names consistent
 2013-05-28 14:08:10 -07:00
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