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,925 Commits 31 Branches 527 Tags 162 MiB
ab52b677aa
Commit Graph

12925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Rossiter
57e65075e9 Dialog icon size 
The dialog close icon was one 1px higher then the dialog close hover icon causing a little bit of movement when hovering.
 2013-12-21 16:11:06 +13:00
Will Rossiter
1f125730e4 Merge pull request #2281 from mandrew/fixed_collapsed 
Fixing expanding/collapse CMS menu targeting wrong element
 2013-12-20 18:51:55 -08:00
Will Rossiter
8b9f8cfd6f Merge pull request #2742 from ss23/patch-1 
Make CacheTest sleep properly
 2013-12-20 18:47:06 -08:00
Hendrik Schaper
c563caec05 GroupedList: Enable grouping by a function result. 2013-12-21 15:15:55 +13:00
Stephen Shkardoon
40163edba7 Make CacheTest sleep properly 
This way it will always sleep for the right amount of time (or longer)
 2013-12-21 15:05:51 +13:00
Will Rossiter
87b5451d2d Consistent API for SelectionGroup constructor. 2013-12-21 14:55:53 +13:00
Will Rossiter
588118ade5 Merge pull request #2738 from kinglozzer/doc-file 
Update topics/file documentation (closes #1481)
 2013-12-20 17:41:00 -08:00
Will Rossiter
3d2875a111 Merge pull request #2741 from simonwelsh/hhvm-test 
Changes to error message detection to handle the differences in HHVM
 2013-12-20 16:55:14 -08:00
Will Rossiter
5728fc3a9a Merge pull request #2484 from nedmas/fix-creditcardfield-to-use-attributeshtml 
FIX: Change CreditCardField to use AttributesHTML
 2013-12-20 16:50:15 -08:00
Will Rossiter
5354a547c6 Merge pull request #2733 from madmatt/pulls/behat-profile 
Fix profile.feature behat test
 2013-12-20 16:17:55 -08:00
Simon Welsh
8de403abd4 Changes to error message detection to handle the differences in HHVM 2013-12-21 13:17:47 +13:00
Will Rossiter
9ee4de76c4 Merge pull request #1048 from silverstripe-rebelalliance/3.1_7876 
MINOR:added padding to ui-dialog-title so that it doesn't sit flush with...
 2013-12-20 16:09:23 -08:00
Will Rossiter
b47e1e0b7f Merge pull request #2732 from Firesphere/patch-1 
MINOR Documentation slightly improved for js inclusion
 2013-12-20 15:40:49 -08:00
Will Rossiter
85b00105ce Merge pull request #2740 from micmania1/add-logout-url 
NEW add logout url to Security
 2013-12-20 15:39:12 -08:00
Stephen Shkardoon
1c7f56fcf4 Fix sake not checking all the locations for cli-script.php 
Before this, sake wouldn't check the current directory it itself was in.
This wasn't a problem with anything but master.
 2013-12-21 12:33:48 +13:00
micmania1
229bea399b added logout url to Security and deprecated Security::set_login_url in favour of config 2013-12-20 21:55:54 +00:00
Loz Calver
b8f9dd91d9 Update topics/file documentation (closes #1481) 2013-12-20 14:03:07 +00:00
Simon Erkelens
b64a89d103 Minor language and readability fixes. 2013-12-20 12:24:03 +01:00
Will Rossiter
e58a481edf Merge pull request #2734 from chillu/pulls/uploadfield-cols 
NEW UploadField lists all files, shows path info
 2013-12-20 01:21:50 -08:00
Will Rossiter
5f86a69fdf Merge pull request #2731 from chillu/pulls/2723-embed-images-alt 
"alt" and "title" attrs for images from URLs (fixes #2723)
 2013-12-20 00:19:35 -08:00
Ingo Schommer
60333f68ee NEW UploadField lists all files, shows path info 
It doesn't make a lot of sense to limit the listing
to assets/Uploads/, which is the default set through FileField->folderName.
Showing all files regardless of folder makes them easier
to find, users can still opt-in to filtering by folder
through the TreeDropdownField.
 2013-12-20 01:00:36 +01:00
madmatt
7d271d5346 Fix profile.feature behat test 2013-12-20 12:32:44 +13:00
Ingo Schommer
7591e43ab9 Merge remote-tracking branch 'origin/3.1' 2013-12-19 23:33:58 +01:00
Ingo Schommer
627e3cdf11 Revert entity name change 
Partially reverts b0f38f4990
which broke unit tests relying on the old entity name
in 3.1, where translations and the en.yml master file have been backported to.
 2013-12-19 23:13:13 +01:00
Stig Lindqvist
d1fe294d61 Update the yaml configuration with existing before / after syntax 2013-12-20 10:36:16 +13:00
Ingo Schommer
1afb8bb414 Merge remote-tracking branch 'origin/3.1' 2013-12-19 20:47:31 +01:00
Ingo Schommer
d032fadfb5 Fixed spelling of class in test 2013-12-19 20:47:16 +01:00
Simon Erkelens
5c595146a0 MINOR Documentation slightly improved for js inclusion 
Although I'm not the best documentor.
 2013-12-19 20:37:52 +01:00
Ingo Schommer
f29d51f433 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/reference/dataobject.md
	lang/es.yml
 2013-12-19 20:23:09 +01:00
Ingo Schommer
892b772d1c Merge pull request #2616 from Zauberfisch/3.1 
Check if remote class exists in DataObject->getRemoteJoinField()
 2013-12-19 11:05:13 -08:00
Ingo Schommer
23371b01aa "lost password" translation master (fixes #2725) 2013-12-19 20:00:59 +01:00
Ingo Schommer
ca0c56e203 Updated translation masters 
Fixed two inconsistenties with missing namespaces in templates.
 2013-12-19 19:51:25 +01:00
Ingo Schommer
03b2e9dc74 "alt" and "title" attrs for images from URLs (fixes #2723) 2013-12-19 19:43:46 +01:00
Ingo Schommer
0d6181ce6f Merge pull request #2722 from axyr/master 
File validate should have extend hook
 2013-12-19 09:22:19 -08:00
Ingo Schommer
78a530524b Merge pull request #2684 from Firesphere/feature/force_write_js_to_bottom 
NEW Forcefully write javascripts to the end of the HTML if wished
 2013-12-19 09:21:06 -08:00
Ingo Schommer
145f7b13fa Merge pull request #2729 from halkyon/dataobject_validate_visibility 
API DataObject::validate() visibility changed to public (issue #1659)
 2013-12-19 09:16:34 -08:00
Ingo Schommer
ddcdb2c0f0 Updated translations 2013-12-19 18:04:37 +01:00
Ingo Schommer
973d56e57b Updated translation docs to include JS process 2013-12-19 18:00:54 +01:00
Ingo Schommer
2fe703592c Merge pull request #2614 from ryanwachtl/2613-themedcss-project-dir 
Check for file in project() folder when calling Requirements::themedCSS(...
 2013-12-19 08:31:04 -08:00
Ingo Schommer
1fc1111eed Merge pull request #2719 from kinglozzer/uploadfield-deferred-loading 
FIX: Defer loading of UploadField EditForm iframes (fixes #2711)
 2013-12-19 08:26:57 -08:00
Loz Calver
06d7bb77c0 FIX: Defer loading of UploadField EditForm iframes (fixes #2711) 
Also addresses issue #1439.

I don’t like the binding iframe.on('load') events in the onclick handler, but apparently Entwine doesn't support binding on iframes.

AssetAdmin and HtmlEditorField support added
 2013-12-19 09:11:31 +00:00
Sean Harvey
8ea8789ba7 Merge pull request #2721 from froog/year_fix 
FIX: Year.php getDefaultOptions now fixed, sets key as year. Also added YearTest unit test.
 2013-12-18 21:55:48 -08:00
Sean Harvey
6fc9db6f0e API DataObject::validate() visibility changed to public (issue #1659) 
DataObject::validate() is currently set to protected, but this means
you can't call validate() from outside the context of itself unless
you overload the method to use a public visibility and then call
parent::validate()

As it would turn out, most classes that overload this method already
set the visibility to public, so it would make sense the parent matches
that as well.
 2013-12-19 16:36:39 +13:00
Ingo Schommer
15c7252af0 beforeMemberLoggedIn/beforeMemberLoggedOut hooks 
Required to save/restore parts of the session information,
which Member nukes indiscriminately on logout.

Specific use case is restoring linkages to temporary databases
on Behat test runs.
 2013-12-18 18:26:01 +01:00
Will Rossiter
763aa2fbf6 Clarify usage of extend within DataExtensions 2013-12-18 19:59:58 +13:00
Sean Harvey
b54661fd9f Merge pull request #2727 from jaydenseric/patch-1 
Fixed `SQLQuery` class code examples
 2013-12-17 16:53:21 -08:00
Jayden Seric
0b24d520f9 Update SQLQuery.php 
Updated `SQLQuery` class code examples for functions `setOrderBy` and `addOrderBy` to use their new names.
 2013-12-18 10:00:31 +11:00
Martijn
668610941c File validate should have extend hook 
Currently you can't add validation rules to File thru a DataExtension.
This fixes this issue.
 2013-12-16 17:07:33 +01:00
Martijn
ee336c13d9 Merge pull request #1 from silverstripe/master 
Update
 2013-12-16 08:04:26 -08:00
Daniel Pickering
94c19e349a FIX: Year.php getDefaultOptions now fixed, sets key as year. Also added YearTest unit test. 2013-12-16 03:29:29 +00:00