Ingo Schommer
4603378e00
Behat: Fixed step notation
2013-06-06 15:26:50 +02:00
Ingo Schommer
7791f20f49
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
2013-06-05 15:17:06 +02:00
Ingo Schommer
1d01347fd3
Behat: Use explicit fixtures
2013-06-05 14:32:42 +02:00
Ingo Schommer
f8b1c08c67
Behat: Copy fixture identifier to "Name" or "Title" by default
...
This makes fixture setup less verbose, particularly for behat
tests (e.g. with "Given a page 'About Us'")
2013-06-05 14:32:42 +02:00
Ingo Schommer
bb92e494d7
Behat fixture refactoring (shared factory instance)
2013-06-05 14:32:42 +02:00
Ingo Schommer
a9ed6b34cb
Behat: Support for TreeDropdownField
2013-06-05 14:32:42 +02:00
Ingo Schommer
a39adb46db
Behat: New fixture notation in "manage files" tests
2013-06-05 14:32:41 +02:00
Will Rossiter
358988e9c6
Merge pull request #2059 from adrexia/batch-actions
...
Batch actions styling
2013-06-03 19:14:13 -07:00
Will Rossiter
cc7a6eeaed
Merge pull request #2060 from adrexia/preview
...
Preview Background styling
2013-06-03 19:00:02 -07:00
Will Rossiter
4286e4e6ec
Merge pull request #2058 from adrexia/filter-panel
...
Filter notice styling and panel adjustments
2013-06-03 18:59:10 -07:00
Naomi Guyer
aaa8bf0029
Preview Background styling
...
* Added background color to preview for sites that don't have a
background color (based on @clarkepaul's commit:
https://github.com/silverstripe-droptables/sapphire/commit/7750c8f75fc4a
764b384c6e19dbe543c4811cdcb)
2013-06-04 12:57:09 +12:00
Naomi Guyer
91605ca8ad
Batch actions styling
...
* Removed cog icon (usually associated with settings), and tidied up
padding (based on @clarkepaul's commit:
https://github.com/silverstripe-droptables/sapphire/commit/b09cd5f7f8e73
4df1f7ca0d387a5b97a03a3b604)
2013-06-04 12:48:51 +12:00
Naomi Guyer
01e7bfb350
Filter notice styling and panel adjustments
...
* Based on @clarkepaul's commit here:
https://github.com/silverstripe-droptables/sapphire/commit/e5de6c06489f3
449ee8131bf4ee2a4e1b2380bee
* Kept margin adjustments, but avoided implementing tab changes, as
tabs have chnaged a lot since original commit
2013-06-04 12:11:05 +12:00
Ingo Schommer
e137d9e2f0
Merge pull request #2039 from g4b0/sitetree-edit-disabled
...
BUG: fixed "regression" adding a new class to SiteTree elem (edit-disabled)
2013-06-03 04:46:48 -07:00
Ingo Schommer
d5510f54b3
Merge pull request #2041 from Mark-M/patch-1
...
FIX Deprecation $manifest not in global scope
2013-06-03 00:30:26 -07:00
Ingo Schommer
fa66593960
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-06-03 00:19:43 +02:00
Ingo Schommer
95a206290f
Updated translations
2013-06-03 00:07:59 +02:00
Ingo Schommer
f5f2864024
Merge pull request #2046 from wilr/leftandmain_requirements
...
FIX LeftAndMain::extra_requirements to accept non associative arrays.
2013-06-02 14:35:40 -07:00
Ingo Schommer
857af16b5b
Fixed injector usage in i18nTextCollector
...
Using singleton, which causes master strings to be cached
between modules with merge=true. Regression from a3c406e4d2
2013-06-02 23:30:33 +02:00
Ingo Schommer
a3c406e4d2
NEW Merge i18nTextCollector with existing ( fixes #1838 )
...
This is a necessity for any further 3.1 pushes of master files to getlocalization.
Because we'd otherwise remove existing master strings for CTF etc,
which means we can no longer backport new translations to 3.0
(and there's no way for users to contribute translations to 3.0 via getlocalization).
It's still a very monolithic class, but at least I've refactored it to return
all collected strings without writing it to files (for easier testing).
2013-06-02 20:17:28 +02:00
Will Rossiter
e1b1fce31f
Doc cleanup (spelling, line length, grammar)
2013-06-02 13:38:10 +12:00
Will Rossiter
db85f3ca16
FIX extra_requirements to accept non associative arrays.
...
Added unit tests for extra_requirements_js and extra_requirements_css.
Fixed YAML documentation to indicate list syntax.
2013-06-02 13:37:34 +12:00
Sean Harvey
1cebfc5d51
Revert "FIX make augmentSQL API consistent for strict PHP"
...
This reverts commit ab40dcc0ca
2013-06-01 11:51:01 +12:00
Sean Harvey
f5b6c55245
Updating FileTest to use the correct shortcode format with commas
2013-06-01 11:25:10 +12:00
Ingo Schommer
8da41f4250
Merge pull request #2042 from jthomerson/fix_augment_sql_api
...
FIX make augmentSQL API consistent for strict PHP
2013-05-31 14:22:46 -07:00
Jeremy Thomerson
ab40dcc0ca
FIX make augmentSQL API consistent for strict PHP
...
This references silverstripe/silverstripe-translatable#113
For that issue, we needed to have the DataQuery as the second parameter to
DataQuery's augmentSQL call. Fortunately, DataQuery was already passing this
argument. However, where the function was defined in DataExtension, the
argument was not present. Thus, subclasses of DataExtension could not add the
parameter to their function signature if they were running in PHP strict mode
because PHP will complain that the signatures don't match.
2013-05-31 19:24:12 +00:00
Ingo Schommer
5d97f615ce
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-05-31 17:52:24 +02:00
Mark-M
1a19e27bd0
FIX Deprecation $manifest not in global scope
...
$manifest is not in the global scope, patched it to use SS_ClassLoader to get the manifest instead.
2013-05-31 15:32:10 +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
g4b0
7bcaf90e2a
BUG: fixed "regression" inserted with 9281ebc64764a58f86f685f9765e1d8b60995e5a adding a new class to SiteTree elem (edit-disabled)
2013-05-30 17:09:34 +02: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
