Commit Graph

11724 Commits

Author SHA1 Message Date
Ingo Schommer
d95f8a87ac Merge pull request #2112 from willmorgan/master
MINOR Using Injector pattern for ValidationResult in Member
2013-06-18 09:36:11 -07:00
Ingo Schommer
37cfcd596d Merge pull request #2110 from CheeseSucker/patch-3
Fixed a markdown issue
2013-06-18 09:35:20 -07:00
Will Morgan
db3eed1f9a Using Injector pattern for ValidationResult in Member 2013-06-18 15:49:58 +01:00
CheeseSucker
b0615cdc5f Fixed a markdown issue
Maybe a bug in SS markdown?

The old code generated:
<a href="(faulty-link)">assertEmailSent</a>
<code>which can simulate sending emails through the</code>Email-&gt;send()` API

Instead of the expected:
<code><a href="(good-link)">assertEmailSent</a></code>
which can simulate sending emails through the <code>Email-&gt;send()</code> API

faulty-link = http://api.silverstripe.org/search/lookup/?q=SapphireTest->assertEmailSent(&version=trunk&module=framework)

good-link: http://api.silverstripe.org/search/lookup/?q=SapphireTest->assertEmailSent()&version=trunk&module=framework
2013-06-18 14:28:12 +02:00
Ingo Schommer
9a95db1998 Merge pull request #2097 from CheeseSucker/patch-1
Fixed a few documentation issues I've stumbled upon.
2013-06-15 00:14:38 -07:00
CheeseSucker
89a272b291 [MINOR] Changed so that ä is displayed as &auml; as intended by author. 2013-06-15 02:23:01 +03:00
CheeseSucker
9b881e5f92 [MINOR] build -> built 2013-06-15 02:19:29 +03:00
CheeseSucker
23cd824426 Rewrote a nonsensical paragraph about rewriting. 2013-06-15 02:18:01 +03:00
CheeseSucker
40ef812861 [MINOR] Fixed a markup error. 2013-06-15 00:58:45 +02:00
CheeseSucker
c4408163ee Should fix an issue where the .htaccess file was split into several <pre> tags.
This error is not reproducible by the github preview tab, so I am not 100% sure it is fixed. Added whitespace on the empty lines.
2013-06-15 00:57:29 +02:00
CheeseSucker
9c6b58d206 Fixed typo. 2013-06-15 00:28:02 +02:00
Ingo Schommer
bf788c4bab Merge pull request #2022 from willmorgan/patch-2
Allow canCreate to be extended via Object->extend
2013-06-13 11:19:00 -07:00
Will Rossiter
2814e43568 Merge pull request #2056 from willmorgan/dataobj-validate-injector
NEW use Injector pattern to create ValidationResult in validate
2013-06-03 15:55:19 -07:00
Will Morgan
2a91d27ccb NEW use Injector pattern to create ValidationResult in validate
helps for custom validation implementations
2013-06-03 17:12:58 +02:00
Ingo Schommer
0ecec24688 Merge remote-tracking branch 'origin/3.1' 2013-06-02 23:31:09 +02: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
f855c146d5 Merge remote-tracking branch 'origin/3.1' 2013-06-02 20:25:32 +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
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
82401b561d Fixed UploadFieldTest to work with new FormField holder IDs 2013-05-31 20:35:31 +02:00
Ingo Schommer
0c4ec4708b API Using $HolderID for form field container templates
Replaces duplicate $ID usage.
See https://github.com/silverstripe/silverstripe-framework/pull/1873
2013-05-31 19:46:11 +02:00
Ingo Schommer
5a1d476e8d Merge branch 'idvalidattr' of git://github.com/wilr/sapphire into wilr-idvalidattr 2013-05-31 19:27:19 +02:00
Ingo Schommer
88536998b9 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
2013-05-31 18:08:59 +02:00
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
Will Rossiter
4921173209 Code formatting 2013-05-30 21:06:54 +12:00
Will Rossiter
c7468caeb6 FIX: Generate Form::FormName() through 2013-05-30 21:06:41 +12:00
Will Rossiter
5acf2aab94 Use the new form ID selectors for FormTest 2013-05-30 21:05:39 +12:00
Will Rossiter
41974b9632 MoneyTest_Subclass::$db needs to be private. 2013-05-30 21:05:03 +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
f2460e018c Merge pull request #2030 from oddnoc/form-submission-method-case-fix
Use upper case to represent HTTP methods for forms
2013-05-29 23:15:04 -07: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
Will Morgan
a307753886 Using extendedCan for can* 2013-05-29 11:12:02 +01:00