Will Rossiter
f6cd582dd9
FIX: Remove version field from default scaffolded CMS fields.
2013-05-21 22:47:54 +12:00
Jeremy Shipman
d47b202697
Restored c4eac5310e
(merge error)
...
FIX: Instead of CsvBulkLoader->findExistingRecord out right failing (i.e. no duplicate found) when the duplicate check field is empty, it will now continue on to check other duplicateCheck fields.
Added extra testing data to CSVBulkLoaderTest so that it fails.
2013-05-09 23:06:02 +02:00
Ingo Schommer
3b02d22989
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
dev/CsvBulkLoader.php
2013-05-09 10:34:20 +02:00
Sam Minnée
9672a22166
Merge pull request #1851 from chillu/pulls/form-strict-method-check
...
Form strict method check
2013-05-08 22:31:40 -07:00
Ingo Schommer
5d9cbae949
Merge pull request #1819 from oddnoc/csvbulkloader-findexisting-3.1
...
Use the correct variable as the key into $record
2013-05-08 04:23:05 -07:00
Ingo Schommer
14c59be85e
API Form::setStrictFormMethodCheck() and strict argument to setFormMethod()
...
Thanks to @sminnee for getting this started
2013-05-08 10:25:13 +02:00
Ingo Schommer
1a52a51195
DataObject->duplicate() test
...
Advanced relationship copying is already tested further down,
but doesn't cover the same basics. Triggered by a CMS bug
which turned out to be unrelated (https://github.com/silverstripe/silverstripe-cms/issues/689 )
2013-05-07 10:06:15 +02:00
Sean Harvey
677122256e
Merge pull request #1837 from simonwelsh/short-array-parse
...
FIX Handle PHP 5.4's short array notation everywhere arrays are parsed.
2013-05-06 20:32:51 -07:00
Sean Harvey
f1a4e7203e
BUG Fixing queries on non-existent table breaking archive site
...
With a many to many relation, e.g. SiteTree_MyRelation, and listing
them in your template then adding ?archiveDate=x in the URL, a SQL
error is shown because Versioned::augmentSQL() tries to query the
non-existent table "SiteTree_MyRelation_versions" assuming there's
versioning setup, but there isn't.
2013-05-07 12:34:46 +12:00
Simon Welsh
835aefbe83
FIX Handle PHP 5.4's short array notation everywhere arrays are parsed.
2013-05-05 13:27:42 +12:00
Simon Welsh
cb0977ce9f
Remove duplicate parse_class_spec method.
2013-05-05 11:43:56 +12:00
Fred Condo
bd5c8520bb
FIX: Use the correct variable as the key into $record
...
It was using $fieldName, which is the CSV field name, not the database
field name. This prevents duplicate detection from working. It now
properly uses $SQL_fieldName.
Update CsvBulkLoaderTest to remove keys that are nonexistent in the CSV
test data. Having them causes the test to fail with an undefined-index
error. This did not previously fail because of the bug in CsvBulkLoader
that this patch fixes. This partially reverts c4eac53
.
2013-05-01 06:50:40 -07:00
Damian Mooyman
4d5bd451bb
Updated HTMLTextTest to test for correct testFirstSentence, specifically a past failing test case. fixes #1422
2013-05-01 16:03:58 +12:00
Ingo Schommer
5efae23cb2
FIX Template discovery on themed Layout templates
...
Was failing when 'main' template only exists in theme,
but 'Layout' template only exists in module.
2013-04-30 15:41:26 +02:00
Ingo Schommer
cef955c8b9
Removed stray ampersand in Requirements ( fixes #1809 )
...
Only happens with suffix_requirements=true
2013-04-30 00:35:25 +02:00
Ingo Schommer
0e5b099287
FIX Unquoted shortcodes weren't parsed ( fixes #680 )
...
Since that used to be the default shortcode notation
for our core "insert media" functionality, its important
to have this fixed and keep supporting "legacy" content
created with 3.0.
2013-04-26 01:00:13 +02:00
Zauberfisch
809e0e547a
MINOR: updated and extended Tests
2013-04-22 18:17:31 +00:00
Sam Minnee
9ba26a04c4
Added test for lazy-loading edge-case in Money field.
2013-04-22 11:50:57 +12:00
Jeremy Shipman
c4eac5310e
FIX: Instead of CsvBulkLoader->findExistingRecord out right failing (i.e. no duplicate found) when the duplicate check field is empty, it will now continue on to check other duplicateCheck fields.
...
Added extra testing data to CSVBulkLoaderTest so that it fails.
2013-04-19 16:52:39 +12:00
Che Van Lawrence
d07fb4355d
Merge pull request #1770 from kinglozzer/config-dir-detection-fix
...
FIX: _config/ directories are now correctly detected as modules (fixes #1762 )
2013-04-18 14:48:55 -07:00
Sean Harvey
6e0fa5db45
Merge pull request #1768 from tractorcow/3.1-http-mail-fixes
...
BUG HTTP incorrectly converts mailto links to absolute urls
2013-04-18 14:46:10 -07:00
Loz Calver
0384369acb
FIX: _config/ directories are now correctly detected as modules ( fixes #1762 )
...
DO NOT MERGE: to be reviewed. Only i18n & Deprecation classes use
->getModules() as far as I can see. Given that the method still simply
returns an array of modulename => modulepath, I don't think it's really
an API change
2013-04-18 14:08:03 +01:00
Damian Mooyman
b6fc1d314e
BUG HTTP will now correctly pass over mailto: links when converting relative links to absolute (e.g. in Emails)
2013-04-18 14:25:51 +12:00
Simon Welsh
93a8e6f16e
Merge pull request #1773 from silverstripe-rebelalliance/fix/htmlvalue_attr_escaping
...
FIX We still need XML escaping on href attributes in HTML4Value
2013-04-17 15:05:33 -07:00
Hamish Friedlander
8d26bdbd2e
FIX We still need XML escaping on href attributes in HTML4Value
2013-04-18 09:13:24 +12:00
s-m
acf2ff8ce6
BUG: Fix for #1487
...
The parser could sometimes generate invalid code if the
source-file-comments were enabled, this moves the comments outside the
html-tag to circumvent these problems, update test as well.
2013-04-15 19:54:41 +02:00
Hamish Friedlander
c02d7e4c2e
Merge pull request #1750 from s-m/1660-elseif-parsing
...
BUG: Allow empty else- and else_if-blocks
2013-04-14 14:56:45 -07:00
Ingo Schommer
59dc0085d8
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
docs/en/reference/urlvariabletools.md
tests/forms/CheckboxFieldTest.php
2013-04-12 01:13:32 +02:00
Ingo Schommer
933fbf8ea4
l10n key to make "yes" and "no" translatable (see #1749 )
2013-04-12 01:11:24 +02:00
s-m
29e6bd513c
BUG: Allow empty else- and else_if-blocks
...
This fix allows empty else and else-if blocks to be processed, fixes #1660
2013-04-10 16:17:44 +02:00
Ingo Schommer
9856fcef21
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
javascript/DateField.js
model/DataQuery.php
model/Versioned.php
tests/forms/RequirementsTest.php
tests/model/DataObjectLazyLoadingTest.php
view/Requirements.php
2013-04-09 14:45:35 +02:00
Ingo Schommer
ba7dfcfd54
Added iShouldSeeAButton assertion
2013-04-09 09:39:06 +02:00
Sam Minnée
a6929f11b2
Merge pull request #1185 from chillu/pulls/augment-lazy-versioned
...
Versioned lazy loading fixes (backport from 3.1)
2013-04-08 16:04:50 -07:00
Ingo Schommer
01f46d039f
NEW Enforce max node counts to avoid excessive resource usage
...
Rendering potentially 1000s of nodes can exceed the CPU and memory constraints
of a normal PHP process, as well as the rendering capabilities of browsers.
Set a hard maximum for the renderable nodes, deferring to a "show as list" action
in the main CMS tree. For TreeDropdownField, we don't have the list fallback option,
so ask the user to search for the node title instead.
Also makes both the "node_threshold_total" and "node_threshold_leaf" values configurable
2013-04-09 10:24:18 +12:00
Sam Minnée
88d77db9e0
Merge pull request #1318 from tractorcow/3.1-api-image-resampling-compatible
...
API Better detection and prevention of image resampling
2013-04-08 15:18:55 -07:00
s-m
6a95db0eff
API: Support inequalities in templates
...
This adds support for <, <=, >, >= in templates
2013-04-08 17:07:39 +02:00
Ingo Schommer
5c82efd61d
Merge pull request #1729 from ajshort/no-rule-match-404
...
API: Return a 404 error when no director rule is matched
2013-04-06 03:09:48 -07:00
Andrew Short
1fc780ce2b
API: Return a 404 error when no director rule is matched
2013-04-06 18:19:03 +11:00
Will Rossiter
1427a0637b
FIX: remove_extension should work on parameterized extensions
2013-04-06 19:29:03 +13:00
Ingo Schommer
0242686a7a
Requirements acces to files with query strings ( fixes #7735 )
...
Originally authored by florian.thoma, tests added
by Ingo Schommer. Also removed query params from
file paths before calling mtime() on it.
See https://github.com/silverstripe/sapphire/pull/1023
2013-04-03 16:39:59 +02:00
Andrew Short
ceb7e3c8a8
Merge pull request #1352 from chillu/pulls/postgres-fixes
...
Postgres fixes
2013-04-03 03:50:08 -07:00
Ingo Schommer
2bc273e2a8
Consistently quote DataObject::$default_sort
...
Strictly speaking, no longer required since we auto-quote simple
field names in DataQuery now, but since the majority of sorts in core is
already quoted we should stay consistent.
2013-04-03 12:11:53 +02:00
Ingo Schommer
e9d55fcaf9
Correctly quote SQL in SQLQueryTest (fixes Postgresql)
2013-04-03 12:11:52 +02:00
Ingo Schommer
2da1de07da
Merge pull request #1359 from halkyon/forcessl_alternate_base_url
...
NEW Allow specifying an alternate domain to Director::forceSSL()
2013-04-03 01:58:28 -07:00
Ingo Schommer
b9f628146a
Fixed query quoting in SQLQueryTest
2013-04-03 10:48:55 +02:00
Sean Harvey
6eda25a090
NEW Allow specifying the secure domain to Director::forceSSL()
2013-04-03 17:47:36 +13:00
Ingo Schommer
ebca1a64ed
Merge pull request #1299 from silverstripe/user-specific-temp-folder
...
NEW: Move temp data into a user-specific subfolder, to stop temp-permission bugs from occurring.
2013-04-02 02:44:53 -07:00
Andrew Short
5ec85d06f6
API: Don't allow dots in URL segments
2013-03-30 19:47:17 +11:00
Ingo Schommer
4da85dc734
Simplified travis builds (external setup scripts)
2013-03-28 22:39:37 +01:00
Ingo Schommer
31f5e00a56
Simplified travis builds (external setup scripts)
2013-03-28 22:24:03 +01:00