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,700 Commits 31 Branches 527 Tags 162 MiB
0c4ec4708b
Commit Graph

11700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
fadf77e63d Merge pull request #1758 from chiujl/patch-1 
DatetimeField returns wrong year
 2013-04-14 13:31:09 -07:00
Ingo Schommer
f8ee3e1b73 Merge pull request #1742 from svandragt/patch-1 
Clarified the context of the step-by-step process
 2013-04-14 13:27:16 -07:00
Marvin Dickhaus
ea558828c9 Group description in CMSFields 2013-04-14 22:11:19 +02:00
chiujl
cb463449e8 DatetimeField returns wrong year 
This is related to how Zend_Date returns year for YYYY & yyyy format. Detailed explanation is here http://framework.zend.com/issues/browse/ZF-5297

Sample code (adapted the Datetimefield setValue() method) to highlight the problem:

include 'framework/thirdparty/Zend/Date.php';

$userValueObj = new Zend_Date(null, null, 'en_US');
$userValueObj->setTimezone('GMT');
$userValueObj->setDate('2012-01-01', 'YYYY-MM-dd');
$userValueObj->setTime('00:00:00', 'HH:mm:ss');
echo $userValueObj->get('YYYY-MM-dd HH:mm:ss', 'en_US'), "\n"; // returns 2011-01-01 00:00:00
echo $userValueObj->get('yyyy-MM-dd HH:mm:ss', 'en_US'), "\n"; // returns 2012-01-01 00:00:00
 2013-04-13 06:26:52 +08:00
Damian Mooyman
0dfc6d5eab BUG Fixed incorrect variable usage in generation of PhoneNumberField form fields 2013-04-12 15:13:58 +12:00
Ingo Schommer
9eab893e7c Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	model/Image.php
 2013-04-12 01:14:55 +02: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
Sean Harvey
1eadff5a4f BUG Security::permissionFailure() fixing permissionDenied hook inconsistency 
permissionDenied only works if Security::permissionFailure() is called when
there's currently no logged in Member. This fixes it so failed attempts
with logged in Member also includes the permissionDenied hook.

In addition, fix an undefined $member variable
 2013-04-12 10:59:00 +12:00
Loz Calver
c53b61c347 Fix broken CMSSettings saving 
Regression from da7e515d13
 2013-04-11 17:25:15 +01:00
Ingo Schommer
1f7796c83e Merge pull request #1753 from g4b0/1752-image-manipulation-parameter 
API: used reflection in order to have an arbitrary number of parameter
 2013-04-11 08:53:25 -07:00
g4b0
c8e8b5147d API: used call_user_func_array in order to have an arbitrary number of parameter for getFormattedImage (fixes #1752) 2013-04-11 16:51:36 +02:00
Ingo Schommer
f514067f2f Updated commit message usage to reflect github best practices 2013-04-11 17:35:55 +03:00
Ingo Schommer
233198c5cb Fixed filesystem case sensitivity in tests 2013-04-11 11:59:36 +02:00
Ingo Schommer
0343a77d30 Merge remote-tracking branch 'origin/3.1' 2013-04-11 11:42:04 +02:00
Ingo Schommer
ae09301c8c Revert deprecation of Object::add_extension() usage 
This reverts commit 14b997eea3.
Its just not practical to use the Config API as it stands,
the add_extension() wrapper does more than just a Config->update().

Most use cases can be covered via YML, but any conditional
additions (e.g. in unit tests) can still benefit from the
add_extensions() shorthand.
 2013-04-11 11:40:53 +02:00
Ingo Schommer
16c7235942 DateField.js event selector regression (fixes #1528) 
See 19a8545076
 2013-04-11 10:19:00 +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
Will Rossiter
ba67d4c5cd Merge pull request #1746 from tractorcow/3.1-errorpage-icons-fix 
BUG Fixed broken ErrorPage icons in CMS view
 2013-04-10 00:25:24 -07:00
Damian Mooyman
9da57b083a BUG Fixed broken ErrorPage icons in CMS view 2013-04-10 17:15:42 +12:00
Sean Harvey
97b1f8616f Merge pull request #1739 from kinglozzer/leftandmain-uninitialized-tabs 
FIX: Edge case attempting to destroy uninitialized tabs
 2013-04-09 14:08:12 -07:00
Ingo Schommer
a68fb1f096 Fixed /admin/pages/publishall link in docs 2013-04-09 23:00:27 +02:00
Ingo Schommer
659a793cc8 Merge pull request #1744 from ryanwachtl/patch-1 
Update configuration.md
 2013-04-09 08:13:26 -07:00
Ryan Wachtl
46831f56fb Update configuration.md 
Link to ssbits.com config cheatsheet no longer relevant.
 2013-04-09 10:09:25 -05:00
Ingo Schommer
5fbf2e9303 Merge pull request #1741 from kinglozzer/1696_handlerequest_fix 
Fix: RequestHandler not managing 404/403 errors correctly (fixes #1696)
 2013-04-09 07:52:20 -07:00
Sander van Dragt
7b49425e16 Clarified the context of the step-by-step process 
Also limited the dependency on branching of 'master' to make the example more versatile and consistent with the best practice in this document.
 2013-04-09 16:51:20 +02:00
Loz Calver
58de19e01f Fix: RequestHandler not managing 404/403 errors correctly (fixes #1696) 2013-04-09 15:43:50 +01:00
Ingo Schommer
14b997eea3 API Deprecated Object::add_extension() usage (as of 3.2) 2013-04-09 15:00:34 +02:00
Ingo Schommer
1cfc159f1a Un-deprecated Object::add_extension() non-LSB usage (fixes #1710) 
Its usage is too common to force-remove it just for a shortcut.
We still recommend adding extensions through YAML of course.
 2013-04-09 14:56:26 +02:00
Ingo Schommer
9456b8043c Fixed "insert media" styling (regression from 27b0cda0) 2013-04-09 14:47:10 +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
310bc8d09c Better default icon for ModelAdmin 
Cogwheels doesn't really communicate its meaning well...
New icon is from http://thenounproject.com/noun/database/#icon-No6001,
doesn't require permanent attribution (CC0)
 2013-04-09 13:43:32 +02:00
Ingo Schommer
baca12bf37 3.1 changelog summaries 2013-04-09 13:36:39 +02:00
Loz Calver
975c6992df FIX: Edge case attempting to destroy uninitialized tabs 
Another edge case very similar to
https://github.com/silverstripe/sapphire/commit/07fb7563273fa82bd93eb255
70571c0a298198e5
 2013-04-09 11:21:54 +01:00
Ingo Schommer
17362f9474 Showing "Help" menu item below "Settings" 2013-04-09 12:20:20 +02:00
Ingo Schommer
7d600f57d5 CMSMenu sort order (fixes #1716) 
Regression caused by b645703eb9
 2013-04-09 12:19:33 +02:00
Ingo Schommer
e26090a840 Avoid double encoding Date->Formati18n() 
See https://github.com/silverstripe/sapphire/pull/1314
Thanks to @ivoba
 2013-04-09 11:04:45 +02:00
Ingo Schommer
ba7dfcfd54 Added iShouldSeeAButton assertion 2013-04-09 09:39:06 +02:00
Simon Welsh
d5b9ce71c3 Merge pull request #1738 from ss23/patch-1 
Update form-validation.md
 2013-04-08 23:45:32 -07:00
Stephen Shkardoon
1a95be7e60 Update form-validation.md 
Minor typo, missing a '
 2013-04-09 18:44:47 +12:00
Ingo Schommer
7d6edccb0a Marked Security.token as private 2013-04-09 01:48:20 +02:00
Sam Minnee
e6d8280296 Removed notice-level erorr in CMS page list. 2013-04-09 11:42:30 +12:00
Sam Minnée
39a4aabcdc Merge pull request #778 from patbolo/bugfix/7853 
FIX 7853
 2013-04-08 16:08:23 -07:00
Sam Minnée
6dec0592e8 Merge pull request #848 from chillu/pulls/4754 
BUG Exclude framework/dev from text collection (fixes #4754)
 2013-04-08 16:06:52 -07: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
Sam Minnée
0d8f99f72b Merge pull request #1164 from silverstripe-rebelalliance/open8232 
BUGFIX: fix for broken layout in insert media dialog - Trac #8232
 2013-04-08 15:29:37 -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
Sam Minnée
ff2f75535b Merge pull request #1347 from stojg/gridfieldfilterheader-last-filter-only 
BUG: GridFieldFilterHeader only filters on last filter
 2013-04-08 15:16:33 -07:00
Sam Minnée
322b00ece0 Merge pull request #1718 from chillu/pulls/member-group-nested-editing 
FIX Disallow group removal when member is edited in groups view
 2013-04-08 15:15:47 -07:00