tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
11,449 Commits 31 Branches 527 Tags 162 MiB
f1e567eb93
Commit Graph

11449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mikg0
fb5fc62604 Fix file link recognition in HtmlEditorField.js 
The new file_link format ([file_link,id=\d+]) uses a comma which was not reflected in the regex.
 2013-05-13 15:04:52 +03:00
Sean Harvey
bb6283740a Fixing broken CoreTest when using silverstripe-cache for temp folder 2013-05-13 23:39:52 +12:00
g4b0
6d7b938b7a Bugfix: Added private static $defaultFormat in order to choose default via config. Permit WCAG validation of XHTML. 2013-05-13 11:34:35 +02: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
Sean Harvey
813749e909 Fixing array to string conversion in dev/build for PHP 5.4 2013-05-12 21:28:17 +12: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
f45621b07e Fix typo in templates documentation 2013-05-10 21:32:39 +12:00
Will Rossiter
1bc945f98c Partial code formatting / phpdoc cleanup of Versioned 2013-05-10 21:19:16 +12: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
Damian Mooyman
de41a2a75e BUG Fixes issue with '+' characters in url. 2013-05-10 16:16:31 +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
tomzen
e64420433a Have 'Configuration Reference' link point to uploadfield page 
Oops.
 2013-05-09 11:30:20 +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
Marcus Dalgren
7f871fa18b Fix orphaned records when running update 
When DataObject::update() is run with relation fields and the relationship
is new the relationship ID was not set on the DataObject. This patch fixes
this. Fixes issue 6195 in open.silverstripe.org.
 2013-05-09 03:53:53 +02: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
16231ce253 FIX: Falling back to summaryFields() should skip non database fields. 2013-05-08 23:05:05 +12: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