tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-17 23:16:04 +02:00
Code Issues Projects Releases Wiki Activity
19,055 Commits 30 Branches 526 Tags 155 MiB
924e2a714f
Commit Graph

19055 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
924e2a714f Fix sake path relative to vendor 2017-10-04 09:32:05 +01:00
Ingo Schommer
68d99c579f Merge pull request #7427 from open-sausages/pulls/4/vendorise-me-baby 
BUG Fix resource mapping for TinyMCE
 2017-10-04 21:31:28 +13:00
Ingo Schommer
f6ce07dc88 Fix behat bootstrap path 2017-10-04 08:12:37 +01:00
Damian Mooyman
1b6d0144c5
BUG Fix resource mapping for TinyMCE 
API add ModuleResource::getRelativeResource()
 2017-10-04 17:44:04 +13:00
Damian Mooyman
4cbaf7cccb Merge pull request #7418 from open-sausages/pulls/4/vendorise-me-baby 
Expose as vendor module
 2017-10-03 16:08:19 +13:00
Damian Mooyman
16f4345124
Remove unnecessary FRAMEWORK_DIR constants 2017-10-03 14:52:23 +13:00
Damian Mooyman
f4a77649a4
Fix requirements tests 2017-10-03 14:21:24 +13:00
Damian Mooyman
5ffe64f024
Fix tinymce plugins 2017-10-03 14:08:24 +13:00
Damian Mooyman
cdefd19091
Ensure HTMLEditor can load vendor css 2017-10-03 13:08:22 +13:00
Damian Mooyman
f64c95b33c
Add new ModuleResourceLoader helper 2017-10-03 12:20:49 +13:00
Ingo Schommer
e1b98d154e Fix tinymce operation for resource paths 
It was referencing secondary TinyMCE assets in the vendor/* folder
from its generated files (e.g. skin.min.css).
 2017-10-03 09:03:37 +13:00
Ingo Schommer
8e49b563a9 Fix installer paths for vendorised module 2017-10-03 09:03:37 +13:00
Ingo Schommer
ffcfd4b7e8 Remove .htaccess (no longer in webroot) 
See https://github.com/silverstripe/silverstripe-framework/issues/7405
 2017-10-03 09:03:37 +13:00
Ingo Schommer
85a951584e Update main.php path to support framework in vendor 2017-10-03 09:03:37 +13:00
Ingo Schommer
31b213be7b Allow autoloading from vendor path 2017-10-03 09:03:36 +13:00
Ingo Schommer
e884dc3b53 Expose as vendor module 2017-10-03 09:03:33 +13:00
Daniel Hensby
b783df04fd Merge pull request #7417 from open-sausages/pulls/4.0/test-dev 
Fix test environment type
 2017-10-02 17:34:37 +01:00
Damian Mooyman
85255891be
Fix test environment type 2017-10-02 17:13:00 +13:00
Damian Mooyman
b4910e133c Merge pull request #7412 from open-sausages/pulls/4.0/fun-times-in-thumbnails 
Enhancement add notice for MigrateFileTask if FileMigrationHelper doesn't exist
 2017-10-02 16:59:40 +13:00
Damian Mooyman
17718e3854 Merge pull request #7415 from open-sausages/pulls/4.0/no-cache-in-my-home 
Fix typos in FilesystemCacheFactory
 2017-10-02 16:53:52 +13:00
Damian Mooyman
c8925c93a0
Update documentation for file migration 2017-10-02 15:30:37 +13:00
Chris Joe
b219e40ff7 Merge pull request #7414 from open-sausages/pulls/4.0/basic-auth-var 
BUG Restore SS_USE_BASIC_AUTH env var
 2017-10-02 15:11:19 +13:00
Christopher Joe
26f7f0482c Fix typos in FilesystemCacheFactory 2017-10-02 15:10:44 +13:00
Christopher Joe
36397c787c Enhancement add notice for MigrateFileTask if FileMigrationHelper doesn't exist 
Enhancement add call to image thumbnail helper to generate thumbnails
 2017-10-02 14:54:31 +13:00
Chris Joe
fe98555d0a Merge pull request #7413 from open-sausages/pulls/4.0/member-i18n-speed 
ENHANCEMENT Use less expensive i18n defaults in Member::populateDefaulateDefaults()
 2017-10-02 13:03:44 +13:00
Chris Joe
ccc24764c4 Merge pull request #7411 from open-sausages/pulls/4.0/superfluous-date-props 
Remove superfluous datefield props
 2017-10-02 10:24:30 +13:00
Ingo Schommer
349e1e739c Merge pull request #7395 from open-sausages/pulls/4.0/vendor-modules 
WIP Vendor modules proof of concept
 2017-09-29 19:48:20 +13:00
Damian Mooyman
e2750c03fc
BUG Restore SS_USE_BASIC_AUTH env var 
Fixes #7268
 2017-09-29 16:56:56 +13:00
Damian Mooyman
f4b1417612
ENHANCEMENT Use less expensive i18n defaults in Member::populateDefaults() 
Fixes #7381
 2017-09-29 16:40:17 +13:00
Damian Mooyman
fa57deeba4
ENHANCEMENT Allow vendor modules with url rewriting 
API Introduce ModuleResource feature
 2017-09-29 10:28:38 +13:00
Damian Mooyman
3011650b5a
Remove superfluous datefield props 
Fixes #7397
 2017-09-29 10:25:22 +13:00
Damian Mooyman
91943c03e5 Merge pull request #7392 from open-sausages/pulls/4.0/there-is-no-leftandmain-config 
Enhancement Add setter and getter for certain classes
 2017-09-29 09:25:36 +13:00
Damian Mooyman
f574f6d1b2
Reset test state for modified config options 2017-09-28 17:24:32 +13:00
Christopher Joe
53b2fcd1ea Fix amend TinyMCE combined generator's unit test to be more lenient with encoding 2017-09-28 16:47:13 +13:00
Christopher Joe
90d0361a6c Enhancement update set_themes to not update config 2017-09-28 16:47:13 +13:00
Christopher Joe
7e92b053f4 Enhancement Add setter and getter for certain classes, so that LeftAndMain no longer updates config during init 2017-09-28 16:47:13 +13:00
Damian Mooyman
da27948777 Merge pull request #7373 from dhensby/pulls/4/rate-limit-security 
NEW RateLimiter for Security controller
 2017-09-28 11:01:37 +13:00
Damian Mooyman
e4fd9b4ff7
Code style fixes 2017-09-28 09:54:29 +13:00
Damian Mooyman
3a7c8fd0d7
Adjust YML conditionals 2017-09-28 09:15:00 +13:00
Daniel Hensby
c077abf353
DOCS new rate limiting docs 2017-09-27 17:40:04 +01:00
Daniel Hensby
5f739c111e
added ratelimiter tests 2017-09-27 16:42:04 +01:00
Daniel Hensby
51ac297c59
Fixes to ratelimiter and new features 2017-09-27 14:44:38 +01:00
Daniel Hensby
060c2d62d3
Merge pull request #7408 from ajoneil/fix-paginated-list-get-vars 
Prior to this change, if there were already GET vars on a page
with a PaginatedList, the links would include a mix of '&' and '&'.
 2017-09-27 09:41:32 +01:00
Andrew O'Neil
c7cbbb29f4 Fix links on paginated lists when there are GET vars 
Prior to this change, if there were already GET vars on a page
with a PaginatedList, the links would include a mix of '&' and '&'.
 2017-09-27 15:41:08 +10:00
Ingo Schommer
f981d09080 Merge pull request #7400 from open-sausages/pulls/4.0/expose-i18n 
Update docs for i18n
 2017-09-27 09:45:33 +13:00
Loz Calver
1ba18461f5 Merge pull request #7403 from dhensby/pulls/4/act-as-for-tests 
NEW Add actWithPermission to SapphireTest
 2017-09-26 14:19:14 +01:00
Daniel Hensby
28552155c3
NEW Add actWithPermission to SapphireTest for shortcut to perform actions with specific permissions 2017-09-26 13:39:31 +01:00
Damian Mooyman
a478939ea9
Update docs for i18n 2017-09-26 12:08:40 +13:00
Daniel Hensby
5f8eb0806e Merge pull request #7398 from mikenz/patch-14 
FIX readonly PermissionCheckboxSetField
 2017-09-25 11:17:01 +01:00
Mike Cochrane
b8e5a2ce32 FIX readonly PermissionCheckboxSetField 
A readonly PermissionCheckboxSetField (eg in Security when viewing a member without permission to edit it) can result in calling "getRecord()" on null.  Add is_object check, consistent with line 98.
 2017-09-25 15:25:10 +13:00