jean
3de75f396e
FIX Avoid unnecessary user_error when no controller set for friendly errors in Debug class
2013-05-14 16:58:57 +12:00
Hamish Friedlander
d5bcbbd66a
Merge pull request #1886 from halkyon/filesystem_sync_subsites
...
BUG Fixing Filesystem::sync breaking subsite pages with same URLSegments
2013-05-13 15:51:42 -07:00
Sean Harvey
ebac1bf06e
BUG Fixing Filesystem::sync breaking subsite pages with same URLSegments
...
Filesystem::sync() tries to run through all pages, without caring
which subsite the page came from. The problem with this is
code in SiteTree::validURLSegment() will return invalid information,
as it will check if the page exists, thinking it does, return false,
then the page will get a new URLSegment written, e.g. "home-2".
Instead of disabling the subsite filter in Filesystem::sync(), this
fix will just loop through each subsite and sync each subsite's pages
individually before doing the main site.
2013-05-14 09:45:14 +12:00
Simon Welsh
1b3f817862
Merge pull request #1941 from TheFrozenFire/patch-1
...
Include Zend_Locale_Format
2013-05-13 13:12:40 -07:00
Justin Martin
644fa29e41
Include Zend_Locale_Format
...
Fix Zend_Locale_Format not being included.
2013-05-13 10:55:05 -07:00
Sean Harvey
bb6283740a
Fixing broken CoreTest when using silverstripe-cache for temp folder
2013-05-13 23:39:52 +12:00
Sean Harvey
15f7c884f8
Merge pull request #1756 from halkyon/permission_denied_hook
...
BUG Security::permissionFailure() fixing permissionDenied hook inconsistency
2013-05-13 02:15:58 -07:00
Sean Harvey
fd1aa197d5
Merge pull request #1884 from mateusz/modify-alignment
...
BUG Enable dropdown so alignment on images can be updated.
2013-05-12 15:19:03 -07:00
Ingo Schommer
8c02f10c03
Merge pull request #1874 from wilr/open6210
...
API: Add sync_blacklisted_patterns for configuring files to skip in sync()
2013-05-12 15:15:23 -07:00
Mateusz Uzdowski
fdb4a1d871
BUG Enable dropdown so alignment on images can be updated.
2013-05-13 10:08:03 +12:00
Ingo Schommer
8c9dd02d73
Merge pull request #1876 from wilr/open6449
...
Suggest users install curl, tidy on their machines.
2013-05-12 14:21:50 -07:00
Ingo Schommer
46bc588a1b
Merge pull request #1877 from wilr/5577
...
FIX: NumericField should work with numbers like 54,6
2013-05-12 14:12:56 -07:00
Ingo Schommer
e135421ac8
Merge pull request #1878 from wilr/open5091
...
FIX: allow cite elements in TinyMCE
2013-05-12 14:11:22 -07:00
Ingo Schommer
9540b7dca6
Merge pull request #1880 from Zauberfisch/lc_XX
...
hacked Zend_Locale and re added the lc_XX locale
2013-05-12 14:01:29 -07:00
Will Rossiter
0f7a5d29c8
Coding conventions. Tidy up of PHPDoc formatting.
2013-05-12 12:39:37 +12:00
Zauberfisch
6f11f92f5b
Reverted 9a52dae207 & ed19bbc3ba
2013-05-11 18:50:02 +00:00
Zauberfisch
5008070df1
Hacked Zend_Locale to allow lc_XX locale
2013-05-11 19:42:48 +01:00
Will Rossiter
7ade1ebd59
FIX: Money should use current locale by default. ( Fixes : #6558 )
2013-05-11 23:30:13 +12:00
Will Rossiter
8b073c1cad
FIX: allow cite elements in TinyMCE
2013-05-11 23:20:00 +12:00
Will Rossiter
a99dbae012
FIX: NumericField should work with numbers like 54,6
...
Fixes http://open.silverstripe.org/ticket/5577 .
Uses Zend_Locale_Format::isNumber(). Includes unit test for NumericField. Does not include testing work on DBField underlying NumericField to ensure that works consistently.
2013-05-11 22:51:39 +12:00
Will Rossiter
e56abaca4f
Suggest users install curl, tidy on their machines.
2013-05-11 18:31:02 +12:00
Will Rossiter
1a36bb628e
API: Add sync_blacklisted_patterns for configuring files to skip in sync tasks
...
Fixes http://open.silverstripe.org/ticket/6210 .
Replaces the hardcoded file patterns from Folder::syncChildren() with a new static Filesystem::$sync_blacklisted_patterns to describe files and folder names to skip when running Folder::sync().
Added unit test for Folder::sync()
Extended Folder::sync() to report on the number of file / folders skipped.
2013-05-11 16:06:14 +12:00
Ingo Schommer
d6733caf14
Merge pull request #1870 from wilr/is_https
...
API: Add Director::is_https()
2013-05-10 05:28:00 -07:00
Ingo Schommer
03aa3391a6
Merge pull request #1871 from wilr/open6132
...
FIX: Add support for multi dimensional source arrays in LookupField
2013-05-10 05:26:00 -07:00
Will Rossiter
42cf2a95bd
FIX: Add support for multi dimensional source arrays in LookupField (open/6132)
2013-05-11 00:01:39 +12:00
Will Rossiter
718108969b
API: Add ArrayLib::flatten($array, $preserveKeys)
2013-05-11 00:00:31 +12:00
Will Rossiter
1325d736a0
API: Add Director::is_https()
2013-05-10 22:31:38 +12:00
Will Rossiter
07b9bd8527
PHPDoc + coding conventions
2013-05-10 21:59:20 +12:00
Ingo Schommer
3b72432c40
Merge pull request #1868 from wilr/pen-6245
...
FIX: Disable autocomplete on ConfirmedPasswordField instances.
2013-05-10 02:41:16 -07:00
Will Rossiter
94d6b1ccff
FIX: Disable autocomplete on ConfirmedPasswordField instances.
2013-05-10 20:32:59 +12:00
Will Rossiter
09fcdb8c31
Coding conventions for ConfirmedPasswordField
2013-05-10 20:23:06 +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
Ingo Schommer
ced199b877
Direct writing of "Security.token" through dev/generatesecuretoken
2013-05-09 10:31:49 +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
Andrew Short
c1d25d17ce
Merge pull request #1858 from oddnoc/form-documentation-edit
...
Edit forms documentation
2013-05-08 18:34:01 -07:00
Fred Condo
677dc9822e
Edit forms documentation
...
Correct spelling and word choices.
2013-05-08 17:00:43 -07:00
Ingo Schommer
e5d3a1da6b
Disable ContentNegotiator in CMS ( fixes #1850 )
2013-05-08 23:45:53 +02: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
a1216b5e32
Merge pull request #1250 from wilr/gridfield-action-fixes
...
FIX: Do not blindly pass input values to GridField_FormAction URL's
2013-05-08 04:20:40 -07:00
Ingo Schommer
433c48b53d
Merge pull request #1855 from wilr/installer-postman
...
FIX: Check for POST support in installer
2013-05-08 04:07:46 -07:00
Will Rossiter
22e8ba6ff6
FIX: Check for POST support in installer
...
Also two minor fixes for Web server configuration
* Prevent notice on unsupported setups.
* Show successful message.
Conflicts:
dev/install/install.php5
2013-05-08 22:51:27 +12:00
Ingo Schommer
c01511eaa3
Merge pull request #1854 from wilr/image-derp
...
Deprecate Image::loadUploadedImage(), Use Upload::load()
2013-05-08 03:01:41 -07:00
Ingo Schommer
399eacf12c
Merge pull request #1853 from wilr/config-notice-error
...
FIX: ensure config variables exist
2013-05-08 02:49:39 -07:00
Will Rossiter
b2937decfc
Deprecate Image::loadUploadedImage(), Use Upload::load()
2013-05-08 21:49:38 +12:00
Will Rossiter
7a9f142c97
FIX: ensure config variables exist
2013-05-08 21:36:49 +12:00
Ingo Schommer
a9edf47189
Merge pull request #1830 from a2nt/media_dialog_add_url_btn_fix
...
FIX media dialog add url button fix
2013-05-08 01:42:04 -07:00
Ingo Schommer
d74c4aadc1
Merge pull request #1832 from oddnoc/is_absolute_url-regex
...
Anchor regex in Director#is_absolute_url()
2013-05-08 01:40:23 -07:00
Ingo Schommer
65fd1a7ff4
Merge pull request #1833 from oddnoc/1687-dataobject-forcewrite
...
FIX: Enable $forceWrite argument of DataObject#write()
2013-05-08 01:38:16 -07:00
Ingo Schommer
3e88c98ca5
API Restrict MemberLoginForm to POST requests for increased security
...
CVE-2013-2653 - Thanks to Fara Rustein of Deloitte Argentina for reporting.
2013-05-08 10:25:28 +02:00
