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
12,523 Commits 31 Branches 527 Tags 162 MiB
b6b3cd9889
Commit Graph

12523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
8051f5586c Merge pull request #2539 from dhensby/patch-2 
FIX Changing `public` statics to `private`
 2013-10-17 04:02:08 -07:00
Daniel Hensby
a1ad45486b FIX Changing public static $priority to private 
Deprecation error thrown in master whilst this is public
 2013-10-17 11:55:59 +01:00
Ingo Schommer
8c527eab40 Merge pull request #2524 from tractorcow/pulls/3.2-change-level-identifiers 
API Better declaration of DataObject field change levels.
 2013-10-17 01:24:30 -07:00
Ingo Schommer
b6c16fcbf1 Merge pull request #2554 from tractorcow/pulls/3.1-moneyfield-style-fix 
BUG Fixed incorrect CSS class on MoneyField holder
 2013-10-17 01:22:01 -07:00
Ingo Schommer
15845c8547 Merge pull request #2556 from tractorcow/pulls/3.1-bug-fieldgroup-name-fix 
BUG Fixes serious issue with FieldList::addFieldsToTab failing to accept multiple field groups.
 2013-10-17 01:21:08 -07:00
Hamish Friedlander
8801a50704 FIX oembed to avoid mixed media issues 2013-10-17 17:06:40 +13:00
Damian Mooyman
24950692cd BUG Fixes serious issue with FieldList::addFieldsToTab failing to accept multiple field groups. 
Additional groups beyond the first are ignored.
Test cases included.
 2013-10-17 15:38:22 +13:00
Andrew Short
688d853a95 Merge pull request #2555 from halkyon/readme_fixes 
Use quotes around composer require argument for some shells.
 2013-10-16 18:38:58 -07:00
Sean Harvey
d7e1a1c45f Use quotes around composer require argument for some shells. 
The asterisk is a reserved character in some shells and will cause an error
if you don't put quotes around the argument, as it will be interpreted.
 2013-10-17 14:36:34 +13:00
Damian Mooyman
702b6c94c4 BUG Fixed incorrect CSS class on MoneyField holder 2013-10-17 13:28:27 +13:00
Damian Mooyman
52f6581ecf API Better declaration of DataObject field change levels. 
Use of const named identifiers to represent each change level rather than numbers.
 2013-10-17 12:55:58 +13:00
Ingo Schommer
0d1c9602e8 Merge pull request #2550 from Zauberfisch/3.1 
formatted install.php5 according to SilverStripe coding conventions
 2013-10-16 15:28:36 -07:00
Ingo Schommer
559743c75f Merge pull request #2549 from Zauberfisch/3.1 
suggest that arg_separator.output to be &
 2013-10-16 13:53:43 -07:00
zauberfisch
48049647d8 formatted install.php5 according to SilverStripe coding conventions (spaces) 2013-10-16 21:17:22 +01:00
zauberfisch
0b4c3946ff formatted install.php5 according to SilverStripe coding conventions (tabs instead of spaces, no 1 line if with else, ...) 2013-10-16 21:11:06 +01:00
zauberfisch
c4810b8e0f changed install.php5 to respect line length limit according to SilverStripe coding conventions 2013-10-16 21:00:20 +01:00
Ingo Schommer
0d993c1aac Merge pull request #2535 from Martimiz/3.1 
Strip duplicate querystrings from the url before adding document.location.search
 2013-10-16 12:41:52 -07:00
zauberfisch
e357fa298e suggest that arg_separator.output to be &, if set to something else it may result in issues with url parameters 2013-10-16 20:37:15 +01:00
Ingo Schommer
472bb4d2e2 Running Behat tests on PHP 5.4 (needs integrated webserver) 2013-10-16 14:51:40 +02:00
Ingo Schommer
156140340b Regression in travis.yml ($WEBROOT undefined, matrix broken) 2013-10-16 14:47:35 +02:00
Ingo Schommer
98f79172a4 Running Travis+Behat through Selenium, save artifacts 2013-10-16 14:01:14 +02:00
Ingo Schommer
fa22aedbed Merge pull request #2533 from kinglozzer/2527-cmsform-inlineformactions 
Allow non-action buttons to pass through validation (fixes #2527)
 2013-10-16 02:41:23 -07:00
Loz Calver
3bbfca820b Allow non-action buttons to pass through validation (fixes #2527) 
The specific example for this issue is InlineFormField - results in actionName() on non-object error. See #2527 for context.

Include parentheses for coding conventions
 2013-10-16 10:39:31 +01:00
Ingo Schommer
5235a3f3a2 Installer regression from dd49834 2013-10-16 11:29:44 +02:00
Ingo Schommer
c05b7c2c8f Installer regression from dd49834 2013-10-16 11:28:33 +02:00
Ingo Schommer
814c0c4055 Fallback for i18n::get_script_direction() 2013-10-16 00:30:10 +02:00
Will Rossiter
813d34b15e FIX: Use Injector API for managing Member_Validator instance. 
Updates the CMS profile page and SecurityAdmin to give developers a few ways to customise the required fields.

Added extension hook updateValidator for getValidator for things like modules to inject required fields to go along with Injector for replacing the entire class for project specific use.
 2013-10-16 11:29:43 +13:00
Ingo Schommer
653d7bc1b7 Merge pull request #2532 from chillu/pulls/i18n-dir 
$i18nLocaleDirection template placeholder
 2013-10-15 15:19:32 -07:00
Ingo Schommer
be09129742 $i18nScriptDirection template placeholder 
Optional RTL support based on Zend_Locale data.
Not set in CMS by default because it breaks the layout
quite badly without deep CSS modifications.
 2013-10-16 00:05:33 +02:00
Ingo Schommer
cc6bdfe459 Merge pull request #2544 from cieszak/patch-2 
Update rssfeed.md
 2013-10-15 14:13:39 -07:00
cieszak
092cda89af Update rssfeed.md 
add $allowed_actions
 2013-10-15 23:01:23 +02:00
Ingo Schommer
7b1cbabadf Merge pull request #2536 from nyeholt/3.1 
BUG Director::test now calls RequestProcessor
 2013-10-15 11:05:18 -07:00
Ingo Schommer
c1e8bb6bb4 Merge pull request #2541 from kinglozzer/patch-2 
Allow https YouTube oEmbed URLs
 2013-10-15 10:44:48 -07:00
Loz Calver
f26b52eb91 Allow https YouTube oEmbed URLs 
YouTube's oEmbed service supports a ?scheme=https parameter. See https://groups.google.com/forum/?fromgroups#!topic/youtube-api-gdata/S9Fa-Zw2Ma8
 2013-10-15 16:36:49 +01:00
Ingo Schommer
3ae8c8dbb1 Merge pull request #2540 from JayDevlin/fix-passwordvalidator-characterstrength-documentation 
FIX PasswordValidator->characterStrength() Documentation
 2013-10-15 03:50:56 -07:00
Devlin
5ea314d012 FIX PasswordValidator->characterStrength() Documentation 2013-10-15 12:44:50 +02:00
Will Rossiter
8febaeafb9 Update docblocks 2013-10-15 11:29:58 +13:00
Marcus Nyeholt
7bcb180f27 BUG Director::test now calls RequestProcessor 
This fixes https://github.com/silverstripe/silverstripe-framework/issues/2517
and provides some testing around the use of RequestProcessor in general.
 2013-10-15 07:53:34 +11:00
Martimiz
364ce08f52 Strip duplicate querystrings from the url before adding document.location.search 
When a querystring is passed with the url (for example Translatable locale) it is duplicated each time the content panel is reloaded, by adding document.location.search and so it should be stripped from the url first.
 2013-10-14 15:33:40 +02:00
Ingo Schommer
14e5c80dad Merge pull request #2295 from JayDevlin/patch-1 
BUGFIX i18n module load order in i18n::include_by_locale()
 2013-10-13 01:43:57 -07:00
Ingo Schommer
1bcd4c9a6a Merge pull request #2531 from ajshort/pull-5 
Correct some incorrect PHPDoc definitions.
 2013-10-13 01:36:16 -07:00
Andrew Short
c082dc3bd1 Correct some incorrect PHPDoc definitions. 2013-10-13 18:59:53 +11:00
Andrew Short
024d46ceb5 Merge pull request #2525 from chillu/pulls/tree-node-parent-refresh 
Load tree parent nodes if non-existant
 2013-10-11 07:37:31 -07:00
Craig Lyons
27b139bc75 Add backwards compatibility for has_extension 2013-10-11 10:18:00 -04:00
Andrew Short
3f7b3fddc9 BUG: Fix tab state not being restored due to incorrect selector. 
Closes #2321.
 2013-10-12 01:09:58 +11:00
Devlin
1e5679f20f BUGFIX i18n module load order in i18n::include_by_locale() 
The "project" module (normally mysite) is considered with the highest priority. Yet, the project's i18n is loaded first and cannot overwrite existing translations. I've added a array_reverse(), so the iteration keeps the translation of the module with the highest priority.

Old $sortedModules: mysite, (other_modules,) cms, admin, framework.
New $sortedModules: framework, admin, cms, (other_modules,) mysite.
 2013-10-11 15:20:51 +02:00
Ingo Schommer
9c75fc06e7 Merge pull request #2523 from wilr/agnosticloginmsg 
Change default message to be credential agnostic.
 2013-10-11 02:59:05 -07:00
Ingo Schommer
6c96c490c6 Load tree parent nodes if non-existant 
This edge case can occur when a large tree is cached in HTML already,
without any nodes expanded via ajax. If a new node is added with
a parent that's not existant, it was simply placed on the root node.
This is a display bug, a full CMS refresh fixes it.

Fixes a related bug where tree causes (view) duplicates,
where the same node is rendered twice. This was due to the whole
subtree being refreshed (including the new node) through jstree's
built-in "open"/"select" events, while at the same time
creating a new node through updateNodesFromServer() callbacks.

Also added a global tree loading indication to make it clear
that the tree is still processing.

See https://github.com/silverstripe/silverstripe-cms/issues/872
 2013-10-11 11:51:11 +02:00
Will Rossiter
3851ef9f2c Style destructive actions destructively 2013-10-11 20:00:11 +13:00
Will Rossiter
b0f38f4990 Change default message to be credential agnostic. 2013-10-11 11:22:15 +13:00