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,783 Commits 31 Branches 527 Tags 162 MiB
558d202bf2
Commit Graph

12783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
558d202bf2 Merge pull request #2746 from micmania1/move-test-theme-setup 
API moved useTestTheme to base Sapphire test class so that it can be used elsewhere
 2014-01-30 18:08:21 -08:00
Will Rossiter
b52a82185f Merge pull request #2764 from camfindlay/patch-2 
Typo, duplicate silverstripe-documentation
 2014-01-08 22:54:37 -08:00
camfindlay
39ed36dad6 Typo, duplicate silverstripe-documentation 2014-01-09 19:53:42 +13:00
Simon Welsh
39d42e4ea3 Merge branch '3.1' 2014-01-09 08:22:47 +13:00
Sriram Venkatesh
efa309c977 Corrects Broken Link 2014-01-09 08:20:34 +13:00
Simon Welsh
ac1658b500 Merge pull request #2758 from edlinklater/patch-1 
MINOR fix typo in link
 2014-01-07 10:59:49 -08:00
Ed Linklater
264fbcbff6 MINOR fix typo in link 2014-01-08 03:14:20 +13:00
Will Rossiter
98c01a34f6 Merge pull request #2752 from nedmas/patch-1 
FIX: Documentation for Silverstripe Test
 2014-01-02 13:04:53 -08:00
Tom Densham
a04c79872f FIX: Documentation for Silverstripe Test 
Change the access level of the `static $fixture_file` property in the example code.
 2014-01-02 11:38:43 +00:00
micmania1
5fff5afb47 API moved useTestTheme to base Sapphire test class so that it can be used elsewhere (eg CMS test) 2013-12-23 21:54:20 +00:00
Will Rossiter
1c6bea9bb5 Merge pull request #2745 from guttmann/patch-1 
Fix error in code block for ModelAdmin documentation
 2013-12-23 12:44:25 -08:00
James Goodman
9c9e5c0656 Fix error in code block for ModelAdmin example 2013-12-24 07:59:05 +13:00
Will Rossiter
88c59ef0a7 Fix icon being stretched in ModelAdmins 2013-12-23 20:21:05 +13:00
Will Rossiter
3f6db0ddae Fix section icon in cms header 2013-12-21 17:23:07 +13:00
Will Rossiter
3e2cf27b38 Add ability for a panel link to link externally. 2013-12-21 16:59:09 +13:00
Will Rossiter
770e23f8e1 Merge pull request #2270 from ARNHOE/3.1-updatedfieldgroup 
BUG Updated fieldgroup class and example code
 2013-12-20 19:14:21 -08:00
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