Commit Graph

11301 Commits

Author SHA1 Message Date
Sean Harvey
3878806ca3 Merge pull request #1946 from halkyon/reinstate_cog_icon_batch_actions
Put back cog icon for multi-select batch actions
2013-05-15 16:11:19 -07:00
Sean Harvey
33be390db8 Put back cog icon for multi-select batch actions (was removed in f4b080e) 2013-05-15 21:09:19 +12:00
Sean Harvey
9f532fe976 BUG GridField action onclick assuming URL without "?" character
Sometimes GridState URL will have a query string already appended,
e.g. "?local=en_GB", but the GridField javascript assumes there won't
be.

The result would be an action URL like:
"/my/url?locale=en_US?RelatedPage=123" which is obviously invalid.

The fix is to check that "?" exists in the GridState URL and use
"&" instead to connect the URLs if that's the case.
2013-05-15 15:49:23 +12:00
Ingo Schommer
7bf790a5fa Merge pull request #1875 from wilr/open6473
FIX: If CSV column mapping maps to function, keep key values
2013-05-14 04:02:01 -07:00
Will Rossiter
7ea96504c6 Code formatting / PHPDoc cleanup 2013-05-14 22:06:02 +12:00
Will Rossiter
c8af0fd7d1 FIX: If CSV column mapping maps to function, keep key value as key.
Fixes http://open.silverstripe.org/ticket/6473

When using CSVParser::$columnMapping to map columns to a callback action, it previously used the action name as the key value. This prevented users from defining multiple entries to the same callback. This patch retains those key values and simply runs the callback field name filter later on.
2013-05-14 22:00:52 +12:00
Will Rossiter
cf31114813 Merge pull request #1939 from chillu/pulls/folder-creation
Recursive folder creation in Upload
2013-05-14 02:00:06 -07:00
Ingo Schommer
1e5d40474d Merge pull request #1940 from chillu/pulls/uploadfield-folder-label
Added "saves into..." label to UploadField template
2013-05-14 01:40:02 -07:00
Ingo Schommer
842dc98681 Added "saves into..." label to UploadField template
CMS users shouldn't need to guess where their files will end up.
2013-05-14 10:39:05 +02:00
Sean Harvey
2beb3519e4 Merge pull request #1944 from patbolo/bugfix/debug-no-controller
FIX Avoid unnecessary user_error when no controller set for friendly err...
2013-05-13 22:14:30 -07:00
Sean Harvey
a4f0983220 Updating docs to use SiteTree for aggregates with LastEdited example
Using SiteTree is faster, because it doesn't do any joining of Page
to get the aggregate, even though the LastEdited field is only on
SiteTree in the case of Page.
2013-05-14 17:12:02 +12:00
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
Ingo Schommer
68af8409a5 Recursive folder creation in Upload 2013-05-13 15:47:34 +02: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