Commit Graph

1130 Commits

Author SHA1 Message Date
Daniel Hensby
57582636fa
Update PHPUnit XML configs to remove SS TestListener 2017-03-30 10:35:21 +01:00
Damian Mooyman
e6b713a323 Merge pull request #163 from sminnee/license-file
FIX: Split licence into separate file to match standard.
2017-03-29 17:35:08 +13:00
Sam Minnee
639631013f FIX: Split licence into separate file to match standard. 2017-03-29 12:45:25 +13:00
Ingo Schommer
345c225527 Merge pull request #160 from open-sausages/pulls/4.0/campaign-admin
Add campaign admin module
2017-03-28 17:51:04 +13:00
Damian Mooyman
41c2f8c82e Add campaign admin module 2017-03-28 13:32:45 +13:00
Damian Mooyman
3a1b9a82f5 Add versioned module 2017-03-28 10:35:25 +13:00
Damian Mooyman
2809247c24
Lock dependency-constraint prior to beta
Fixes https://github.com/silverstripe/silverstripe-framework/issues/6737
2017-03-27 10:00:41 +13:00
Loz Calver
2768e6ca6b Merge pull request #161 from dhensby/pulls/phpunit
Update PHP min version and PHPUnit version
2017-03-24 11:28:22 +00:00
Daniel Hensby
d2c8e3c65f
Update PHP min version and PHPUnit version 2017-03-25 00:20:44 +13:00
Damian Mooyman
33087bcc8d Add assets as module 2017-03-23 09:24:14 +13:00
Daniel Hensby
a8eda2ab05 Merge pull request #157 from open-sausages/pulls/4.0/fix-devs
Fix dev dependencies for root project
2017-03-16 16:42:33 +13:00
Daniel Hensby
0e7f29b5db Merge pull request #153 from Zauberfisch/patch-1
Block common log file names in .htaccess
2017-03-16 16:38:15 +13:00
Damian Mooyman
61e5b3836e
Fix dev dependencies for root project 2017-03-16 16:01:15 +13:00
Ingo Schommer
aacbae8107 Merge pull request #156 from open-sausages/pulls/4.0/admin-module
Add admin module to root installer
2017-03-15 12:02:20 +13:00
Damian Mooyman
94f3c609b2
Add admin module to root installer 2017-03-10 15:17:14 +13:00
Damian Mooyman
9da75efec8 Alias 3 as 3.6 2017-03-06 11:13:04 +13:00
Damian Mooyman
18a5348caa Merge pull request #110 from spekulatius/patch-1
tab -> space in editorconfig
2017-03-01 13:00:09 +13:00
Damian Mooyman
9c68dc0276 Merge pull request #155 from open-sausages/pulls/4.0/circular-deps
Fix remove the wildcard After condition in config.yml
2017-02-28 15:32:18 +13:00
Christopher Joe
ac685e4d38 Fix remove the wildcard After condition in config.yml 2017-02-28 15:30:46 +13:00
Zauberfisch
d7834c5ae7 Block common log file names in .htaccess 2017-02-19 11:10:21 +00:00
Daniel Hensby
5d778fa2a5 Merge pull request #152 from open-sausages/pulls/4.0/disable-trailing-slash-redirect
Disable trailing slash redirect for dirs
2017-02-02 10:10:47 +00:00
Ingo Schommer
63948d8064 Disable trailing slash redirect for dirs
If you're running mod_dir on Apache, and create a route which matches a directory name
(such as 'framework'), "GET /framework" will result in a 301 to "/framework/?url=framework".
While the SilverStripe routing might decide to enforce trailing slash rules later,
Apache shouldn't have any business here.

The specific bug this fixes was redirecting "/graphql" to "/graphql/",
with the silverstripe/graphql module installed.

See https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryslash
2017-02-02 21:03:09 +13:00
Loz Calver
c92cc50353 Merge pull request #150 from dhensby/pulls/4/dot-env-example
NEW Add .env.example file
2017-02-01 11:27:24 +00:00
Daniel Hensby
06b475896d
NEW Add .env support 2017-02-01 11:26:46 +00:00
Daniel Hensby
a4d886e9d4 Merge pull request #149 from colintucker/fix-controller-init-visibility
Changed init() visibility to protected
2017-01-23 16:38:11 +00:00
Colin Tucker
0cbee4b0c2 Changed init() visibility to protected 2017-01-22 09:34:57 +11:00
Damian Mooyman
322a94e2c4 Merge pull request #148 from open-sausages/pulls/graphql-dep
Added GraphQL dependency
2017-01-17 13:26:32 +13:00
Ingo Schommer
a8572e7b22 Added GraphQL dependency
This is required here in order for the "cow" release tool
to include the module in tagging releases.

At the moment, it's only an indirect asset-admin dependency,
but will become a framework dependency once we switch
CampaignAdmin to use GraphQL as well.
2017-01-17 11:44:33 +13:00
Ingo Schommer
5e3e66916d Merge pull request #146 from robbieaverill/feature/controllers-without-underscores
API Change Page_Controller to PageController (PSR-2 compliance)
2017-01-12 08:52:11 +13:00
Robbie Averill
e9a4095c9a PSR-2 compliance: Move PageController class to its own file 2017-01-05 13:07:23 +13:00
Robbie Averill
fb06cc0075 API Change Page_Controller to PageController (PSR-2 compliance) 2017-01-05 13:03:18 +13:00
Damian Mooyman
51a9fdf5d1
BUG Fix test listener path 2016-11-02 11:13:46 +13:00
Damian Mooyman
9a24d8e437
Update installer for src folder 2016-11-01 15:35:26 +13:00
Daniel Hensby
70e85745fb Merge pull request #137 from tractorcow/pulls/4.0/cow-meta
[WIP] Add experimental release metadata to module
2016-10-12 01:11:01 +01:00
Damian Mooyman
41f865a79c
Add experimental release metadata to module 2016-10-12 10:04:25 +13:00
Daniel Hensby
fce041c5af Merge pull request #141 from JorisDebonnet/patch-3
Updated link to Requirements doc
2016-09-26 14:25:32 +01:00
JorisDebonnet
20740026da Updated link to Requirements doc 2016-09-26 15:10:33 +02:00
Damian Mooyman
4301fa850d BUG Fix incorrect backslash escaping in htaccess template (#140) 2016-09-22 18:01:44 +12:00
Damian Mooyman
a7ec54cb25 Remove self.version (#138)
Lock dev branches to dev
2016-09-20 10:20:52 +12:00
Damian Mooyman
98ad908532 Rename SS_ prefixed classes (#136) 2016-09-09 15:33:34 +12:00
Ingo Schommer
c9bf8bb016 Merge pull request #135 from open-sausages/pulls/4.0/namespace-everything
Upgrade installer
2016-09-08 16:15:56 +12:00
Daniel Hensby
73a519587f
Merge branch '3' 2016-09-08 00:27:46 +01:00
Damian Mooyman
3df2ddde13 Upgrade installer 2016-09-07 17:33:14 +12:00
Ingo Schommer
ba721842c5 Merge pull request #134 from open-sausages/pulls/4.0/remove-i18n-setlocale
Remove i18n::set_locale from default installer
2016-09-07 17:08:25 +12:00
Damian Mooyman
638abc5808
Remove i18n::set_locale from default installer 2016-09-07 16:57:11 +12:00
Daniel Hensby
ca725e6269 Merge pull request #132 from robbieaverill/bugfix/131-asset-admin-dev-master
FIX use latest dev-master for asset-admin composer contraint
2016-08-31 21:31:30 +01:00
Robbie Averill
a6f1fa3b91 FIX use 1.0.x-dev for asset-admin composer contraint
* Resolves #131
2016-09-01 08:03:27 +12:00
Hamish Friedlander
d62ddadb91 Merge pull request #130 from open-sausages/pulls/4.0/namespace-cms
Update for CMS namespace
2016-08-11 08:10:05 +07:00
Damian Mooyman
a54cd1fa31 Merge 3.4 into 3
# Conflicts:
#	composer.json
2016-08-05 19:13:06 +12:00
Damian Mooyman
3fa6f04047 Update for CMS namespace 2016-08-04 14:41:44 +12:00