Compare commits

...

1221 Commits
2.1.0-rc1 ... 4

Author SHA1 Message Date
Guy Sartorelli 603ffc064b
Merge branch '4.13' into 4 2023-09-18 11:32:55 +12:00
Guy Sartorelli 9372698a6b
Merge pull request #361 from creative-commoners/pulls/4.13/exclude
MNT Fix exclude node
2023-09-07 17:16:32 +12:00
Steve Boyd 3887540da7 MNT Fix exclude node 2023-09-07 14:14:12 +12:00
Guy Sartorelli 635d8be6fc
Merge branch '4.13' into 4 2023-08-29 10:28:52 +12:00
Guy Sartorelli 036f173a38
MNT Run ORM tests in parallel to other tests (#356) 2023-08-07 11:57:39 +12:00
Guy Sartorelli 6b966add42
MNT Update development dependencies 2023-04-26 12:45:22 +12:00
Guy Sartorelli 3445801412
Merge branch '4.13' into 4 2023-04-26 12:45:22 +12:00
Guy Sartorelli a8f62aab68
MNT Update development dependencies 2023-04-26 12:08:16 +12:00
Guy Sartorelli 7264db0e34
MNT Update release dependencies 2023-04-26 12:08:13 +12:00
Guy Sartorelli b18c0372f2
MNT Update development dependencies 2023-03-29 12:37:21 +13:00
Guy Sartorelli bd202820de
MNT Update release dependencies 2023-03-29 12:37:18 +13:00
Maxime Rainville 5ce684af70
Merge pull request #351 from creative-commoners/pulls/4/dispatch-ci
MNT Use gha-dispatch-ci
2023-03-23 12:07:25 +13:00
Steve Boyd ea654c1c9e MNT Use gha-dispatch-ci 2023-03-21 14:10:08 +13:00
Guy Sartorelli f2f7455177
MNT Update development dependencies 2023-03-10 16:31:44 +13:00
Guy Sartorelli f38f39761e
MNT Update release dependencies 2023-03-10 16:31:40 +13:00
Guy Sartorelli e9fcd38f52
MNT Update development dependencies 2023-03-10 12:21:28 +13:00
Steve Boyd 5e497fa85f Merge branch '4.12' into 4 2023-02-02 16:37:27 +13:00
Guy Sartorelli 1049f90978
Merge pull request #348 from creative-commoners/pulls/4.12/test-other-modules
MNT Test additional modules
2023-01-26 14:09:42 +13:00
Steve Boyd 44a3fdb0ea MNT Test additional modules 2023-01-26 10:20:05 +13:00
Steve Boyd f10a0206af
MNT Update development dependencies (#346) 2022-12-21 13:11:39 +13:00
Guy Sartorelli 4886a740ad
Merge pull request #345 from creative-commoners/pulls/4.12/stabilise
DEP Stabilise requirements
2022-12-21 12:25:34 +13:00
Steve Boyd ed70400f9c DEP Stabilise requirements 2022-12-21 11:09:10 +13:00
Guy Sartorelli 0d52cbc913
Merge pull request #344 from creative-commoners/pulls/4.12/frameworktest
FIX Move test requirements out of require-dev
2022-12-21 11:01:04 +13:00
Steve Boyd 62c49cac6d FIX Move test requirements out of require-dev 2022-12-21 10:11:27 +13:00
Guy Sartorelli ce944e8417
MNT Update development dependencies 2022-12-19 01:59:17 +00:00
Guy Sartorelli 58ada1c9ed
Merge branch '4.12' into 4 2022-12-19 01:59:17 +00:00
Guy Sartorelli 07e1b32a53
MNT Update development dependencies 2022-12-19 01:59:12 +00:00
Guy Sartorelli 0b89a51c0c
Merge branch '4.12-release' into 4.12 2022-12-19 14:55:52 +13:00
Guy Sartorelli 9c3ffd47c5
MNT Update release dependencies 2022-12-19 01:26:11 +00:00
Guy Sartorelli fe1be1b8b7
MNT Update release dependencies 2022-11-30 03:27:41 +00:00
Guy Sartorelli 6a500ec454
Merge pull request #339 from creative-commoners/pulls/4.12/minor-xdev
MNT Update development dependencies
2022-11-28 12:47:28 +13:00
Steve Boyd 04f9beecf5 MNT Update development dependencies 2022-11-23 16:23:15 +13:00
Guy Sartorelli 7bc208e571
MNT Update development dependencies 2022-11-10 23:51:55 +00:00
Steve Boyd 4f62379f58 Merge branch '4.11' into 4 2022-08-02 18:47:06 +12:00
Steve Boyd 19c057efee Merge branch '4.10' into 4.11 2022-08-02 18:46:56 +12:00
Guy Sartorelli 8691390ad9
Merge pull request #329 from creative-commoners/pulls/4.10/standardise-modules
MNT Standardise modules
2022-08-02 14:29:06 +12:00
Steve Boyd 030e0d60fa MNT Standardise modules 2022-08-01 09:59:21 +12:00
Steve Boyd a19303860f Merge branch '4.11' into 4 2022-07-25 11:30:18 +12:00
Steve Boyd 4d67d06700 Merge branch '4.10' into 4.11 2022-07-25 11:29:57 +12:00
Guy Sartorelli 56462207b6
Merge pull request #328 from creative-commoners/pulls/4.10/typo
MNT Fix typos
2022-07-22 14:19:00 +12:00
Steve Boyd 5b756664cc MNT Fix typos 2022-07-22 12:01:06 +12:00
Guy Sartorelli 4219d455d5
Merge pull request #326 from creative-commoners/pulls/4.10/module-standards
MNT Use GitHub Actions CI
2022-07-18 10:22:29 +12:00
Steve Boyd a8d6ffdeab MNT Use GitHub Actions CI 2022-07-18 10:14:54 +12:00
Guy Sartorelli 4eea3f390a Merge branch '4.11' into 4 2022-06-14 11:33:28 +12:00
Maxime Rainville 45921d29de
Merge pull request #324 from creative-commoners/pulls/4.11/public-graphql-folder
ENH Add and ignore public/_graphql
2022-06-07 21:43:21 +12:00
Guy Sartorelli 57195eab03 ENH Add and ignore public/_graphql
silverstripe/graphql v4 needs write access to this directory, so it may
be easier for some developers to have the directory there as soon as
they `composer create_project silverstripe/installer`.

Like `.graphql-generated`, best practice is to not commit this directory
to VCS, and instead let it be filled at deploy time.
2022-06-02 10:33:36 +12:00
Maxime Rainville 7c06e8cbd1
Merge pull request #323 from creative-commoners/pulls/4.11/graphql-folder
ENH Add `.graphql-generated` directory by default
2022-06-01 21:11:26 +12:00
Guy Sartorelli 612ff2922b ENH Add `.graphql-generated` directory by default.
This directory will be required for all new projects (unless explicitly
opting out of graphql v4) - having this directory by default makes it
easier to set more sane permissions (i.e. not requiring the entire
project root to be writable).
2022-05-30 12:25:47 +12:00
Steve Boyd 3a5f852d31 Merge branch '4.11' into 4 2022-05-10 21:58:20 +12:00
Guy Sartorelli db70cb692a
Merge pull request #322 from creative-commoners/pulls/4.11/devreq
DEP 4.11 dev requirements
2022-05-06 13:41:58 +12:00
Steve Boyd 8fe8bf5bec DEP 4.11 dev requirements 2022-05-05 12:18:08 +12:00
Guy Sartorelli f19d383c68
Merge pull request #321 from creative-commoners/pulls/4/remove-pgsql
MNT Only use mysql in matrix
2022-05-03 09:55:28 +12:00
Steve Boyd fea0ee4a96 MNT Only use mysql in matrix 2022-05-02 11:12:42 +12:00
Guy Sartorelli 7b08763477
Merge pull request #320 from creative-commoners/pull/4/no-allow-failure
MNT Do not allow failures on php 8.1
2022-04-28 16:50:22 +12:00
Steve Boyd 6e5f726df7 MNT Do not allow failures on php 8.1 2022-04-28 15:13:54 +12:00
Sabina Talipova 3ed95a2fc3
Merge pull request #319 from silverstripe/pulls/4/add-composer-installer-plugin
MNT Add composer/installers to allow-plugins by default.
2022-04-26 12:32:13 +12:00
Guy Sartorelli bba20c5159
MNT Add composer/installers to allow-plugins by default. 2022-04-14 17:01:13 +12:00
Maxime Rainville ce4615980c
MNT Ignore .graphql-generated in source control (#318) 2022-04-14 09:42:11 +12:00
Maxime Rainville 567236f2e8
Merge pull request #315 from creative-commoners/pulls/4/php74
DEP Set PHP 7.4 as the minimum version
2022-03-07 16:10:35 +13:00
Steve Boyd d75e848a71 DEP Set PHP 7.4 as the minimum version 2022-02-21 09:51:35 +13:00
GuySartorelli 9a342a58ee
DOC Change "SilverStripe" to "Silverstripe" in readme (#314) 2022-02-02 10:15:45 +13:00
GuySartorelli 55f6e03f6e
ENH Explicitly allow SilverStripe composer plugins (#313)
As of Composer 2.2.0, there is a new configuration property to whitelist plugins which are allowed to run. According to https://getcomposer.org/doc/06-config.md#allow-plugins this will default to disallow all plugins from July 2022.
2022-01-21 10:13:00 +13:00
Steve Boyd e1d2cd30e6 Merge branch '4.10' into 4 2021-12-22 10:25:41 +13:00
Maxime Rainville 345f091fd4
Merge pull request #312 from creative-commoners/pulls/4/410
DEP 4.10 requirements
2021-12-03 17:36:17 +13:00
Steve Boyd 0bc751ad90 DEP 4.10 requirements 2021-12-02 15:54:33 +13:00
Maxime Rainville e48b1662a8
Merge pull request #310 from creative-commoners/pulls/4/sapphire-test-nine
API phpunit 9 support
2021-11-10 17:11:08 +13:00
Steve Boyd 54a8b8ce8f API phpunit 9 support 2021-11-04 11:13:45 +13:00
Maxime Rainville 081282cac1 MNT Target 4.x release 2021-09-03 11:53:14 +12:00
Maxime Rainville 2065c471ed MNT Targget 4.9.x release 2021-09-03 11:52:06 +12:00
Maxime Rainville 7ee712f47c
Merge pull request #309 from creative-commoners/pulls/4/cow-update
MNT supress changelog generation and loosen dependency constraint
2021-08-25 21:05:58 +12:00
Maxime Rainville d1fcd1c061 MNT supress changelog generation and loosen dependency constraint 2021-08-25 18:12:01 +12:00
Maxime Rainville e93ef98999
Merge pull request #308 from creative-commoners/pulls/4/sendmail
ENH Use Swift_SendmailTransport for new projects
2021-08-20 13:08:16 +12:00
Steve Boyd be9d875141 ENH Use Swift_SendmailTransport for new projects 2021-08-19 09:57:24 +12:00
Daniel Hensby ab68119de6
Merge pull request #306 from s-en-o/patch-1
Fix typo
2021-06-21 15:43:17 +01:00
Seno 9487628f7a
Fix typo 2021-06-21 20:58:29 +12:00
Steve Boyd 26e55e5226 Merge branch '4.8' into 4 2021-05-21 13:45:50 +12:00
Steve Boyd 6bb9c73137
Merge pull request #303 from creative-commoners/pulls/4.8/update-composer-dep
MNT Update composer dep for 4.8 release
2021-05-04 16:53:04 +12:00
Maxime Rainville c90a8d3729 MNT Update composer dep for 4.8 release 2021-05-04 16:35:51 +12:00
Bryn Whyman 221b39bb27
Merge pull request #302 from creative-commoners/pulls/4/login-forms-changelog
ENH Add login-forms to changelog template
2021-04-30 12:10:53 +12:00
Steve Boyd 4e1fa260ee ENH Add login-forms to changelog template 2021-04-30 12:06:27 +12:00
Andre Kiste 69df70b045
Merge pull request #301 from creative-commoners/pulls/4/behat-framework
MNT Use admin behat suite instead of framework
2021-04-27 17:35:35 +12:00
Andre Kiste 4e47962d23
Merge pull request #299 from creative-commoners/pulls/4/multitab-frameworktest
MNT Bump frameworktest
2021-04-27 17:35:28 +12:00
Steve Boyd 5811293a74 MNT Use admin behat suite instead of framework 2021-04-27 12:44:46 +12:00
Steve Boyd 6961632875 MNT Bump frameworktest 2021-04-27 12:36:01 +12:00
Andre Kiste 37f30ca54e
Merge pull request #297 from creative-commoners/pulls/4/vfsstream
MNT Install vfsstream on travis
2021-04-27 12:12:15 +12:00
Steve Boyd 643a3bded3 MNT Install vfsstream on travis 2021-04-23 10:15:48 +12:00
Steve Boyd 821589a018 Merge branch '4.7' into 4 2021-01-28 12:37:14 +13:00
Steve Boyd 0ff05595bb
MNT Use frameworktest 0.3.0 for graphql 4 compatibility (#295) 2021-01-28 12:36:24 +13:00
Steve Boyd 9e637f7e07 Merge branch '4.7' into 4 2021-01-27 16:40:03 +13:00
Garion Herman 870ba6f55d
Merge pull request #294 from creative-commoners/pull/4.7/php8
MNT Update PHP8
2021-01-27 16:10:16 +13:00
Steve Boyd 3e2629a602 MNT Update PHP8 2021-01-27 11:25:31 +13:00
Steve Boyd da876a829c
Update build status badge 2021-01-21 16:31:53 +13:00
Steve Boyd d48994d993 Merge branch '4.7' into 4 2021-01-02 19:40:05 +13:00
Andre Kiste b594a257ca
Merge pull request #293 from creative-commoners/pulls/4.7/travis-shared
MNT Travis shared config
2020-12-21 14:59:00 +13:00
Steve Boyd 7be811a914 MNT Travis shared config 2020-12-15 13:57:29 +13:00
Serge Latyntsev 523372bc15
Merge pull request #292 from creative-commoners/pulls/4.7/fix-deps
MNT installer 4.7 requires recipe-cms 4.7 and login-forms 4.3
2020-11-11 12:21:23 +13:00
Serge Latyntcev 44728e4d9b MNT installer 4.7 requires recipe-cms 4.7 and login-forms 4.3 2020-11-11 12:06:43 +13:00
Serge Latyntsev 495b9442d5
Merge pull request #290 from creative-commoners/pulls/4/php-8-builds
MNT Add PHP 8 builds
2020-10-23 11:21:40 +13:00
Garion Herman f955099b6e MNT Add quotes to Behat config for Symfony 4 compat 2020-10-16 10:02:39 +13:00
Garion Herman 25332311ea MNT Add $COMPOSER_ARG to dependency installation 2020-10-16 10:02:12 +13:00
Garion Herman 4ea1f7082b MNT Add PHP 8 builds 2020-10-14 14:31:51 +13:00
Serge Latyntsev 0a57853c60
Merge pull request #289 from creative-commoners/pulls/4/use-changelog-template
MNT Tweak changelog template, ensure it is used by Cow
2020-10-13 13:18:18 +13:00
Garion Herman 4ddf1a901e MNT Tweak changelog template, ensure it is used by Cow 2020-10-09 15:28:58 +13:00
Steve Boyd 1b561f8d80
Update .travis.yml 2020-10-08 10:03:28 +13:00
Manuel Thalmann 6035ccd689
FIX Add redirects to `public/` for iis (#263)
FIX Add redirects to `public/` for iis
2020-09-22 09:31:34 +12:00
Steve Boyd 65b2a72843 Merge branch '4.6' into 4 2020-09-11 09:59:09 +12:00
Steve Boyd ae68dc4299
Merge pull request #286 from creative-commoners/changelog-template
DOCS more information in changelog template
2020-09-11 09:56:20 +12:00
Robbie Averill 1ac80f05a8
Merge pull request #288 from open-sausages/pulls/4/ignow-dot-cow-folder-on-builds
BUG Don't include the .cow folders in releases
2020-09-10 09:24:24 -07:00
Maxime Rainville 80d1bdf621 BUG Don't include the .cow folders in releases 2020-09-10 20:23:58 +12:00
brynwhyman d76bd7d66e DOCS more information in changelog template
I've taken reference from the 4.6.1 change log to use the 'CMS Recipe' table. The other information is taken from the exisitng CWP change log template, see: https://github.com/silverstripe/cwp-recipe-kitchen-sink/blob/2/.changelog.md.twig
2020-09-10 16:50:43 +12:00
Garion Herman daa0bf08ae
Merge pull request #271 from mandrew/patch-2
Set environment type in example
2020-07-27 10:36:02 +12:00
Michael Andrewartha be7e4c8730 Set environment type in example
When running a dev/build for the first time, environment should be set to 'dev' or it won't run. 
Setting this in the example gives guidance to someone building a site for the first time (or if it's been ages!)
2020-07-27 10:34:36 +12:00
Steve Boyd fb77893766
Merge pull request #278 from open-sausages/pulls/4/make-login-forms-core-module
BUG Treat login-forms as a core module
2020-07-02 15:48:31 +12:00
Maxime Rainville 27231bf315 BUG Treat login-forms as a core module 2020-06-30 22:14:55 +12:00
Robbie Averill 074c9dc45c Merge branch '4.6' into 4
# Conflicts:
 #	.travis.yml
2020-06-23 09:52:47 -07:00
Robbie Averill 63830aec7f
Merge pull request #285 from creative-commoners/pulls/4.6/travis
Update travis 4.6
2020-06-23 09:49:30 -07:00
Steve Boyd 5877d0ecce Update travis 2020-06-23 17:16:31 +12:00
Andre Kiste 9f2a17337a
Merge pull request #283 from creative-commoners/pulls/4/add-frameworktest
Require frameworktest
2020-06-16 14:48:25 +12:00
Steve Boyd ffd0a85bd3 Require frameworktest 2020-06-16 12:42:59 +12:00
Maxime Rainville d6bcc27fb5
Prep installer 4.6 branch. (#279)
API Bump requirements for recipe-cms to 4.6.x, require frameworktest for asset-admin behat test
2020-05-28 17:11:08 +12:00
Garion Herman 46f687ab5a Merge branch '4.5' into 4 2020-03-03 15:20:24 +13:00
Robbie Averill 3f9e2618c2
Merge pull request #275 from creative-commoners/pulls/4.5/php-7.4-builds
Update Travis config to include PHP 7.4 builds
2020-02-26 16:15:14 +11:00
Garion Herman 6851935652 Add sminnee/phpunit-mock-objects to fix PHP 7.4 compat 2020-02-26 16:45:52 +13:00
Garion Herman 02ca9d772a Update Travis config to include PHP 7.4 builds 2020-02-26 14:58:21 +13:00
Steve Boyd 6bb01369f5
Merge pull request #270 from creative-commoners/pulls/4.5/remove-source-link-from-readme
DOC Update README with valid links to documentation
2020-02-03 17:01:23 +13:00
Steve Boyd c921509259
Merge pull request #272 from creative-commoners/pulls/4.5/rc-changelog-message
DOC Adjust changelog template for RC releases
2020-01-16 13:29:23 +13:00
Garion Herman 966f7343d5 DOC Adjust changelog template for RC releases 2020-01-15 11:44:26 +13:00
Garion Herman e5840dfbeb DOC Update README with valid links to documentation 2020-01-06 10:46:35 +13:00
Robbie Averill 03cab91539
Merge pull request #257 from open-sausages/pulls/4/login-forms
NEW Add silverstripe/login-forms
2019-12-10 19:52:31 -08:00
Ingo Schommer 87ae55539e
Merge branch '4' into pulls/4/login-forms 2019-12-11 15:46:06 +13:00
Andre Kiste 8f62bb9488
Merge pull request #267 from creative-commoners/pulls/4/rfc-9344
RFC-9344 Remove branch aliases
2019-12-10 13:38:53 +13:00
Serge Latyntcev a3bc3d80c5 RFC-9344 Remove branch aliases 2019-12-09 10:58:15 +13:00
Robbie Averill 54265626f1
Merge pull request #266 from creative-commoners/recover/4
Update branch aliases
2019-11-28 16:50:18 -08:00
Serge Latyntcev 3bf4d1f34c Update branch alias, requirements and travis config 2019-11-29 12:00:14 +13:00
Serge Latyntcev e3230a7371 Remove obsolete branch-alias 2019-11-14 01:24:53 +00:00
Serge Latyntcev 56b9c16880 Merge branch '4.4' into 4 2019-11-13 15:50:30 +13:00
Serge Latyntcev 93f8699b65 Merge branch '4.3' into 4.4 2019-11-13 15:49:40 +13:00
Garion Herman b171632ccd
Merge pull request #254 from creative-commoners/pulls/4.4/release-changelog-template
Add and configure Cow changelog template
2019-10-22 13:00:41 +13:00
Garion Herman 626d7c9f99
FIX Update changelog template location config 2019-10-22 11:54:04 +13:00
Ingo Schommer d01cf63018
Merge pull request #260 from open-sausages/pulls/4.3/remove-archive
Remove cow archive metadata
2019-09-24 10:41:54 +12:00
Ingo Schommer 03c2c996c5 Remove cow archive metadata
See https://github.com/silverstripe/silverstripe-framework/issues/9232
2019-09-20 11:35:43 +12:00
Robbie Averill 0ae3823eeb
Merge pull request #259 from nfauchelle/patch-1
Update the default location for tests in a project
2019-08-25 18:38:24 +12:00
Nick 7de2991fa3
Update the default location for tests in a project
Change the path since mysite isn't used anymore, new sites have an app folder instead.
2019-08-25 12:32:26 +12:00
Robbie Averill 70580acb2b
Merge pull request #258 from open-sausages/pulls/4/xenial
Enhancement / Update travis config to use Xenial
2019-07-26 09:40:10 +02:00
Serge Latyntcev be4ff49c12 Enhancement / Update travis config to use Xenial 2019-07-26 12:56:40 +12:00
Ingo Schommer c1d94643a4
Set looser composer constraint
As per discussion with Guy on https://github.com/silverstripe/silverstripe-installer/pull/257. Will pull in stable tags via cow once they're available (on recipe release)
2019-07-16 11:23:54 +12:00
Ingo Schommer 9171342ec2 NEW Add silverstripe/login-forms
Using beta tag for now, should move to stable once the module is stable (ideally before 4.5.0)
2019-07-05 16:45:11 +12:00
Garion Herman e4acec30c8 Shift changelog template into dedicated cow config folder 2019-06-13 12:28:50 +12:00
Robbie Averill d4af206393
Merge pull request #256 from sminnee/deprecate-pdo
NEW: Change .env.example to default to MySQL native driver
2019-06-13 11:15:18 +12:00
Sam Minnee a968e7ad47 NEW: Change .env.example to default to MySQL native driver
https://github.com/silverstripe/silverstripe-framework/issues/8598
2019-06-11 16:19:50 +12:00
Ingo Schommer 09a2f6e298
Merge pull request #255 from creative-commoners/pulls/4.5/php71
API Bump minimum PHP version to 7.1
2019-06-07 14:39:36 +12:00
Robbie Averill 002cb6b61d API Bump minimum PHP version to 7.1 2019-05-23 13:59:31 +12:00
Garion Herman 0eede14f45 Add and configure Cow changelog template 2019-05-13 15:01:48 +12:00
Maxime Rainville 43b8000fd6 NEW Disable legacy resolution for new projects (#253) 2019-05-10 09:55:36 +12:00
Ingo Schommer 3e7294ea70
Bump to 4.5.x-dev
This conflicts with an earlier commit (cfba4cb), but after talking to Robbie this new commit is consistent with how we handle other recipes (CWP and core). Both ways are viable, but we've implicitly standardised on this way (set minor release constraints in the main release branch, e.g. constraint to recipe:4.5.x-dev on installer:4.x-dev)
2019-04-30 11:03:06 +12:00
Ingo Schommer cfba4cbe36
Fixed core dependency to 4.x-dev
Likely caused by repeated unreviewed merges from 4.4 (and 4.3) onto the 4 branch here (e.g. through fa67bc614b).

Note this isn't changing the branch alias, which should still point to 4.5.x-dev here.
2019-04-30 09:21:53 +12:00
Robbie Averill 83f78fc40e Merge branch '4.4' into 4 2019-04-21 10:33:04 +12:00
Robbie Averill c9a4efe29d Merge branch '4.3' into 4.4 2019-04-21 10:32:21 +12:00
Robbie Averill d0521e1664 Merge branch '4.2' into 4.3 2019-04-21 10:32:11 +12:00
Robbie Averill e650c43da7 Merge branch '4.1' into 4.2 2019-04-21 10:30:58 +12:00
Robbie Averill c0d9fd4869 Remove obsolete branch alias 2019-04-21 10:30:43 +12:00
Robbie Averill 810f719f86 Revert "NEW Add Roave Security advisories to composer"
This reverts commit a302acfa5a.
2019-02-26 09:19:08 +11:00
Robbie Averill 1b31ffa28a Revert "Update development dependencies"
This reverts commit 1a55336552.
2019-02-19 05:25:35 +07:00
Aaron Carlino 1a55336552 Update development dependencies 2019-02-19 10:53:35 +13:00
Ingo Schommer 6e42093c9d
Merge pull request #250 from creative-commoners/pulls/4.1/split-framework-tests
Split framework tests from assets and versioned to prevent time limits being exceeded
2019-02-04 09:04:54 +13:00
Robbie Averill c8451b9071 Split framework tests from assets and versioned to prevent time limits being exceeded
Also removed an unneeded editorconfig block which is duplicated and adds PHP 7.2 and 7.3 into the builds
2019-02-02 12:15:17 +03:00
Robbie Averill a9e1e328ca
Merge pull request #248 from open-sausages/pulls/4.2/fix-tests
TravisCI / fix silverstripe/posgresql version
2019-02-01 09:19:02 +02:00
Serge Latyntcev e279f35abf TravisCI / fix silverstripe/posgresql version 2019-02-01 16:05:37 +13:00
Robbie Averill e8614b59bb
Bump postgres version in Travis builds to match silverstripe/framework@4.4 2019-01-31 11:43:39 +02:00
Serge Latyntcev 9fe50bb42b Merge branch '4.3' into 4 2019-01-28 14:14:23 +13:00
Serge Latyntcev 2473e05496 Merge branch '4.2' into 4.3 2019-01-28 14:09:54 +13:00
Serge Latyntcev 127c62a0c9 Merge branch '4.1' into 4.2 2019-01-28 14:09:19 +13:00
Serge Latyntsev 824bd2cf91
Merge pull request #244 from open-sausages/pulls/4.1/behat-install
FIX / Installer tests
2019-01-28 12:11:58 +13:00
Maxime Rainville 0f02f2364f MINOR Make installer default to using `_resources` (#242) 2019-01-16 21:34:13 +13:00
Maxime Rainville f04beea2f3
Merge pull request #246 from Firesphere/patch-1
Add Roave Security advisories to composer
2019-01-08 10:07:45 +13:00
Simon Erkelens a302acfa5a
NEW Add Roave Security advisories to composer
Add Security Advisories as dev requirement to
- Prevent installation of known breached libraries
- Give devs the option to remove it if they might want to
2019-01-08 09:37:34 +13:00
Serge Latyntcev 3d841a409c FIX / Behat tests
Most of the modules stop exporting metadata files (behat.yml among those) to packagist
Thus when travis runs behat tests it cannot find configuration for the test suites
2018-12-18 16:38:40 +13:00
Robbie Averill b66e851dda Merge branch '4.3' into 4 2018-11-21 09:12:30 +01:00
Robbie Averill 3abeb18858 Merge branch '4.2' into 4.3
# Conflicts:
 #	composer.json
2018-11-21 09:12:10 +01:00
Robbie Averill 84aaa17461 Merge branch '4.1' into 4.2 2018-11-21 09:11:20 +01:00
Robbie Averill d0890776e8 Merge branch '4.0' into 4.1 2018-11-21 09:11:04 +01:00
Robbie Averill fcd4052a07
Update Slack integration token 2018-11-21 09:10:41 +01:00
Robbie Averill 90f54ccfe9
Merge pull request #240 from JorisDebonnet/patch-4
Correct typo
2018-10-17 21:56:44 +02:00
JorisDebonnet fa3c87f61e
Correct typo 2018-10-17 18:05:20 +02:00
Robbie Averill fa67bc614b Bump branch alias and root version in Travis to 4.4.x-dev 2018-10-15 14:54:38 +02:00
Robbie Averill 05fd5a9a96 Bump branch alias and root version in Travis to 4.4.x-dev 2018-10-15 14:44:14 +02:00
Robbie Averill caf0bc12f7 Merge branch '4.3' into 4 2018-10-15 14:43:00 +02:00
Aaron Carlino c24d4c73c3 Remove obsolete branch-alias 2018-10-15 16:31:48 +13:00
Dan Hensby 986a2f951a
Update composer.json version constraint 2018-08-04 08:59:12 +02:00
Daniel Hensby eba91f9bec
Merge branch '4.2' into 4
# Conflicts:
#	composer.json
2018-07-30 17:14:31 +01:00
Daniel Hensby 539b58d7aa
Merge tag '4.2.1' into 4.2
Release 4.2.1
2018-07-30 17:12:06 +01:00
root 0307496292 Update development dependencies 2018-07-30 15:23:32 +00:00
Daniel Hensby 15f8011493
Merge branch '4.2' into 4
# Conflicts:
#	composer.json
2018-07-30 11:23:08 +01:00
Daniel Hensby 6ad3a067c3
Merge tag '4.2.0' into 4.2
Release 4.2.0
2018-07-30 11:14:13 +01:00
root b1cd5afe28 Update development dependencies 2018-07-24 19:22:22 +00:00
Daniel Hensby 7d838b0631
Update composer dep 2018-07-24 16:47:35 +01:00
Robbie Averill baf63747b4
Bump Postgres version to 2.1.x-dev for SilverStripe 4.2+ 2018-06-29 16:39:17 +12:00
Robbie Averill 28da082fa1
Merge pull request #232 from open-sausages/pulls/4.3/increment-travis-version-to4.3.x-dev
Increment travis root version to 4.3.x-dev
2018-06-29 16:38:38 +12:00
Maxime Rainville 1431370940 Increment travis root version to 4.3.x-dev 2018-06-26 17:49:01 +12:00
Damian Mooyman 5e4ad34162
Fix incorrect base recipe dependency 2018-06-15 16:47:59 +12:00
Damian Mooyman f5b659cb4f
Merge remote-tracking branch 'origin/4.2' into 4 2018-06-15 16:06:14 +12:00
Damian Mooyman 0d5daf5658 Update development dependencies 2018-06-15 15:52:39 +12:00
Damian Mooyman 6a7bd05a1d Remove obsolete branch-alias 2018-06-15 15:30:04 +12:00
Damian Mooyman 97ef910478
Update installer to use new recipe versioning 2018-06-14 13:29:03 +12:00
Damian Mooyman d178ebdb9e
Merge pull request #230 from creative-commoners/pulls/4/remove-classmap
FIX Remove incorrect classmap for Page and PageController
2018-06-05 12:08:10 +12:00
Robbie Averill a9e2af6863 FIX Remove incorrect classmap for Page and PageController
These files to not always exist in this path, so this autoload definition is misleading
2018-06-01 15:54:11 +12:00
Robbie Averill 9a407320ed Merge branch '4.1' into 4 2018-05-28 18:32:48 +12:00
Robbie Averill dc4b512afb Merge remote-tracking branch 'origin/4.0' into 4.1
# Conflicts:
  #	.travis.yml
2018-05-28 17:57:27 +12:00
Robbie Averill 743f9c649e Merge remote-tracking branch 'origin/3.6' into 4.0
# Conflicts:
  #	.cow.json
  #	.gitignore
  #	composer.json
2018-05-28 17:54:29 +12:00
Robbie Averill cd6a22c78f Merge branch 'heads/4.0.4' into 4.0 2018-05-28 17:47:06 +12:00
Robbie Averill ec5093feb6
Merge pull request #3 from silverstripe-security/pulls/4.0/ss-2018-014
[SS-2018-014] Remove jar, css and js from file extension whitelist
2018-05-14 17:20:31 +12:00
Robbie Averill be96858e85 [SS-2018-014] Remove jar, dotm, potm, xltm from file extension whitelist, hard-code CSS and JS for TinyMCE support 2018-05-14 17:20:03 +12:00
Robbie Averill c6ff9b1245
Merge pull request #2 from silverstripe-security/pulls/4.0/ss-2018-012
[ss-2018-012] Prevent php code execution in assets folder
2018-05-14 17:18:36 +12:00
Damian Mooyman f9c03fa623 [ss-2018-012] Prevent php code execution in assets folder 2018-05-14 17:18:12 +12:00
Robbie Averill 9d8193d19c
Merge pull request #225 from open-sausages/pulls/4.0/selenium-upgrade
Update selenium to chromedriver
2018-04-13 10:50:50 +12:00
Damian Mooyman 7cfaeccfb1
Remove empty psr-4 2018-04-13 10:15:04 +12:00
Damian Mooyman d678bd76f9
Update selenium to chromedriver 2018-04-13 09:30:04 +12:00
Damian Mooyman 39f0af225f
Merge pull request #223 from open-sausages/pulls/4/appy-days
Shift resources into app folder
2018-04-11 15:25:06 +12:00
Damian Mooyman b18d3752b6
Merge pull request #224 from aNickzz/patch-1
Update .gitignore
2018-04-11 10:44:24 +12:00
aNickzz 26f4ef722d
Update .gitignore
Update to match #213
2018-04-10 16:34:40 +09:30
Damian Mooyman f514ba42b6
Bump recipe plugin dependency 2018-04-05 16:43:07 +12:00
Damian Mooyman 0b71d14fe1
Shift resources into app folder
Add autoloading skeleton and classmap for Page.php / PageController.php
2018-04-05 15:17:03 +12:00
Damian Mooyman 30df0f5e43
Merge remote-tracking branch 'origin/4.1' into 4 2018-02-07 16:44:41 +13:00
Damian Mooyman b6730c5c9c
Update root composer version for 4.1 branch 2018-02-07 16:43:17 +13:00
Damian Mooyman 7fb7f885f9
Update branch alias 2018-02-07 16:42:25 +13:00
Damian Mooyman b060892992
BUG Fix routing error for public assets
Port of https://github.com/silverstripe/recipe-core/pull/14 to installer
2018-02-07 13:57:17 +13:00
Damian Mooyman 81045f46c2 Update development dependencies 2018-02-05 17:15:37 +13:00
Damian Mooyman a892272cc5 Shift public resources into public folder (#220) 2018-01-12 16:28:15 +13:00
Damian Mooyman 9ca6c3a89b
Merge pull request #219 from open-sausages/pulls/4.0/no-dev-should-be-needed-here
Enhancement add test for a `--no-dev` build
2018-01-08 13:44:37 +13:00
Christopher Joe 4d60f01d2d Enhancement add test for a `--no-dev` build 2017-12-22 15:27:43 +13:00
Christopher Joe decd8bb446 Merge branch '4.0' of github.com:silverstripe/silverstripe-installer into 4 2017-12-21 13:40:09 +13:00
Damian Mooyman bb1944f64d
Merge pull request #218 from open-sausages/pulls/4.0/its-a-travis-tee-with-behat
FIX travis OS build version so that behat will function
2017-12-21 12:02:27 +13:00
Christopher Joe dd75e68f86 FIX travis OS build version so that behat will function 2017-12-20 21:40:27 +13:00
Damian Mooyman 1f67410858
Merge pull request #214 from open-sausages/pulls/4.1/composer-does-prefer-dist
Feature update composer with --prefer-source flag so that tests are included
2017-12-19 14:28:49 +13:00
Damian Mooyman e06e3c4e83
Update travis.yml 2017-12-19 12:07:44 +13:00
Christopher Joe ccece4bf1c Feature update composer with --prefer-source flag so that tests are included 2017-12-11 12:27:53 +13:00
Damian Mooyman 45b3cb6a43
Merge remote-tracking branch 'origin/3.5' into 3.6 2017-12-06 17:18:51 +13:00
Damian Mooyman 75984719db
Ignore modules 2017-12-06 16:22:20 +13:00
Damian Mooyman 68fdb0684e
Add .cow.json to 3.5 branch 2017-12-06 15:42:10 +13:00
Damian Mooyman c30abae60c
Merge pull request #213 from aNickzz/patch-2
Ignore (almost) everything in the assets folder
2017-12-01 14:30:09 +13:00
aNickzz 2d90647410
Update .gitignore
Uploading files directly through the Files LeftAndMain drops them directly into the assets folder by default. This will help prevent those files accidentally ending up in git.
2017-11-30 22:03:34 +10:30
Damian Mooyman 0bf0f44403
Merge pull request #210 from dhensby/pulls/3.5/phpunit-loosen-constraint
Loosen PHPUnit constraints
2017-11-20 13:59:51 +13:00
Daniel Hensby b1875ea1af
Loosen PHPUnit constraints 2017-11-17 11:37:41 +00:00
Damian Mooyman c9787b772d
Merge remote-tracking branch 'origin/4.0' into 4
# Conflicts:
#	.cow.json
#	composer.json
2017-11-16 10:47:38 +13:00
Damian Mooyman 19e8849eaf
Merge pull request #209 from martinduparc/patch-1
Update README.md
2017-11-10 15:53:08 +13:00
Damian Mooyman d3fc0d4571
Merge pull request #208 from dhensby/pulls/4.0/this-is-ss4
DOCS update comments for supported versions
2017-11-10 15:52:12 +13:00
Martin D 76965d53aa
Update README.md
Fixed links
2017-11-07 10:21:33 -05:00
Daniel Hensby ee92941f87
DOCS update comments for supported versions 2017-11-07 12:58:43 +00:00
Damian Mooyman d6c528b8bc Fix test paths 2017-10-25 16:20:00 +13:00
Chris Joe 8dc64d17d0 Merge pull request #204 from open-sausages/pulls/4.0/update-plugin
Update recipe-plugin to 1.0
2017-10-25 11:21:34 +13:00
Damian Mooyman 35a17cc9c0
Update recipe-plugin to 1.0 2017-10-25 11:14:32 +13:00
Damian Mooyman 46ca9bf59d
Update 4.1 dependencies 2017-10-12 10:17:25 +13:00
Damian Mooyman d6c07093ce
Update branch alias 2017-10-12 10:16:42 +13:00
Damian Mooyman 8fa7c9a27a Update test paths 2017-10-11 17:48:36 +13:00
Damian Mooyman ed0e2297a4 Remove obsolete branch-alias 2017-10-11 17:31:50 +13:00
Chris Joe 33aa9ab719 Merge pull request #203 from open-sausages/pulls/4.0/better-beta4-upgrade
Move files to recipe-core
2017-10-10 16:59:22 +13:00
Damian Mooyman 64211f1b1d
Move files to recipe-core 2017-10-10 15:41:25 +13:00
Ingo Schommer e32b1bbd07 Merge pull request #202 from open-sausages/pulls/4/request-uri
Use index.php for serving content
2017-10-09 10:41:39 +01:00
Ingo Schommer c369cd2358 Move index.php to recipe-core
It needs to work with installer-less projects as well
2017-10-05 08:18:51 +01:00
Ingo Schommer bce724ca76 Use index.php for serving content
Removes main.php reliance. Paves the way for
serving SilverStripe from a public/ subfolder in the base path.
This requires an index.php file in the webroot,
since you can't set a RewriteRule to a path outside of the webroot
(e.g. "public/.htaccess" pointing to "../vendor/silverstripe/framework/main.php").
2017-10-05 08:09:45 +01:00
Damian Mooyman edf6f4c1d3 Merge pull request #201 from open-sausages/pulls/4/gitignore
Update gitignore for vendor module move
2017-10-05 09:00:31 +13:00
Ingo Schommer ec36574665 Update gitignore for vendor module move
See https://github.com/silverstripe/silverstripe-framework/issues/7405s
2017-10-04 09:54:57 +01:00
Damian Mooyman 67ed44823e Merge pull request #200 from open-sausages/pulls/4/vendorise-me-baby
Support custom main.php location
2017-10-03 16:11:06 +13:00
Damian Mooyman 8ab058a3fd
Update unit test paths and asset .htaccess 2017-10-03 15:09:02 +13:00
Ingo Schommer 96045afc65 Adjust phpunit path to framework 2017-10-03 05:09:43 +13:00
Ingo Schommer 7de2e07139 Fix main.php path in install.php 2017-10-03 03:19:23 +13:00
Ingo Schommer 2d53abd2c2 Removed stylesheet from frameworkmissing file
If the framework is missing, there's no point referencing a stylesheet from it...
2017-10-03 03:18:51 +13:00
Ingo Schommer e88f7654da Fix main.php path 2017-10-03 03:18:51 +13:00
Ingo Schommer f22d9b3735 Fix main.php path 2017-10-03 01:44:14 +13:00
Ingo Schommer a1384f67b7 Simplify serving static assets in index.php
No need to perform custom file reading.
See https://github.com/laravel/laravel/blob/master/server.php#L18
and http://php.net/manual/en/features.commandline.webserver.php
2017-10-03 01:44:06 +13:00
Chris Joe 41b87ab2d5 Merge pull request #198 from open-sausages/pulls/4.0/adjust-timeout
Adjust behat timeout for asset-admin tests
2017-09-29 12:03:02 +13:00
Damian Mooyman 0cf5924277
Update .travis.yml 2017-09-29 10:03:30 +13:00
Damian Mooyman 2c81adf3e6 Adjust behat timeout for asset-admin tests 2017-09-29 09:45:55 +13:00
Chris Joe 9e6114c151 Merge pull request #195 from sminnee/gimme-more-files
FIX: Include .env.example and .editorconfig in git export
2017-09-06 15:24:55 +12:00
Chris Joe 40c6fcf18f Merge pull request #197 from open-sausages/pulls/4.0/recipe-info
Provide information related to recipe
2017-08-14 23:05:50 +12:00
Saophalkun Ponlu 26cd654dbb Provide information related to recipe 2017-08-14 17:15:42 +12:00
Damian Mooyman 4df28ad121
Added archive config 2017-08-04 16:39:39 +12:00
Sam Minnee 424b1c04dd FIX: Include .env.example and .editorconfig in git export
The “export” downloads of the installer should include these two files
as they are of use to regular developers.

 * .editorconfig encourages the use of our standard code format
 * .env.example is a helper for new developers
2017-07-31 17:36:33 +12:00
Damian Mooyman 980bf834b7 Fix recipe plugin version constraint 2017-07-25 11:13:55 +12:00
Chris Joe dd2ebad5dc Merge pull request #193 from open-sausages/pulls/4.0/recipe-concept
API Convert installer to recipe
2017-07-24 15:13:35 +12:00
Damian Mooyman 2d04b844b7
API Convert installer to recipe 2017-07-24 14:45:14 +12:00
Damian Mooyman d3de9e075f Merge pull request #191 from nfauchelle/patch-1
Update .gitignore
2017-07-07 22:05:01 +12:00
Nick afb523424e Update .gitignore
Add in another module which is managed by composer
2017-07-07 21:02:29 +12:00
Damian Mooyman f9bc5a3fc0 Merge pull request #190 from robbieaverill/patch-1
Add editorconfig rule for composer.json to be allowed four spaces
2017-07-06 14:46:24 +12:00
Robbie Averill 5284ca65b0 Add editorconfig rule for composer.json to be allowed four spaces 2017-07-06 12:41:02 +12:00
Christopher Joe adca3aea68 Update composer alias 2017-07-06 09:03:09 +12:00
Damian Mooyman 7b68ac77ab Remove obsolete branch-alias 2017-07-03 16:53:55 +12:00
Daniel Hensby 1e7d9f9a15 Merge pull request #185 from robbieaverill/patch-1
FIX Delete Page_Controller from SS4 compat branch
2017-06-27 23:38:47 +01:00
Robbie Averill b8750d9399 FIX Delete Page_Controller from SS4 compat branch
I assume this turned up in a merge-up - having this around breaks breaks things. Should be PageController now.
2017-06-28 10:05:38 +12:00
Daniel Hensby 69441aba44
Merge branch '3' 2017-06-27 13:27:40 +01:00
Daniel Hensby 61bf3af041
Merge branch '3.6' into 3 2017-06-27 13:10:11 +01:00
Daniel Hensby 6eadd1e6a4
Merge tag '3.6.1' into 3.6
Release 3.6.1
2017-06-27 12:56:12 +01:00
Damian Mooyman c9c9cf7d58 Merge pull request #182 from jonom/master
Added errorpage module requirement
2017-06-27 14:30:48 +12:00
Ingo Schommer 333d3a5408 Merge pull request #183 from open-sausages/pulls/4.0/app-object
Remove unneeded globals
2017-06-22 22:58:14 +12:00
Damian Mooyman a74e513a29
Remove unneeded globals 2017-06-20 17:20:00 +12:00
Jono Menz 4f68a04730 Added errorpage module 2017-06-15 16:02:13 -07:00
Daniel Hensby b2db7dc990 Merge pull request #1 from silverstripe-security/patch/3.6.0/SS-2017-017
[SS-2017-017] FIX SVG uploads disabled by default
2017-06-14 14:43:37 +01:00
Chris Joe 5aa694953e Merge pull request #180 from open-sausages/pulls/4.0/remove-dummy
Remove redundant dummy file in assets
2017-06-08 10:49:28 +12:00
Damian Mooyman bf76193e13
Remove redundant dummy file in assets 2017-06-06 11:45:15 +12:00
Daniel Hensby d0de968167
Merge branch '3.6' into 3 2017-05-30 23:50:37 +01:00
Daniel Hensby f589adb0b9
Merge branch '3.5' into 3.6 2017-05-30 23:49:40 +01:00
Daniel Hensby ed34be06c1
Merge tag '3.6.0' into 3.6
Release 3.6.0
2017-05-30 23:49:34 +01:00
Daniel Hensby 1aac471131
Merge branch '3.4' into 3.5 2017-05-30 23:48:39 +01:00
Daniel Hensby f7cb994ab6
Merge tag '3.5.4' into 3.5
Release 3.5.4
2017-05-30 23:48:37 +01:00
Daniel Hensby d07a18a643
Merge tag '3.4.6' into 3.4
Release 3.4.6
2017-05-30 23:47:06 +01:00
Daniel Hensby a32988fc04
Merge remote-tracking branch 'security/3.5.4' into 3.6.0 2017-05-29 01:29:55 +01:00
Daniel Hensby 6475ac9e7d
Merge remote-tracking branch 'security/3.4.6' into 3.5.4 2017-05-29 01:03:15 +01:00
Daniel Hensby a063c1caec
Merge pull request #174 from robbieaverill/phpcs-standard-3.x
Add PHPCS standard for SS 3.x
2017-05-28 21:37:39 +00:00
Daniel Hensby c25478bef7
[SS-2017-017] FIX SVG uploads disabled by default 2017-05-25 13:18:13 +01:00
Chris Joe 0e85f88204 Merge pull request #178 from open-sausages/pulls/4.0/add-behat-tests
API Add pgsql + behat tests to installer
2017-05-25 12:57:55 +12:00
Damian Mooyman 2e94a11c8b
API Add pgsql + behat tests to installer 2017-05-23 14:50:12 +12:00
Damian Mooyman d406fa365f Merge pull request #179 from nfauchelle/ignore-modules-handled-by-composer
Add in the module folders which come from the default install
2017-05-22 21:17:05 +12:00
Nick aa1c2ce05a Add in the module folders which come from the default SilverStripe composer.json. Since we ignore the /vendor/ folder we should ignore these items as well since composer will maintain them 2017-05-22 20:44:14 +12:00
Damian Mooyman d9f28b2017 Merge pull request #177 from nfauchelle/psr-2-adjustments
Update the PHP files to PSR-2 spec
2017-05-15 09:15:09 +12:00
Nick d3ed3f7476 Update the PHP files to PSR-2 spec 2017-05-14 21:48:27 +12:00
Damian Mooyman f54ff29a02 API Remove BlockUntrustedIPs 2017-05-11 09:31:23 +12:00
Daniel Hensby 02e3e102c1
Merge branch '3.6' into 3 2017-05-08 16:20:04 +01:00
Daniel Hensby 9dfe62577b
Merge branch '3.5' into 3.6 2017-05-08 16:19:40 +01:00
Daniel Hensby e35dd82f2d
Merge branch '3.4' into 3.5 2017-05-08 15:49:49 +01:00
Damian Mooyman df40d5f8c6 Update for behat 3 2017-05-05 17:21:32 +12:00
Ingo Schommer 247878f03b Merge pull request #174 from robbieaverill/phpcs-standard-3.x
Add PHPCS standard for SS 3.x
2017-04-28 08:27:30 +12:00
Robbie Averill 9acd97791a Update code formatting for the SS3 PHPCS ruleset, separate Page_Controller to new file 2017-04-28 07:33:07 +12:00
Robbie Averill 451e7961d2 Add PHPCS configuration for SilverStripe 3.x
Based on PSR-2, allowing some exceptions like class and method naming rules and namespaces for every class
2017-04-28 07:28:40 +12:00
Daniel Hensby 8a3e352595
Aliasing 3 as 3.7.x-dev 2017-04-21 16:14:18 +01:00
Damian Mooyman 63186c87fe Merge pull request #162 from open-sausages/pulls/4.0/fix-release-constraints
Lock dependency-constraint prior to beta
2017-04-05 16:30:11 +12:00
Damian Mooyman f9f61cbce2
BUG Fix cow release config 2017-04-05 16:11:19 +12:00
Chris Joe d839245a73 Merge pull request #168 from open-sausages/pulls/4.0/combine-tests
Add combined test suite for installer
2017-04-05 15:16:50 +12:00
Damian Mooyman f3d64abd55
Add combined test suite for installer
Remove teamcity config from default install
Partial implementation of #164
Fixes #166
2017-04-04 16:39:12 +12:00
Loz Calver c2c184cbb9 Merge pull request #165 from dhensby/pulls/4/test-update
Update PHPUnit XML configs to remove SS TestListener
2017-03-30 10:42:27 +01:00
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
Damian Mooyman f299c4d18d Remove obsolete alias 2016-07-28 14:32:15 +12:00
Damian Mooyman 93f4dd1764 API Support nested themes API (#129) 2016-07-25 17:26:22 +12:00
Stevie Mayhew 810b49b4a8 Merge pull request #127 from JorisDebonnet/patch-2
Update minimum php version in top comments in index.php and install.php
2016-06-04 10:27:27 +12:00
JorisDebonnet da3ef94acf Update minimum php version in index.php and install.php comments 2016-06-03 21:52:33 +02:00
Stevie Mayhew 63a028d711 Merge pull request #125 from silverstripe/copyright-in-contributingmd
Make installer copyright note conform to others
2016-05-30 14:57:48 +12:00
Sam Minnée 171a543d73 Make installer copyright note conform to others
Make the notice here match those on other modules.

See https://github.com/silverstripe/silverstripe-framework/pull/5610
2016-05-30 14:36:08 +12:00
Damian Mooyman 675ee0a106 Alias 3 as 3.5 2016-05-19 16:09:34 +12:00
Damian Mooyman ea4333fec6 Merge 3 into master 2016-05-18 17:30:22 +12:00
Hamish Friedlander bede06a1aa Merge pull request #124 from open-sausages/pulls/3/http-default-code
API Enable friendly error HTTP code by default for new projects
2016-05-18 15:37:54 +12:00
Damian Mooyman c55777c9af API Enable friendly error HTTP code by default for new projects 2016-05-18 15:17:43 +12:00
Daniel Hensby 00016f6378 Merge pull request #122 from axyr/update-php-version
update required php version
2016-05-14 11:20:46 +01:00
Sam Minnee 23cf0b8e8d Merge branch '3.3' into 3 2016-05-13 16:53:04 +12:00
Sam Minnee 9c42bb7b4d Merge remote-tracking branch 'origin/3.2' into 3.3 2016-05-13 16:50:35 +12:00
Sam Minnee ff589cb4e3 Merge remote-tracking branch 'origin/3.1' into 3.2 2016-05-13 16:50:09 +12:00
Martijn van Nieuwenhoven 3687ef8cb3 update required php version
as in framework and cms
2016-05-13 00:01:34 +02:00
Damian Mooyman 639092d333 Merge 3.1 into master
# Conflicts:
#	composer.json
2016-05-11 17:54:40 +12:00
Damian Mooyman 2aa2d9a7f0 Merge pull request #121 from sminnee/revert-ext-tidy
Revert "Require php-tidy for dev dependencies (#87)"
2016-05-11 17:46:13 +12:00
Sam Minnee 70be958cee Revert "Require php-tidy for dev dependencies (#87)"
This reverts commit bb24a9192e.

Fixes https://github.com/silverstripe/silverstripe-installer/issues/120
2016-05-11 17:35:51 +12:00
Damian Mooyman 1a5652d81c Merge 3 into master
# Conflicts:
#	composer.json
2016-05-11 14:33:39 +12:00
Damian Mooyman 4920218155 Merge 3.3 into 3 2016-05-11 14:02:09 +12:00
Damian Mooyman 0a3570808a Merge 3.2 into 3.3 2016-05-11 13:59:52 +12:00
Damian Mooyman 4ba8fda822 Merge 3.1 into 3.2
# Conflicts:
#	composer.json
2016-05-11 13:55:23 +12:00
Daniel Hensby bb24a9192e Require php-tidy for dev dependencies (#87) 2016-05-08 22:05:19 +12:00
Daniel Hensby cc7a2aeb1e FIX Add framework/admin tests (#118) 2016-05-06 07:43:27 +12:00
Ingo Schommer f52cfeef87 Merge pull request #117 from open-sausages/pulls/4.0/include-asset-admin
API Include asset-admin module in installer
2016-05-04 19:36:29 +12:00
Damian Mooyman 8d2cc913e9 API Include asset-admin module in installer
Requires https://github.com/silverstripe/silverstripe-asset-admin/pull/132
2016-05-03 15:47:17 +12:00
Daniel Hensby 3c8fc9177c
Merge branch '3' 2016-04-26 02:40:35 +01:00
Daniel Hensby 8e7d591075
Merge branch '3.3' into 3 2016-04-26 02:05:25 +01:00
Daniel Hensby 1c1b277c93
Merge 3.2 into 3.3 2016-04-26 02:04:36 +01:00
Daniel Hensby 71971adc8f Merge pull request #113 from tractorcow/pulls/4.0/update-assets
API Replace old assets/.htaccess with better default
2016-03-22 11:30:50 +00:00
Damian Mooyman 8366d22a19 API Replace old assets/.htaccess with better default 2016-02-26 14:05:55 +13:00
Daniel Hensby 38fa596239 Bumping PHPUnit version 2016-01-25 15:09:58 +00:00
Damian Mooyman c7327814b5 Alias 3 branch as 3.4 2015-12-23 14:25:24 +13:00
Jono Menz 0ef455f2b7 Merge pull request #111 from schellmax/patch-1
Added siteconfig installation requirement
2015-12-07 11:38:45 -08:00
Matthias Schelling d55468b02e Update README.md
Add 'siteconfig' module to list of required modules (as SilverStripe installation gives errors when installing without)
2015-12-06 13:53:28 +01:00
Peter Thaleikis cad28ceff1 tab -> space in editorconfig 2015-11-30 17:19:01 +13:00
Daniel Hensby eeec7be996 Merge branch '3' 2015-11-10 10:55:37 +00:00
Daniel Hensby 0f0e4e85a5 Merge branch '3.2' into 3 2015-11-10 10:55:06 +00:00
Daniel Hensby 0572ce7a9a Merge branch '3.1' into 3.2 2015-11-10 10:54:37 +00:00
Damian Mooyman df6cbb20f7 Merge pull request #108 from dhensby/pulls/keep-htaccess
.gitignore re-organisation
2015-11-10 23:34:11 +13:00
Daniel Hensby b28f567d30 Remove local IDE cache folders from .gitignore
These are environment specific and who's to judge which are worthy and which aren't. Devs should ignore this at an environment level: https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
2015-11-10 10:30:16 +00:00
Daniel Hensby b73a8cc724 Reorganise .gitignore file 2015-11-10 10:30:15 +00:00
Daniel Hensby 04088a13ea Merge pull request #106 from nickspiel/patch-1
Allowing SVGs in the assets directory
2015-10-29 17:32:56 +00:00
Nick Spiel 6346004398 Allowing SVGs in the assets directory
This should be combined with a PR I have started on silverstripe-framework https://github.com/silverstripe/silverstripe-framework/pull/4669
2015-10-08 17:35:42 +11:00
Daniel Hensby 5e20faa72a Merge remote-tracking branch 'silverstripe/3.2' into 3
Conflicts:
	composer.json
2015-07-20 15:20:19 +01:00
Ingo Schommer b5a1b91358 Merge remote-tracking branch 'origin/3' 2015-07-16 21:36:29 +12:00
Damian Mooyman 00d26d5f2d Merge pull request #102 from sminnee/prefer-stable-releases
Prefer stable packages while still allowing dev ones. Fixes #100
2015-07-08 11:11:30 +12:00
Sam Minnee ea72c5def0 Prefer stable packages while still allowing dev ones. Fixes #100
Although the original ticket recommended increasing our
minimum-stability, this change gives us the best of both worlds.

 - Where stable packages are available and meet the requirements, they
   will be used.
 - Where stable packages aren’t available or they don’t meet the
   dependency requirements, non-stable packages are still allowed.

As part of this I have also tightened up the silverstripe-themes req
version, as “*” is an anti-pattern. The versioning of the theme has
rightly split off from the versioning of the framework; it looks like
3.1.* is what we should expect.

Arguably, we could set the dependency to ~3.1, but in this case I think
it’s fine to be conservative.
2015-07-03 17:34:58 +01:00
Daniel Hensby e90f8ccd6c Merge pull request #99 from SpiritLevel/patch-3
Update min php version
2015-06-25 13:38:31 +01:00
Daniel Hensby d73fc01638 Merge pull request #98 from SpiritLevel/patch-2
Updated minimum php version
2015-06-25 13:38:13 +01:00
Daniel Hensby 87424a68a9 Merge pull request #97 from SpiritLevel/patch-1
DOCS: updated min php version
2015-06-25 13:38:01 +01:00
David Alexander 357ab55b18 Update min php version 2015-06-25 12:44:12 +12:00
David Alexander dec0b889ad Updated minimum php version 2015-06-25 12:42:57 +12:00
David Alexander 8b01500530 DOCS: updated min php version
updated minimum php version to 5.3.3 in doc block
2015-06-25 12:16:03 +12:00
Damian Mooyman 24f7cd12be Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:50:26 +12:00
Damian Mooyman ae3c7ebcaf Merge pull request #94 from dhensby/pulls/iis-fix
FIX Invalid comment syntax for web.config
2015-06-19 10:21:59 +12:00
Daniel Hensby f7f92b3226 FIX Invalid comment syntax for web.config
This breaks the site on IIS
2015-06-18 11:31:19 +01:00
Damian Mooyman 7b6f62968c Set reports and siteconfig version dependency 2015-06-18 11:41:59 +12:00
Damian Mooyman 750c02c15c Alias 3 as 3.3 2015-06-18 11:25:37 +12:00
Damian Mooyman a9d4bef2a4 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	composer.json
2015-06-02 20:22:11 +12:00
Sam Minnée d92419ec10 Merge pull request #92 from tractorcow/pulls/3.1.14/fix-api
Ensure BlockUntrustedProxyHeaders is enabled by default
2015-06-02 12:42:56 +12:00
Damian Mooyman d467b16bf2 Ensure BlockUntrustedProxyHeaders is enabled by default 2015-06-02 12:29:23 +12:00
Damian Mooyman e759ffbcdc Enforce trusted proxy servers 2015-05-28 10:03:42 +12:00
Damian Mooyman 9f686e0908 BUG Fix broken xml comment 2015-03-09 18:34:17 +13:00
Damian Mooyman 38ee2f9a1d Merge pull request #86 from assertchris/feature/3.1/add-phpunit-to-dev-dependencies
Added phpunit to dev dependencies
2015-02-26 14:32:49 +13:00
Damian Mooyman ed05c0f509 Merge pull request #71 from silverstripe/pulls/cleanup-root-files
Cleanup of root files
2015-02-26 14:32:13 +13:00
Damian Mooyman 4b2117ab8d Merge pull request #82 from dhensby/pulls/fix-58
FIX Requests to root dir circumvent index.php
2015-02-26 14:29:45 +13:00
Christopher Pitt f04263d5da Added phpunit to dev dependencies 2015-02-26 14:29:38 +13:00
Damian Mooyman 8f58045f09 Merge pull request #84 from assertchris/feature/3/add-phpunit-to-dev-dependencies
Added phpunit to dev dependencies
2015-02-26 14:26:31 +13:00
Christopher Pitt 5d5e614b38 Added phpunit to dev dependencies 2015-02-26 14:21:47 +13:00
Damian Mooyman 0ee2493db2 Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 12:03:02 +13:00
Daniel Hensby 066fd84452 FIX Requests to root dir circumvent index.php
fixes #58
2015-02-16 16:36:23 +00:00
Damian Mooyman c9cb22f648 Merge pull request #81 from guru-digital/3.1
Fix #79
2015-02-16 11:34:40 +13:00
Corey Sewell 9b2b0b5c31 Fix #80 2015-01-20 13:28:05 +13:00
Damian Mooyman ef770ca42d Merge remote-tracking branch 'origin/3'
Conflicts:
	composer.json
2015-01-16 10:35:26 +13:00
Damian Mooyman f834c69435 Merge remote-tracking branch 'origin/3.1' into 3 2015-01-15 18:58:01 +13:00
Damian Mooyman 2742f63c79 Merge pull request #77 from JorisDebonnet/patch-1
.htaccess: support for MS Office template / macro files
2015-01-15 14:32:50 +13:00
Damian Mooyman 4d8ab05f90 Revert #78
Fixes #79
2015-01-12 17:38:50 +13:00
Daniel Hensby a7f82d2fee Merge pull request #78 from cjsewell/patch-1
Add rewrite rule to enable Basic auithentication workaround for PHP running in CGI mode
2014-12-08 18:44:33 +00:00
Corey Sewell b2ee11a7be Add rewrite rule to enable Basic auithentication workaround for PHP running in CGI mode
See https://github.com/silverstripe/silverstripe-framework/pull/3689
2014-12-09 07:36:46 +13:00
Will Rossiter 3a4f346a61 Merge pull request #76 from dhensby/3.1
Adding .editorconfig
2014-12-05 15:22:23 +13:00
JorisDebonnet 3bc40bd2bf .htaccess: support for MS Office template / macro files
Fixes silverstripe-framework's issue 3692 (..no idea how to link that!).
2014-12-04 21:57:08 +01:00
Daniel Hensby 4b0911d1b5 Adding .editorconfig 2014-12-04 15:49:54 +00:00
Damian Mooyman 133e9d0332 Fix alias for 3.2 2014-11-20 17:24:51 +13:00
Damian Mooyman 46fb50b4be Update branch alias for master 2014-11-20 17:19:24 +13:00
Damian Mooyman d1a090610e Update branch alias for 3 2014-11-20 17:19:04 +13:00
Damian Mooyman c77022e260 Merge pull request #73 from chillu/pulls/htaccess-doc
Improve .htaccess commenting
2014-11-19 08:51:18 +13:00
Ingo Schommer e1649cf74f Improve .htaccess commenting
Done alongside improvements of the execution-pipeline.md docs.
Installer comment taken from d5723f7b0e
2014-11-19 08:31:04 +13:00
Ingo Schommer 70f2e90efb Removed obsolete phpunit.teamcity.*.xml files
Builds are no longer run on TeamCity for these.
2014-09-23 18:24:47 +12:00
Ingo Schommer d2f639b1af Info about utility files, note about their removal 2014-09-23 18:22:46 +12:00
Ingo Schommer 787fc2aacf Remove Makefile, running tests through phpunit is established enough now 2014-09-23 18:16:27 +12:00
Sean Harvey c23348d5d1 Merge pull request #66 from simonwelsh/stupid-htaccess
Don't block rewriting .php URLs
2014-08-18 10:54:04 +12:00
Sean Harvey 40ebbb1ae0 Merge pull request #68 from dhensby/patch-1
DOCS assets/.htaccess
2014-08-18 10:17:40 +12:00
Daniel Hensby 69761d0949 DOCS assets/.htaccess
Updating the docs to reflect the actual rules
2014-08-17 15:38:39 +01:00
Simon Welsh 91d79860bd Don't block rewriting .php URLs 2014-08-16 22:01:27 +10:00
Damian Mooyman 4e6e8f1dbc Merge pull request #65 from JLeft/patch-1
Corrected capitalisation of 'GitHub'
2014-06-18 08:35:16 +12:00
JLeft bf642b09e0 Capitalisation of 'GitHub' 2014-06-17 13:17:05 +01:00
Ingo Schommer 0c9539942f Revert accidental commit to behat.yml (setting a specific base URL) 2014-06-16 08:51:41 +12:00
Ingo Schommer f7c23b9007 Merge remote-tracking branch 'origin/3.1' 2014-06-16 08:44:42 +12:00
Ingo Schommer 10dc891fee Removed goutte driver from Behat, not supported
Was added way back with the original behat.yml, and then forgotten about
2014-06-16 08:41:57 +12:00
Damian Mooyman b3acbcfa5f Merge remote-tracking branch 'origin/3.0' into 3.1 2014-04-01 08:52:34 +13:00
Ingo Schommer 3b3cda59d2 Merge remote-tracking branch 'origin/3.1' 2014-02-18 22:38:26 +13:00
colymba aa07a0edd8 BUGFIX #34 Only block root vendor folder
Use RewriteRule instead to take in account any subfolder via RewriteBase. Deny ss-cache and composer via RewriteRule too.

Move to RewriteRules
2014-02-18 22:37:49 +13:00
Sean Harvey 16c9312f29 Merge pull request #61 from silverstripe/pulls/remove-tutorial
Remove tutorial theme
2014-02-02 14:31:29 -08:00
Ingo Schommer a31512afc8 Remove obsolete tutorial theme (fixes #60) 2014-02-03 08:11:28 +13:00
Ingo Schommer 1098bdee31 Merge pull request #35 from colymba/3.0-htaccess-fix
BUGFIX #34 block vendor access only if outside themes
2013-12-19 16:39:35 -08:00
Ingo Schommer 6ba8838239 Merge pull request #59 from oddnoc/yaml-syntax
Correct YAML syntax
2013-12-19 16:17:22 -08:00
Fred Condo d80afcf5b6 Correct YAML syntax 2013-12-19 15:04:46 -08:00
Ingo Schommer c7fe54d082 Merge pull request #56 from gordonbanderson/3.1
Addition of gpx and kml files to 3.1
2013-11-22 04:32:41 -08:00
Will Rossiter 50dff80399 Merge pull request #55 from jonom/patch-1
Removed misleading comments and legacy requirement calls
2013-11-11 21:28:44 -08:00
Gordon Anderson 72e8ae0b87 Addition of geographical file formats (gpx,kml) 2013-11-12 11:39:12 +07:00
Gordon Anderson 68b8b08b2c Addition of geographic files (gpx, kml) 2013-11-12 11:37:26 +07:00
jonom e0ce35217c Removed misleading comments and legacy requirement calls
The instructions in the init() function seem to be at odds with the current documentation which suggests that it is preferable to include requirements in PHP code rather than in templates.

Also the requirement calls here are supposedly included so that older themes still work - but how old are we talking? I would assume that these older themes would not be compatible with SS3.1, and the bundled Simple theme does not need these requirement calls in the init() function, making them redundant.

I am guessing that the Installer is primarily used by people just getting started with SilverStripe, so ideally this bundled example Page.php should provide a clear pathway to best practice SS development, rather than supporting out-dated code.
2013-11-11 09:22:36 +07:00
Ingo Schommer 1e729183c8 Show snippets in behat.yml defaults, more dev friendly
They should be hidden in CI, but its more of a cleanliness
activity, while snippets are a great time saver for devs
that they shouldn't need to go hunting for via CLI params.
2013-10-21 13:17:43 +02:00
Ingo Schommer 20b3957c78 Merge remote-tracking branch 'origin/3.1' 2013-10-21 00:08:50 +02:00
Ingo Schommer f62874d001 Exclude @todo from behat runs by default 2013-10-21 00:08:33 +02:00
Ingo Schommer 304cb25808 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-19 12:02:28 +02:00
Will Rossiter a90c403b05 Merge pull request #51 from stevie-mayhew/patch-1
Correct paths for framework and cms issues
2013-10-07 00:02:02 -07:00
Stevie Mayhew cd30cdd0af MINOR: correct paths for framework and cms issues 2013-10-07 09:16:11 +13:00
Ingo Schommer 69a19b220d Link to both framework and cms issues in README 2013-10-02 16:02:55 +02:00
Ingo Schommer dae9b18558 Merge tag '3.0.7-rc1' into 3.0 2013-09-27 00:21:56 +02:00
Ingo Schommer 1434fedf10 Tagged 3.1.0-rc3 2013-09-26 01:42:31 +02:00
Ingo Schommer 2a70eedee1 Tagged 3.0.7-rc1 2013-09-26 01:32:46 +02:00
Ingo Schommer 0d5eab3a5f Tagged 3.0.6 2013-09-26 00:35:09 +02:00
Ingo Schommer e86bb3020b Behat: Hide snippets by default, exclude @todo tags 2013-09-14 22:25:16 +02:00
Ingo Schommer f80f7a5291 Tagged 3.0.6-rc2 2013-09-12 16:48:20 +02:00
Ingo Schommer b1eba0f9b9 Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts:
	composer.json
2013-08-07 20:37:03 +02:00
Ingo Schommer 69889ec786 Updated SS logo sample file 2013-08-07 20:36:28 +02:00
Sam Minnee 77ef39fedd FIX: Put self.version in composer dependencies.
Now that https://github.com/composer/composer/pull/1883 is in Composer, self.version
will work as a requirement for framework & cms.  This will simplify the release
process a great deal.
2013-08-07 14:40:34 +02:00
Ingo Schommer cff42f2338 Merge remote-tracking branch 'origin/2.4' into 3.0 2013-08-03 15:12:24 +02:00
Ingo Schommer c76cce5e4a Merge pull request #47 from hafriedlander/fix/flush_24
FIX Include flushtoken when install redirects to successfullyinstalled
2013-08-03 04:56:38 -07:00
Hamish Friedlander f27fb07e4d FIX Include flushtoken when install redirects to successfullyinstalled 2013-08-02 10:53:35 +12:00
Sean Harvey 24892c6b66 Merge branch '3.1' 2013-07-30 14:43:37 +12:00
Stig Lindqvist d4e5748835 Merge pull request #44 from silverstripe/remove_post_scripts
Fixing regression in composer post scripts
2013-07-29 17:03:47 -07:00
Sean Harvey 8be1dea481 Fixing regression in composer post scripts
Fixes regression on Windows where composer update and composer install because the path is hardcoded to only work on *nix systems.
2013-07-26 18:58:07 +12:00
Simon Welsh 8b76cb8fb9 Merge branch '3.1' 2013-07-01 13:01:14 +12:00
Simon Welsh 0b59ef4026 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-07-01 13:00:52 +12:00
Simon Welsh 4fd75527dc Block access to .yaml files as well as .yml 2013-07-01 12:59:31 +12:00
Ingo Schommer 623685aedc Merge remote-tracking branch 'origin/3.0' into 3.1 2013-06-03 10:32:30 +02:00
Ingo Schommer 93f206a125 Revert composer.lock addition, unclear usage, breaks builds
Partially reverts e9f13512dc

This caused two issues in Travis builds:
 * CMS builds were using
outdated framework dependencies. Example: https://travis-ci.org/silverstripe/silverstripe-cms/jobs/7718686
 * Modules weren't building
at all because the info in the lock file overwrote the custom
composer.json. Example: https://travis-ci.org/silverstripe/silverstripe-translatable/jobs/7726954

In addition, I don't agree with having lock files on release branches
(as opposed to tags), since it forces us to permantently update lock
files or work with stale dependencies even when on branches
(most likely not the developers intention).
2013-06-03 10:27:04 +02:00
Ingo Schommer 26ec73fde8 Fixed composer.json (merge error) 2013-06-02 20:38:13 +02:00
Ingo Schommer 6b8192e7bd Merge remote-tracking branch 'origin/3.1'
Conflicts:
	composer.json
2013-05-31 18:10:15 +02:00
Sean Harvey f283290e2a Merge pull request #42 from sminnee/composer-post-install
NEW: Added post-install and post-update dev/build call.
2013-05-29 21:57:55 -07:00
Sam Minnee c88c6af039 Merge branch '3.0' into 3.1 2013-05-30 16:28:36 +12:00
Sam Minnee e9f13512dc git commit -m "FIX: Move install composer.json to use self.version.
Now that Composer has been fixed, self.version can be used as a dependency for framework
and cms in installer.  This simplifies our composer.json, and meanst that we can commit
composer.lock into the repo, as required.  An annoying piece of our release process has
been solved!
2013-05-30 16:27:27 +12:00
Sam Minnee 26147bb962 NEW: Added post-install and post-update dev/build call.
With this change, composer will automatically call dev/build after an update or install
command.  The main reason that this is 3.1-only is that previous releases would have
necessitated the use of 'sudo -u www-data', which is too environment-specific.

One thing that this may cause problems with is 'composer create-project' in an environment
without a _ss_environment file.  It will call dev/build, and dev/build will throw an
error.  That should be fixed in a subsequent commit.
2013-05-30 16:23:35 +12:00
Ingo Schommer 16c72aacb6 Merge pull request #41 from uniun/HTML5-video-file-types
HTML5 video file types.
2013-05-29 08:36:26 -07:00
Elvinas 7403a844e0 HTML5 video file types. 2013-05-27 21:32:04 +03:00
Simon Welsh dbe882c11e Merge pull request #40 from NightJar/hackfest_may_2013
case insensitive the assets/ allowed extensions for Apache
2013-05-25 01:09:47 -07:00
Nightjar 04be573187 case insensitive the assets/ allowed extensions for Apache 2013-05-25 19:43:13 +12:00
Ingo Schommer 0975787f00 Updated github path 2013-05-17 00:51:03 +02:00
Ingo Schommer 16380f68bf Updated github path 2013-05-17 00:49:19 +02:00
Ingo Schommer a11f4be84a Merge pull request #39 from sminnee/composer-uses-self-version
FIX: Put self.version in composer dependencies.
2013-05-13 02:19:26 -07:00
Sam Minnee bf81f0394a FIX: Put self.version in composer dependencies.
Now that https://github.com/composer/composer/pull/1883 is in Composer, self.version
will work as a requirement for framework & cms.  This will simplify the release
process a great deal.

Ultimately, the release of rc1 will be the place to test that, but it seems appropriate
to get this in there for that.

If it succeeds with 3.1-rc1, I'd suggest we backport to 3.0 and 2.4.
2013-05-13 21:07:57 +12:00
Ingo Schommer b23c744f41 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-09 16:55:44 +02:00
Ingo Schommer c929a5944d Updated behat.yml to reflect changes in behat-extension module 2013-05-09 16:00:50 +02:00
Sam Minnée 08b3685927 Merge pull request #36 from chillu/pulls/require-dev
Remove require-dev section, composer doesn't handle it well
2013-05-07 02:54:56 -07:00
Ingo Schommer 345a32ec3e Remove require-dev section, composer doesn't handle it well
Any "composer require <module>" call will first call
a "composer update". This *automatically* includes dev requirements,
without providing a way to turn off this behaviour.
A workaround would be "composer require --no-update <module> && composer update --no-dev <module>",
but that drastically reduces the usefulness of the command
for our target audience (moderately technical devs).

In the end, the small faction of devs needing the dev dependencies
also know how to install them on their own. And having a local phpunit
build actually gets in the way more than it helps in case you have
it installed through PEAR already (can get really weird when using the
PEAR provided "phpunit" binary, but the autoloader finds the composer managed classes).
2013-05-07 10:51:47 +02:00
colymba 7085f074d2 BUGFIX #34 Only block root vendor folder
Use RewriteRule instead to take in account any subfolder via RewriteBase. Deny ss-cache and composer via RewriteRule too.

Move to RewriteRules
2013-04-27 15:58:31 +03:00
Ingo Schommer 1aca785e6d Merge pull request #29 from chillu/pulls/gitattributes
Ignore build-related files in "git archive" (fixes #8167)
2013-04-18 09:32:56 -07:00
Sean Harvey b0188e9bfd Merge pull request #32 from sunnysideup/patch-1
IIS 7.5 does not like forward slash at the end of silverstripe-cache
2013-04-02 19:56:14 -07:00
Nicolaas 5c91cc1f61 IIS 7.5 does not like forward slash at the end of silverstripe-cache
IIS 7.5 does not like forward slash at the end of silverstripe-cache
2013-04-03 15:54:31 +13:00
Ingo Schommer f35ca6470c Merge remote-tracking branch 'origin/3.1' 2013-04-02 02:04:33 +02:00
Ingo Schommer b466217548 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-04-02 02:03:40 +02:00
Ingo Schommer 2e4913d351 Contribution guidelines, new bugtracker links 2013-04-02 01:52:32 +02:00
Ingo Schommer 27f63fe19f Updated bugtracker links 2013-04-02 01:19:15 +02:00
Ingo Schommer d640f826d0 Removed @stable markers from 2.4 dev branch 2013-03-27 16:00:14 +01:00
Ingo Schommer cd56f026ce Merge remote-tracking branch 'origin/3.1'
Conflicts:
	composer.json
2013-03-26 01:22:48 +01:00
Sam Minnee fbb4d1c42b FIX: Update Page/Page_Controller statics to match new 3.1 expectations. 2013-03-25 14:38:58 +13:00
Ingo Schommer bac9e2fc00 Added mysite/_config/config.yml, removed obsolete PHP config (#8317) 2013-03-21 20:02:42 +01:00
Ingo Schommer f8762ef204 Removed MySQLDatabase::set_connection_charset() from default config
Its now part of the core default YAML settings
2013-03-15 18:01:50 +01:00
Ingo Schommer 41761472b2 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	composer.json
2013-03-08 10:54:49 +01:00
Will Rossiter 3c88359698 Include a higher timeout value to avoid timeouts.
Checking out framework can often take longer than the default
(300 seconds). This gives a 10min limit to creating a new project.
2013-03-06 20:22:48 +13:00
Ingo Schommer b737ad1341 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-02-20 13:26:08 +01:00
Ingo Schommer 3c6ef63734 Merge branch '3.0.5' into 3.0 2013-02-20 12:17:01 +01:00
Ingo Schommer 0e0ce2e1e3 API Defaulting composer core dependencies to to @stable
Required to ensure correct operation of
"composer create-project silverstripe/installer my-path 2.4.10"
(checkout with tags).
2013-02-20 11:04:04 +01:00
Ingo Schommer 4e885dd297 Forcing stable flags for release 2013-02-20 01:44:23 +01:00
Hamish Friedlander becc5baa34 API Block all yaml files by default, to reduce the change of information leakage 2013-02-17 22:16:11 +01:00
Ingo Schommer 98135df7d3 Prevent YAML access in IIS by default (fixes #8233)
Since SS3 keeps values in configuration, direct access
to known paths might expose them
2013-02-17 21:04:58 +01:00
Ingo Schommer 494bfc7863 Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts:
	build.xml
	composer.json
	install.php
	phpunit.xml.dist
2013-02-15 19:19:23 +01:00
Ingo Schommer 23523175f3 API Filter composer files in IIS and Apache rules (fixes #8011)
They can expose version information, so shouldn't be accessible
through the web. The better solution of course is to move
to a public/ subfolder application structure.
2013-02-15 19:13:41 +01:00
Ingo Schommer 377a68848e Ignore build-related files in "git archive" (fixes #8167)
This is useful for keeping standard "composer create-project"
checkouts clean. Unless they use "--keep-vcs", in which case
.gitattributes is (correctly) ignored.

This has the side effect that archive-checkouts can't
run phing or phpunit scripts, but I think that's
acceptable.
2013-01-14 18:32:43 +01:00
Sean Harvey 5d78b046bb Merge pull request #27 from halkyon/htaccess_fix
Fixing .htaccess to ignore rewriting PHP files directly
2013-01-06 17:24:55 -08:00
Ingo Schommer 972af938f5 Updated composer.json 2012-12-11 18:01:38 +01:00
Ingo Schommer 40b536654e Updated composer.json 2012-12-11 18:00:47 +01:00
Ingo Schommer 694f3ff350 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	composer.json
2012-12-11 02:04:34 +01:00
Ingo Schommer 10d447e15a API Removed 'make getallmodules', use composer instead 2012-12-11 02:03:49 +01:00
Ingo Schommer 52590b9019 Removed @stable tags from release branch
Same as 3.0.x-dev, they're only relevant for tags,
not for branches.
2012-12-07 00:42:44 +01:00
Ingo Schommer fbc03f1fe2 Removed @stable flags from composer.json (release tag only)
They used to require manual editing of the composer.json
file in order to do a proper dev checkout. In the end,
the choice between release tag and dev branch should
be handled by composer already via the --stability flag.
2012-12-07 00:31:42 +01:00
Ingo Schommer 7d6c43e821 Added 'buildtools' to dev requirements in composer 2012-12-07 00:29:57 +01:00
Ingo Schommer 738d9dbff6 Added phing support 2012-12-05 11:58:43 +01:00
Ingo Schommer 736856fbd7 Removed composer.lock 2012-12-05 01:11:21 +01:00
Ingo Schommer 08c349574b Added composer.lock for 2.4.9 2012-12-05 01:11:21 +01:00
Ingo Schommer 9c254cd72b Added @stable markers to composer.json 2012-12-05 01:10:13 +01:00
Ingo Schommer 2ea9f262e8 Support for composer-created themes dir structure
Due to git limitations, we can't check out the blackcandy
"parent" theme into themes/blackcandy/ directly, since that
would require sharing paths with git repositories of other themes.
2012-12-04 17:21:29 +01:00
Sean Harvey d74da7ba29 Fixing .htaccess to ignore rewriting PHP files directly 2012-12-04 14:34:54 +13:00
Ingo Schommer 5c1a16f93c Merge pull request #26 from chillu/pulls/buildtools
Moved phing build tools to separate project
2012-12-03 14:53:30 -08:00
Sam Minnee c80265981e Relaxed composer version requirements so that stable releases can be created.
Note that once sapphire, cms, and framework actually provide a stable version, '@stable' should put onto the end of the relevant require clauses.
2012-12-04 11:17:55 +13:00
Ingo Schommer 9fa3c52169 Exclude vendor/ folder from default phpunit run
Once we start placing SS modules in vendor/,
we need to find a smarter solution...
2012-11-28 15:47:28 +01:00
Ingo Schommer 35cb3e97cd Merge remote-tracking branch 'origin/3.0' 2012-11-27 11:57:11 +01:00
Hamish Friedlander ba56e6cd99 Merge changes for 3.0.3 release into 3.0 2012-11-26 15:59:02 +13:00
Hamish Friedlander b3b2716e57 Add 3.0.3 composer.lock file 2012-11-26 12:02:04 +13:00
Hamish Friedlander fbaab96324 FIX Avoid using self.version in composer.json
When using create-project, self.version doesnt work - the checkout looses the reference to the version
Fix by explicity referencing the version instead
2012-11-26 11:48:06 +13:00
Ingo Schommer 49c8cf9dd7 Updated phpunit.xml.dist docs 2012-11-23 15:21:16 +01:00
Ingo Schommer 6f8902c5f0 Less verbose phpunit.xml.dist by omitting default switches
See http://www.phpunit.de/manual/current/en/appendixes.configuration.html
2012-11-23 15:20:10 +01:00
Ingo Schommer 69ff09d73e Removed strict and verbose flags from default PHPUnit
It complains when *any* output was caused during test
runs, which is confusing for the typical var_dump()
debugging style.
2012-11-23 15:18:47 +01:00
Ingo Schommer 96e56a8246 API Removed 'new-project' command
Use 'compass create-project silverstripe-installer' instead
2012-11-21 16:17:32 +01:00
Ingo Schommer 8b6864468b API Moved build tools to new silverstripe-buildtools module 2012-11-21 16:17:30 +01:00
Ingo Schommer 8e074cdfee Added silverstripe/behat-extension to require-dev 2012-11-18 11:42:10 +01:00
Sam Minnee 472f046539 Added colour to 'phing behat' command 2012-11-17 13:49:07 +13:00
Sam Minnée 0f28a3d456 Merge pull request #24 from chillu/pulls/behat
Added 'phing behat' command
2012-11-15 18:35:17 -08:00
Sean Harvey f5770a0781 Merge pull request #25 from chillu/pulls/remove-compass
Remove compass dependency, too slow even for development at the moment
2012-11-15 15:34:20 -08:00
Ingo Schommer 47b839db79 Remove compass dependency, too slow even for development at the moment
Use compass on CLI instead, or re-add the module manually
via "composer require".

See https://github.com/silverstripe-labs/silverstripe-compass/issues/9
2012-11-16 00:16:48 +01:00
Ingo Schommer 64b1d07c78 Don't include composer.json in release packages 2012-11-15 18:52:21 +01:00
Ingo Schommer d16d6adeb3 Added default behat.yml 2012-11-15 18:52:21 +01:00
Ingo Schommer cb0726dae3 Added 'phing behat' command 2012-11-15 18:52:21 +01:00
Ingo Schommer 4e1e09de75 Merge branch 'pulls/phpunit-composer' into 3.0 2012-11-15 17:06:23 +01:00
Ingo Schommer e07ae2041a NEW Added "phing phpunit" target 2012-11-15 17:00:46 +01:00
Ingo Schommer 04ce08b886 Require PHPUnit as dev dependency through Composer 2012-11-15 16:02:57 +01:00
Stig Lindqvist 8347a7f225 Updated license in readme to include year 2012 2012-11-13 22:36:08 +13:00
Ingo Schommer a2501ad209 Fixed bootstrap.php path in phpunit.xml.dist 2012-11-09 11:48:34 +01:00
Sam Minnee 7898f89fb3 Reverted junk-commits from "Removed .mergesources.yml, not used since the dark SVN days"
This partially reverts commit 744605d21a.
2012-11-09 10:00:11 +13:00
Ingo Schommer f976ed95a5 Fixed composer.json regression from 2.4 merge 2012-11-08 20:03:10 +01:00
Ingo Schommer c1f8635753 Added composer.lock and vendor/ to .gitignore 2012-11-08 19:52:46 +01:00
Ingo Schommer ff0939fe0d Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts:
	composer.json
2012-11-08 19:51:44 +01:00
Ingo Schommer 744605d21a Removed .mergesources.yml, not used since the dark SVN days 2012-11-08 14:03:39 +01:00
Ingo Schommer f8e860fac1 Removed .mergesources.yml, not used since the dark SVN days 2012-11-08 14:03:14 +01:00
Ingo Schommer 157a275855 Removed custom repo sources from composer.json
We now own the packagist.org repos, no need for manual pointers.
2012-11-08 14:02:28 +01:00
Sean Harvey f30759ec28 Updating favicon 2012-11-05 10:38:13 +13:00
Sean Harvey 2debb0ddfd Updating favicon 2012-11-05 10:34:24 +13:00
Sam Minnee 71b8b65858 NEW: Added dev dependencies to composer.
FIX: Don't hardcode framework and cms version in installer.
2012-11-04 21:24:59 +13:00
Ingo Schommer 0f83cfc33d Removed custom repo sources from composer.json
We now own the packagist.org repos, no need for manual pointers.
2012-11-01 18:29:16 +01:00
Ingo Schommer 6d7a0f59e7 Added composer.json
Once we've sorted out packagist listing ownership,
we should be able to remove the custom repository entries.
2012-11-01 17:26:18 +01:00
Ingo Schommer 236bad2cbc Merge remote-tracking branch 'origin/2.4' into 3.0 2012-10-30 17:21:49 +01:00
Ingo Schommer cceee896b6 Release script feedback 2012-10-30 17:10:05 +01:00
Ingo Schommer 570744f658 phing upload-release (modified copy from master) 2012-10-16 11:18:22 +02:00
Ingo Schommer 1ddd85cde3 Added github-compatible contributing notes 2012-10-11 17:20:16 +02:00
Ingo Schommer 27282d7deb Updated dependent modules file 2012-09-12 11:23:35 +02:00
Simon Welsh 0761de7a2f FIX Include query parameters when redirecting to files from index.php (fixes #7823) 2012-08-30 10:01:29 +12:00
Ingo Schommer 3a531ddb20 BUG UpdateTranslationsTask YML regex (fixes #7707)
Wasn't detecting composite keys (separated by dots)
properly in temporary YML conversion, so messed up the
YML structure, effectively "hiding" and rearranging
translations values within the wrong keys.
2012-08-06 10:37:05 +02:00
Hamish Friedlander b39744c3e7 BUG translations-sync was failing due to leakage
translations-sync was failing after calling i18nTextCollector because it
wasnt specifying a module. This mean that running translations-update-git-masterfile for framework
it would then fail on cms because wed already created a cms/lang/en.yml file
2012-07-25 12:05:12 +12:00
Stig Lindqvist e00d3b596a Merge pull request #20 from silverstripe-droptables/fix-build-xml
BUG Remove the xml brackets from the string. Breaks phing.
2012-07-23 20:27:47 -07:00
Mateusz Uzdowski 6225f9c8c0 BUG Remove the xml brackets from the string. Breaks phing. 2012-07-24 14:38:46 +12:00
Ingo Schommer b3787dc7e3 NEW phing translations-mergeback 2012-07-13 14:18:17 +02:00
Ingo Schommer 2be8924b7c Accepting "FIX" notation in changelog generator script 2012-07-05 18:16:35 +02:00
Ingo Schommer e96de6cc7e Merge branch 'master' into 3.0 (one-off)
This is a one-off merge in the direction master->3.0,
to ensure all bugfixes since we branched off find
their way into the next micro/minor release.
From now on, we'll commit to the latest release branch,
and merge back to master. API changes should go into
the master branch (not merged into a release branch).
2012-07-05 18:01:47 +02:00
Ingo Schommer 2ac206c3e4 Merge branch '3.0' 2012-07-05 18:01:34 +02:00
Ingo Schommer 3e24385e31 Merge branch '3.0' 2012-07-05 18:00:03 +02:00
Ingo Schommer b3e8696fdb Enforce flush on CI test runs
Would be better handled by an explicity "clear manifest" task,
but that's the best we can do for now. Necessary because
of removed 'flush' setting from bootstrap.php, see
https://github.com/silverstripe/sapphire/pull/620
2012-07-05 14:26:10 +02:00
Ingo Schommer c8dbcf73a3 PHPUnit XML configs for other db drivers on TeamCity 2012-07-04 14:13:26 +02:00
Ingo Schommer 1ca61a5c22 Updated 'phing changelog' to work with new commit tags 2012-06-27 11:55:44 +12:00
Ingo Schommer 00a7451b1c Updated 'phing changelog' to work with new commit tags 2012-06-27 00:29:38 +02:00
Ingo Schommer 5cad54578c MINOR Auto conflict merges in phing translation tasks
Also set some default values when targets are executed
individually, and ensure that text collection fails the build if required
2012-06-25 17:37:37 +02:00
Ingo Schommer 6dfd99a313 MINOR Ignore stash errors in phing build task 2012-06-25 14:11:41 +02:00
Ingo Schommer 029c14b30a MINOR Phing checkout bug when branch doesn't exist
Solved by using --force instead, which hard resets to the tracking origin
2012-06-25 13:41:48 +02:00
Ingo Schommer 04cf94ff76 MINOR Getlocalization phing target fixes
- Fixed combined locale setting in generated files (broke en_GB etc)
 - Prompting for property names
 - Fixed YAML parsing and git commands
2012-06-25 09:31:37 +02:00
Ingo Schommer 17303c6e9f MINOR getlocalization API URL
Using www.* instead of api.* endpoint as recommended by GL support,
to avoid timeouts when generating large ZIPs.
(see http://getlocalization.zendesk.com/requests/1736)
2012-06-25 01:03:50 +02:00
Ingo Schommer 00f66e201f ENHANCEMENT getlocalization build support
Squashed commits (sorry, too hard to untangle):
- Moved descriptions from custom "phing help" target
to the more standard 'phing -l' command, which keeps
the descriptions in one place, rather than duplicating
them between xml comments, "description" attrs and the "help" target.
- Prefixed helper targets to make it clear that they're internal
(= require temporary properties to work)
2012-06-22 15:42:07 +02:00
Sam Minnee d5b72a8754 MINOR: Fixed bug in release script. 2012-06-18 18:08:00 +12:00
Sam Minnee 941ffa7652 MINOR: Added auto-emailing to automated release upload script. 2012-06-18 18:03:36 +12:00
Sam Minnee 44d93e4588 MINOR: Updated Phing to handle more of release/nightly creation. Combined cms and framework into a single script. 2012-06-18 12:29:15 +12:00
Ingo Schommer b3e60f1894 Merge pull request #16 from stojg/loadmodules-cli-error
BUGFIX: CLI error on LoadModulesTask_GitLoader::update()
2012-06-14 11:23:00 -07:00
Ingo Schommer 5f029fd98d Merge pull request #17 from stojg/phing-installation-instructions
MINOR Update phing installation instructions
2012-06-14 11:22:11 -07:00
Stig Lindqvist 476532b006 MINOR dependent-modules.default should showcase SQLite3 from silverstripe-labs 2012-06-13 16:09:25 +12:00
Stig Lindqvist 393cc335cf MINOR Update phing installation instructions 2012-06-13 14:15:00 +12:00
Stig Lindqvist 313cb6a5b3 BUGFIX: CLI error on LoadModulesTask_GitLoader::update()
This fixes:

 - git would complain when doing git checkout {branch name} when already on {branch name}
 - the current branch was not calculated correctly 
 - removed unused variable
2012-06-13 14:02:16 +12:00
Sam Minnée 284eec1852 Merge pull request #14 from mateusz/update_modules_typo
BUGFIX: fix the gitignore updates done by phing update_modules
2012-05-30 17:05:18 -07:00
Mateusz Uzdowski 095f35528e BUGFIX: fix the gitignore updates done by phing update_modules 2012-05-31 12:02:55 +12:00
Ingo Schommer 039a37230f MINOR Fixed phpunit bootstrap relative path 2012-05-29 15:57:55 +02:00
Sam Minnee 4bb7d6a940 MINOR: Simplified phpunit files so that they work with PHPUnit 3.5 2012-05-28 18:20:46 +12:00
Sam Minnee 792df1e249 MINOR: Added phpunit config specifically for teamcity (different listeners) 2012-05-28 16:17:53 +12:00
Ingo Schommer b7c8737de6 SECURITY Fixed remote code execution vuln in install.php due to inserting unescaped user data into mysite/_config.php. Not critical because install.php is required to be removed on a SilverStripe installation anyway (fixes #7205) 2012-05-16 15:05:22 +02:00
Sean Harvey aae4f9e749 MINOR Adding .DS_Store to .gitignore 2012-05-11 14:44:22 +12:00
Sean Harvey 21dda5f304 BUGFIX Fixing including of thirdparty tests when using phpunit.xml
(requires PHPUnit 3.6, so marking that as the minimum requirement in
comments)
2012-05-09 22:35:14 +12:00
Sam Minnée 5cd1253ab8 Merge pull request #13 from adrexia/tutorial-doctype-update
BUGFIX: Tutorial template fixes
2012-04-26 22:42:30 -07:00
Naomi Guyer e03d576f55 BUGFIX: Tutorial template fixes
Re-added lang encoding, and added title attribute
2012-04-27 17:16:50 +12:00
Will Rossiter 28b2704d0c Merge pull request #12 from adrexia/tutorial-doctype-update
BUGFIX: Update tutorial theme doctype to html5
2012-04-26 21:00:59 -07:00
Naomi Guyer b7d4ed887c BUGFIX: Tutorial theme doctype
Update doctype to use html5 rather than xHTML. Prevents unformed XML
error
2012-04-27 14:40:56 +12:00
Ingo Schommer c233f29036 Merge pull request #11 from silverstripe-big-o/simple-theme-installer-integration
Simple theme installer integration
2012-04-24 01:47:25 -07:00
Julian Seidenberg bd74ba4985 BUGFIX: updating theme to "Simple" in change log creator and documentation 2012-04-24 15:56:20 +12:00
Julian Seidenberg 322d3926ae ENHANCEMENT: adding checkout for the simple theme to the Phing checkout script 2012-04-24 15:46:56 +12:00
Julian Seidenberg d2f5fc4bc9 MINOR: adding PHPStorm IDE files to the .gitignore 2012-04-24 15:46:31 +12:00
Sean Harvey b57f66d8fc MINOR Adjusted PHP version recommendation 2012-04-20 15:13:47 +12:00
Sean Harvey 39966a8c3d MINOR Ensure "phing update_modules" updates from master, not 2.4.5 (that is done in the 2.4 branch) 2012-04-15 11:42:42 +12:00
Sean Harvey 448a729a29 MINOR Removed unused rewritetest.php 2012-04-14 20:16:27 +12:00
Sean Harvey 3450bad391 MINOR Tweaking words on framework missing 2012-04-14 19:28:05 +12:00
Simon Welsh 1a532faa60 API-CHANGE sapphire folder can now be renamed. 2012-04-14 12:53:12 +12:00
Ingo Schommer 2bef7cde4f Merge pull request #10 from robert-h-curry/7131-php-version-requirement
ENHANCEMENT: Change PHP version requirements in comments. Part of #7131.
2012-04-13 06:39:42 -07:00
Robert Curry 3e69c0dec8 ENHANCEMENT: Change PHP version requirements in comments. Part of #7131. 2012-04-13 13:04:01 +12:00
Ingo Schommer ae4119ed14 MINOR Consistent styling of install-sapphiremissing.html (admittedly a bit pointless, since the new styles are placed in sapphire) 2012-04-11 18:06:56 +02:00
Ingo Schommer 70a3ca4b87 MINOR Removed special treatment of blackcandy in build scripts 2012-04-11 18:06:56 +02:00
Ingo Schommer 3abd264c30 MINOR Setting new default theme in standard mysite/_config.php 2012-04-03 01:15:10 +02:00
Ingo Schommer c3ad42029e MINOR Updated new-project script to use "simple" theme 2012-03-28 22:53:32 +02:00
Ingo Schommer 41df04ff2b MINOR Added reset.css include to Page.php in order to fix inclusion order in new default theme 2012-03-26 15:14:07 +02:00
Will Rossiter 04732c1d0d Merge pull request #8 from silverstripe/fix-phpunit
BUGFIX: Correct location of bootstrap file so phpunit CLI works. (#7001)
2012-03-23 22:32:55 -07:00
Sam Minnee e81f11a9aa BUGFIX: Correct location of bootstrap file so phpunit CLI works. (#7001) 2012-03-24 11:41:02 +13:00
Sam Minnée a7343897dc Merge pull request #7 from robert-h-curry/config-change
MINOR: Make initial mysite/_config.php consistent with the generated one.
2012-03-08 20:35:35 -08:00
Robert Curry 1b6aac222d MINOR: Make initial mysite/_config.php consistent with the one generated by install.php. 2012-03-09 17:31:51 +13:00
Will Rossiter f63f8b2d4d Merge pull request #6 from bluefuton/patch-1
MINOR: Comment fix in _config.php
2012-02-09 14:09:36 -08:00
Chris da2eb7db02 Comment fix in _config.php 2012-02-09 15:36:55 +00:00
Ingo Schommer 44409c75ac MINOR Writing version information to silvestripe_version files in archive task 2012-02-01 18:15:43 +01:00
Ingo Schommer 812d904935 MINOR Prompting for version info in archive task 2012-02-01 18:15:29 +01:00
Ingo Schommer 1b8d1bebc7 MINOR Consolidated 'archive' and 'archiveTask' targets in build.xml (they belong into one definition) 2012-02-01 17:54:36 +01:00
Ingo Schommer 7464a47d83 MINOR Replaced custom verbose logging flags with standard log levels 2012-01-31 14:24:12 +01:00
Sean Harvey c08645b3da MINOR Added silverstripe-cache and Eclipse specific metadata dirs/files to .gitignore 2011-10-30 11:04:31 +13:00
Hamish Friedlander ceb45f9808 BUGFIX: Make default mysite/_config.php work when CMS module isnt installed 2011-10-29 17:04:21 +13:00
Hamish Friedlander a0527ce846 MINOR: Update PHP requirements in notice 2011-10-29 15:56:51 +13:00
Hamish Friedlander d5723f7b0e BUGFIX: If sapphire hasn't been installed as subdirectory, give error message rather than erroring out with a 500 or a php error 2011-10-29 15:53:41 +13:00
Hamish Friedlander c7b6eab151 API CHANGE: Move the core install code to sapphire, leave just stub here 2011-10-29 15:53:30 +13:00
Hamish Friedlander 1463dbd5ae ENHANCEMENT: Allow specifying the directory to put the built archive 2011-10-29 12:55:31 +13:00
Hamish Friedlander 0e7ad4b5ce BUGFIX: Make archive task run if providing archivetype via phing -D argument 2011-10-29 12:08:22 +13:00
Hamish Friedlander 71d71dc3b6 MINOR: If blackcandy isn't included, or is already in the right place, dont error out 2011-10-29 12:01:20 +13:00
Ingo Schommer 1b90766e8b MINOR Replaced INSTALL, UPGRADING and ChangeLog files with a more consistent README 2011-10-19 09:12:03 +02:00
Ingo Schommer 4adccf7ca7 MINOR Excluding tests from release pacakges 2011-10-18 22:59:26 +02:00
Ingo Schommer e323b233a3 MINOR Excluding tests from release pacakges 2011-10-18 22:58:56 +02:00
Ingo Schommer 9b4ed2c8b6 MINOR Excluding docs from release, as they bring the package size from 5mb to 8mb 2011-10-18 16:43:35 +02:00
Ingo Schommer 5dcd2f3cdd MINOR Excluding docs from release, as they bring the package size from 5mb to 8mb 2011-10-18 16:43:13 +02:00
Ingo Schommer c5eaff4a16 MINOR gitignore 2011-10-18 16:35:00 +02:00
Ingo Schommer 0fdd330ef4 MINOR gitignore 2011-10-18 16:33:56 +02:00
Ingo Schommer 624c6d29c8 MINOR Creating release archives in parent folder by default, to avoid archiving the archive by accident 2011-10-18 16:33:08 +02:00
Ingo Schommer 078d5710b3 MINOR gitignore 2011-10-18 16:31:50 +02:00
Ingo Schommer 48649d6640 MINOR Creating release archives in parent folder by default, to avoid archiving the archive by accident 2011-10-18 16:31:04 +02:00
Ingo Schommer 3e694be734 MINOR Correct release archive name 2011-10-18 15:34:02 +02:00
Ingo Schommer 76b3c00ead MINOR Moving theme dirs when release packaging 2011-10-18 15:34:02 +02:00
Ingo Schommer ff301f9ea9 MINOR Correct release archive name 2011-10-18 15:22:06 +02:00
Ingo Schommer 57e465409e MINOR Moving theme dirs when release packaging 2011-10-18 15:20:47 +02:00
Ingo Schommer 0bab1907d1 MINOR Merged back /tools 2011-10-18 14:56:17 +02:00
Ingo Schommer 4a805a4ef9 MINOR Fixed release archive file inclusions/exclusions 2011-10-18 14:55:14 +02:00
Ingo Schommer b8397f5448 MINOR Don't auto-create an _ss_environment.php file 2011-10-18 12:56:50 +02:00
Ingo Schommer 7e36cdc48e MINOR Excluding build files from release packages 2011-10-18 12:56:47 +02:00
Ingo Schommer ba55351c95 MINOR Fixed whitespace and greedy regex problems in changelog generator 2011-10-18 09:51:14 +02:00
Will Rossiter 8b08fa2058 Merge pull request #5 from simonwelsh/patch-2
BUGFIX: Quote RewriteBase to handle paths with spaces
2011-09-15 19:48:38 -07:00
simonwelsh c1712dc992 Quote RewriteBase to handle paths with spaces 2011-09-14 19:46:49 +12:00
Ingo Schommer 3b9c569ed1 MINOR ArchiveTask now creates subfolder of the same name in the tar.gz/zip file (to avoid toplevel extracts) 2011-05-02 13:51:44 +12:00
Ingo Schommer 843becc676 MINOR Removed archive existence detection from build.xml 'archiveTask', doesn't work 2011-05-02 11:57:38 +12:00
Ingo Schommer 665b63b6a7 Merge branch 'phing-scripts' 2011-05-02 11:54:37 +12:00
Ingo Schommer 50cb45ba04 BUGFIX Fixed date sorting in CreateChangelog task, linking hashes, filtering 2011-05-02 11:54:16 +12:00
Ingo Schommer 2215f97afc MINOR Added "verbose" flag to SilverStripeBuildTask 2011-05-02 11:54:16 +12:00
Julian Seidenberg 23f5340c85 BUGFIX: direct call to exec method instead of trying to non-existent object attribute 2011-05-02 11:54:16 +12:00
Julian Seidenberg 6c549169ed BUGFIX: now dev/build does not always run after checkout 2011-05-02 11:54:16 +12:00
Julian Seidenberg c98eb981ce BUGFIX: renaming task to callingTask to avoid conflict with superclass method in Task class 2011-05-02 11:54:15 +12:00
Julian Seidenberg eb305ee33f API-CHANGE: piston support (from 1292fba039) 2011-05-02 11:54:15 +12:00
Julian Seidenberg 24705fd9f5 ENHANCEMENT: phing checkout task now stashes local content before performing checkout and has the option to exclude the base (silverstripe-installer) folder 2011-05-02 11:54:15 +12:00
Julian Seidenberg 73a5fb5e62 MINOR: documentation for phing tasks (run 'phing help' to view) 2011-05-02 11:54:10 +12:00
Julian Seidenberg 9e0c03d1d7 BUGFIX: createchangelog script now gives a message when it can't find a folder or repository. It now also correctly creates logs repos in subdirectories. 2011-04-26 15:32:21 +12:00
Julian Seidenberg 0ecaf0c45d API-CHANGE: new checkout and changelog tools using Phing 2011-04-26 13:57:55 +12:00
Will Rossiter b74f07fbd6 ENHANCEMENT: added checks for reflection class and standard library methods. PATCH via vice (http://open.silverstripe.org/ticket/6603) 2011-04-19 11:04:56 +12:00
Will Rossiter c80912bfb5 MINOR: fixed typo in installer. FIXES: #6602 2011-04-19 10:58:56 +12:00
Ingo Schommer e4031aa344 MINOR Using QSA RewriteRule flag in .htaccess instead of manually appending (fixes #6593, thanks smares) 2011-04-14 21:07:17 +12:00
Howard Grigg 940df33c44 Updated the installer to reflect the moved Sapphire files 2011-04-06 11:22:34 +10:00
Hamish Friedlander b39937f40e MINOR: Make new-project use github source for blackcandy theme, not svn 2011-03-31 11:52:27 +13:00
Sam Minnee c5ce75fae4 Added a default .gitignore 2011-03-30 10:11:14 +13:00
Ingo Schommer b3ac8ccbd6 MINOR Moved additional CSS needed for tutorial 3 to themes/tutorials rather than sapphire/docs 2011-02-14 11:08:51 +13:00
Ingo Schommer 7277461f28 MINOR Migrated COPYING, Changelog, INSTALL, UPGRADING into a new README.md 2011-02-12 14:28:05 +13:00
Hamish Friedlander 7b777c70e8 ENHANCEMENT: Add first version of tools for pulling in modules, now that we cant just use svn externals 2011-02-10 11:25:56 +13:00
sharvey 54e8eefef2 BUGFIX #6321 Whitelisted file extensions with uppercase extensions blocked by case sensitive FilesMatch directive in assets/.htaccess (does not affect IIS 7.x which uses web.config)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@115816 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:57 +13:00
sharvey d39cefddfd ENHANCEMENT Installer now checks for magic_quotes_gpc being turned off. This option turned on can cause issues with serialized data in cookies when unserializing (from r115264)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@115265 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:57 +13:00
sharvey f84a15de87 BUGFIX Fixed conflicting check of mysite directory with recommendation of removal of _config.php in installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@115169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:57 +13:00
sharvey 51514c06d5 BUGFIX Installer should check asp_tags is disabled, as it can cause issues with SilverStripe
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@114823 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:57 +13:00
sharvey 6cb667c530 ENHANCEMENT PHP requirements in installer now check for date.timezone correctly being set for PHP 5.3.0+. This option is *required* to be set starting with 5.3.0 and will cause an error during installation if not
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@114467 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:57 +13:00
sharvey e0dbb69637 MINOR Installer now writes "SetEnv HTTP_MOD_REWRITE On" in .htaccess to be consistent with the original .htaccess file that comes with the phpinstaller project
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113984 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey 6c3e5ca132 MINOR Fixed undefined variable $groupList
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113967 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey 8c315023b2 MINOR Re-use variable instead of check temp folder again
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113964 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey 014e2edded ENHANCEMENT Split temp directory check and writability into two checks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey 9d39d17859 BUGFIX Installer now checks temporary directory is writable, in addition to it being available.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113962 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey 0e1f485dc1 ENHANCEMENT #6206 Installer additional checks for module existence by checking _config.php exists, in addition to the directory
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113961 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sminnee a0f92459eb BUGFIX #6197 simon_w: Fixed Internal Server Error when accessing assets on Apache without mod_php.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113809 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
wrossiter 805ceb7005 MINOR: reverted previous commit. Note to self dont work on sunday nights, sigh
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
wrossiter 218cfffe21 BUGFIX: check DisplaySignatures on the thread rather than post. #5409
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@113085 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey fba76de203 ENHANCEMENT Installer now has a fallback for mod_rewrite detection by setting an environment variable in .htaccess when "<IfModule mod_rewrite.c>" directive is satisfied
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@112973 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:56 +13:00
sharvey 84cbba8bed MINOR Clearer message when rewrite doesn't work during installation
MINOR Fixed missing end to anchor tag


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@112972 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
sminnee b0caa5c680 BUGFIX: Enhance the protection of the assets/ directory in both IIS and Apache by including a file type whitelist.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@112963 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
sharvey debce7cdc6 MINOR Remove whitespace from generated _config.php file in installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@112268 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
sharvey 6a7a1145bb ENHANCEMENT Installer exposes database type in "Database support" configuration
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@112247 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
sharvey c9f7ba1c6d ENHANCEMENT "Database Configuration" section in installer shows database version and database type (without the "Database" suffix) for reference
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@111874 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
ischommer 73996de04b MINOR Documentation for phpunit.xml.dist
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@111491 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
sharvey ef8333a625 BUGFIX Installer now checks for session_start() and hash() support
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@111369 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
sharvey 92c842e948 BUGFIX Installer now checks for iconv support, which is required for DateField? (using Zend libraries) to function correctly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@111266 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
ischommer f95e9396b9 MINOR Exclude "sanity check" type tests by default from PHPUnit runs (e.g. PhpSyntaxTest)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@111117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
ischommer 68e5af940f MINOR Reverted accidental commit from r111054
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@111056 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
ischommer 2ba37d3af0 ENHANCEMENT Added phpunit.xml.dist to avoid setting bootstrap includes and other SilverStripe specific configuration as CLI parameters and test-level includes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@111055 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:55 +13:00
ischommer ae493a3e0e ENHANCEMENT: Created a phpunit wrapper class to ensure that Sapphire's test framework is capable of running unit tests, coverage report and retrieve clover-statistics for PHPUnit 3.4 and PHPUnit 3.5
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@111054 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
sharvey a870ea1aa3 #5870 Block web requests to silverstripe-cache directory via htaccess RedirectMatch rule or web.config hiddenSegments functionality if using IIS 7.x
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@110241 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
apiening 4002bdfd55 MINOR: repair installer for sqlite
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@109788 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
sharvey f5245c7b0f ENHANCEMENT ErrorDocument in default .htaccess so Apache serves default 404 and 500 server error pages
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108663 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
sharvey a917b59230 MINOR Changed unknown web server text
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108571 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
sharvey b4bc50d9cc MINOR Allow checking for a specific IIS version (parameter to InstallRequirements::isIIS())
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108570 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
sharvey e03e0c1d60 MINOR Removed double up of similar logic in InstallRequirements
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108569 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
sharvey 48a301266a MINOR Simplified discovery of webserver during install
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108568 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
sharvey e5ce99f4ad MINOR Removed unncessary isset() check
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108561 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
sharvey 2878aae297 MINOR Removed command line functionality from installer which is no longer used
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108546 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
ischommer 17bbc63786 MINOR Disallowing more potentially active file extensions in mysite/.htaccess
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
sminnee 9b1c783bf4 BUGFIX: Fixed CLI installation.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108032 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
sminnee c19aa49412 BUGFIX: Don't set any dev servers by default, host-based dev-server selection is unreliable.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108031 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
sminnee edfdf48bee BUGFIX: Don't allow reinstalling without first making the user manually delete mysite/_config.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108030 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:54 +13:00
sminnee 943336b1af BUGFIX: Don't allow direct access to PHP files in mysite module.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@108029 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
sharvey 6de2e4fbd3 MINOR Tweaking of installer text to avoid misleading information about "exists" when there's actually an error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@107366 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
mstephens 719b56e137 BUGFIX: Undo commit to wrong place
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@107116 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
mstephens fdcac0d629 BUGFIX: Undo incorrect commit
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@107115 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
mstephens 41b9d06bf5 MINOR: Added initial docs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@107104 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
sharvey 3c6213cf49 BUGFIX If database version can't be determined, just use the database adapter class
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@105726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
sharvey 8869240b5a BUGFIX Install now supports sending database version if available from the helper
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@105711 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
sharvey 1e0e4758f4 BUGFIX ss2stat URL not generated correctly (has NULL values)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@105705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
sharvey 00b4c68ce5 MINOR Installer should not repeat "Could not determine your database version" twice in slightly varied words
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@105517 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
sharvey b47f1cd593 ENHANCEMENT Added variable for the server configuration file so the config-form can display it for the installation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@105028 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
sharvey 55c9f8e42a BUGFIX Installer now checks the database version AFTER it has determined a connection can be established, which some databases require first
BUGFIX Database version check failures are now a warning, so a user can install at their own risk


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@104793 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
sharvey 445c0cea21 BUGFIX Fixed installation problem where version error didn't show
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@104720 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
sharvey 55fcfb7470 MINOR Installing screen now has a page title called "Installing SilverStripe..." instead of "PHP 5 is required"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@104710 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
sharvey fcbec87d30 MINOR Removed double returns in installer (redundant code)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@104709 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
sharvey 61cc59d267 MINOR Renamed checkdatabase method to checkDatabase to be consistent
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@104708 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:53 +13:00
sharvey 9a2a058048 ENHANCEMENT Installer now supports requireDatabaseVersion() on each database configuration helper implementation, e.g. MySQLDatabaseConfigurationHelper. If it's not defined, the test is skipped.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@104707 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:52 +13:00
apiening 461c753a53 MINOR: remove accidentially commited module
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@104517 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:52 +13:00
hfried fb1696494e FEATURE: initial commit
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@104515 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:52 +13:00
ischommer 593dba641c MINOR Added querystring option to Makefile
MINOR Reordered 'make getallmodules' alphabetically in Makefile

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@103746 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:52 +13:00
sharvey 0c30376519 BUGFIX Installer should check for DOMDocument (DOM/XML extension for PHP), as it's required to be there for sapphire to operate correctly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@103471 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:52 +13:00
phalkunz e8db5c30c1 MINOR: revert -r102275
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@102276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:52 +13:00
phalkunz a04df99154 MINOR: remove unnecessary expression
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@102275 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:52 +13:00
sminnee 62810d39c2 BUGFIX #5326: Fix installation when using _ss_environment.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@102087 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:52 +13:00
sminnee 40520e1127 API CHANGE: Removed default search controls; use MySQLFulltextSearchable::enable() instead.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101813 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:52 +13:00
sharvey 89d4cf8161 BUGFIX Fixed case where $_SERVER['SERVER_SIGNATURE'] was an empty string, use empty() instead of checking if it's set (which it is, but has an empty string)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101734 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:52 +13:00
sharvey 8efa9b3e41 BUGFIX Fixed InstallerRequirements::isApache() which didn't work if $_SERVER['SERVER_SIGNATURE'] is available for Apache
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101733 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:52 +13:00
wrossiter f8b806f7df ENHANCEMENT: tidied up installer process to streamline process. Moved requirements to top and button to bottom and added visual seperation of the individual steps
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101661 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:52 +13:00
sharvey 958d75869f MINOR Reverted r101354 and r101356 (see #3826)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101404 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:52 +13:00
wrossiter 43f99930df ENHANCEMENT: refactored requirements section to hide successful tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
sharvey befa638192 BUGFIX Installer bug where apache_get_modules() doesn't exist (installing from IIS)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101357 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
sharvey 934fbf9a88 MINOR Added comment to empty .htaccess file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101356 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
sharvey 008267b299 BUGFIX #3826 Removed initial .htaccess contents to make installation of SS easier - the installer doesn't need any rewriting available initially
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101354 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
sharvey 80b4d24e18 MINOR Removed rewritetest.php, it's not being used and doesn't need to be bundled with the installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101352 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
sharvey ad0d9f279e MINOR Changed text "mod_rewrite enabled" to "URL rewriting support" which makes more sense as a requirement
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101348 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
sharvey 3da85b7bcc MINOR Removed whitespace in writing of htaccess file for output
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101344 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
sharvey 682a141d7c ENHANCEMENT #5080 SilverStripe can now be installed successfully on servers that do not have any rewrite capability
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101343 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
sharvey 07ddefe9f7 MINOR Removed traces of "firstname" and "surname" from installer (these were removed in config-form in r101314)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101315 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
sharvey 7d152f0c33 BUGFIX Fixed installer breaking if stats checkbox unchecked
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101098 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
sharvey f679e398f7 MINOR Added todo for exception handling done with default admin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
sharvey 1d2b125748 MINOR Temporary fix for exception thrown in installer when existing admin account exists, temp fix just leaves existing admin account intact
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101085 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
sharvey 81feae40fc MINOR Fixed incorrect name "FileSystem" replacing with "Filesystem"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101084 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
ischommer 1670071825 MINOR Additional fixes for install.php (see r101063)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101067 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
ischommer af217502fd MINOR Fixed install.php to accept "typed" database configuration (see r101054)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@101063 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:51 +13:00
sharvey 412b26a30c MINOR Installer generated mysite/_config.php file now has consistent code formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100984 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
sharvey 0be476a632 MINOR mysite/_config.php default has consitent code formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100983 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
sharvey a85ccf4482 MINOR Removed registered databases from installer, these are autodiscovered from sapphire/_register_database.php now
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100903 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
sharvey b8463cf917 MINOR Updated registered databases in installer from changes to DatabaseRegistry in r100898
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
sharvey 0c8b63b929 BUGFIX Installer now looks in DatabaseRegistry for adapter when checking database requirements
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100894 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
sharvey ee3bbe3c95 MINOR Installer gets default locale from i18n::get_locale() before trying to autodiscover by USER_AGENT string
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100877 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
sharvey ce381845d5 MINOR Fixed improper quoting in locale setting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100839 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
sharvey c3918595fd MINOR Code formatting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100802 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
apiening 897a3b49af MINOR: added sqlite to the installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100800 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
trix 625de452f7 ENHANCEMENT you can now choose your site locale at install time
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100769 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
sharvey ff70fca745 MINOR phpDoc update for Page
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100735 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
sharvey af105fc9ed MINOR Code formatting fixes for default Page pagetype
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100734 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
trix 745816f612 MINOR remove the sqlite databases from the installer list.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100697 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
trix 2196f2cffc ENHANCEMENT show all database systems we support, along with messages if the user cannot use them. Also allow 3rd parties to register their own database classes to appear in this list.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100696 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:50 +13:00
sharvey 4cee5df735 BUGFIX Installer now checks for 5.1.0 PHP version at minimum. Anything less than 5.1.0 will probably have issues with SilverStripe
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100660 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey d9628e9f1c MINOR Show "Unknown web server" if server couldn't be determined
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100636 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey c783f7e62a MINOR Fixed place where IIS was used instead of checking for 7
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100635 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey 9589478330 MINOR Check for IIS/7 specifically, as IIS 6 has a completely different way of installing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100634 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey f9d2ea4ef2 MINOR Removed ecommerce and payment from "make getallmodules"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100559 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey 9faa558159 MINOR Fixed character glitch in UPGRADING file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100558 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey 14981c77b3 MINOR Fixed location to tutorials in INSTALL file which went to an empty page
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100557 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey 83b37d9903 MINOR Removed lighthttpd from INSTALL notes since this server isn't supported during installer process (more details on the server requirements wiki page)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100556 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey 4392796d5e MINOR Updated INSTALL notes with minimum PHP version
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100555 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey 3379a20bfc BUGFIX Webserver should be encoded properly when sending server stats to ss2stat during SS installation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100554 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey 549867149c ENHANCEMENT IIS 7.x no longer throws a server error if the rewrite module isn't installed when first opening the SS installer - instead, the web.config file is written with rules during installation
MINOR Tidied up installer, removing unused methods and clearly defining the web server support

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100553 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey 2dea4e98c4 MINOR Updated INSTALL notes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100388 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey 73152494c1 MINOR Made the database types clearer by setting the minimum version required alongside the name - e.g. "MySQL 4.1+"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100381 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey 00ecb7763e MINOR Removed end php tag from rewritetest.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100325 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sharvey f40740c382 ENHANCEMENT #5024 Installer now checks that the user has entered a username and password correctly for the default admin, an additional button for re-checking requirements is now found at the bottom of the admin configuration section
ENHANCEMENT Error messages for database AND admin configuration are now in the same place at the top of the installer


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@99841 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:49 +13:00
sminnee a9786bf089 MINOR: Updated UPGRADING readme to reference dev/build rather than db/build
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@99742 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:48 +13:00
sharvey 1e935bbc14 BUGFIX If SS_DATABASE_CLASS is set to a database that doesn't exist, don't break the installer but fallback to MySQL
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@99598 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:48 +13:00
sharvey 22357a1602 MINOR Removed unused method in installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@99006 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:48 +13:00
sharvey 6bd62df00a ENHANCEMENT If the database type to install with doesn't allow creation of databases, allow for this case and inform the user they need to create it manually
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@99001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:48 +13:00
sharvey ba357293b8 MINOR Reverted r98980
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98997 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:48 +13:00
trix a4cf4672b4 MINOR fix typo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98980 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:48 +13:00
ischommer 24dec25548 MINOR Updated UPGRADING notes (#5063)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98910 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:48 +13:00
sharvey 2bdc91e594 MINOR Removed unnecessary check for conflicting classes Query and HTTPResponse in installer, these are now namespaced as SS_Query and SS_HTTPResponse
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:48 +13:00
sharvey 26a6db9682 MINOR Removed unncessary ?> tag in generated _config.php file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98894 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:48 +13:00
sharvey 83853cb4c4 BUGFIX Installer should generate MySQLDatabase::set_connection_charset('utf8') in the _config.php to allow for better encoding in MySQL
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98893 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:48 +13:00
sharvey bbadf8f043 MINOR Fixed location to theme downloads in _config to be the proper location
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98892 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:48 +13:00
sharvey 8bc6a375de MINOR Removed unnecessary end tag which the original _config.php doesn't have anyway
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98891 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:48 +13:00
sharvey 46424744af MINOR Deny access to web.config file when installer generates .htaccess file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98890 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey b27645b7ac MINOR Partially reverted r98887 re-adding the web.config permissions in .htaccess
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98889 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey 2a47151ef5 MINOR Tabbing out of <Files> directive contents in .htaccess
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98888 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey fefd00cf1e BUGFIX If mod_rewrite isn't enabled on Apache, a 500 server error won't be generated which prevents the installer from opening and telling you there's no rewrite support
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey 02dc0f4518 MINOR Removed MySQL specific checking from the installer until we can figure out how to do it well across different databases. The only remaining MySQL specifics in the installer is the sending of the server information to ss2stats
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98877 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey c4f1e42a8d MINOR Removed check for MySQL function in the main PHP configuration - this is done separately by database helper classes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98875 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey 3a33b40431 MINOR Reverted r98850 which broke the installer on Windows
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98862 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey b3b2373613 BUGFIX Installer does not require .htaccess file to be writable if using IIS 7 and 7.5. We assume any other server has some form of .htaccess file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98850 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey 6429b0b103 MINOR Renamed keys to database configuration results
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98795 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey 0d54c89476 MINOR Amendments to installer database configuration and small issue detecting database support in PHP
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98794 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey 26bcd5a826 MINOR Removed warning that appears during installation steps (regression from recent changes)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98793 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey af96f8433d MINOR Doc for database configuration helper
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98789 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey 34bad1fc7f API CHANGE Installer now uses a database configuration helper class which isolates the logic of checking the database away from the installer, this interface can be used by other databases like MSSQL and PostgreSQL. The installer now looks for a specific file inside each database module, provided it's configured in install.php MySQL is provided by default, as it lives in sapphire
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98786 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey cb788ccae4 BUGFIX Fixed unlink of mysite/_config.php and truncate it instead - when re-creating the file it may not get write permissions on Windows
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:47 +13:00
sharvey 3edb9bc973 BUGFIX Send the database in use (not just the MySQL version) to ss2stats in installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98782 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
sharvey a5cd285a16 BUGFIX Fixed MySQL connection in installer not detecting incorrect credentials
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98760 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
sharvey 23a5873178 BUGFIX Installer should cache the database connection so queries testing database creation can be made properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98744 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
sharvey 62366a72e3 BUGFIX Checkbox for overriding the install from environment now checks for the file existance properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
sharvey 084acb6133 MINOR Reverted broken variables in installer for checking environment
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98679 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
sharvey 8200a7e4e8 BUGFIX Fixed initial state of "use environment" checkbox in installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98678 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
sharvey 41bd835be2 ENHANCEMENT Added checkbox to switch off using the environment during install if it's available
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98677 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
sharvey 8dd4256bfc BUGFIX Fixed messages of "Database '' exists" instead of "Database 'SS_mysite' exists"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98665 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
sharvey af4238e275 BUGFIX Fixed installer not submitting correct details when environment file is in use
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98664 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
sharvey 260239fc5a ENHANCEMENT #3903 Initial changes to installer to support selection of different database drivers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98659 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
ischommer bf784c989c MINOR Removed config-form.html from phpinstaller, moved to sapphire/dev/install a while ago. Omission from r92258 merge.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98329 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
wrossiter 1b57a81088 BUGFIX: fixed double slash when installed in the root. PATCH via simon_w. #4733
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98038 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
sharvey a3e887a59e BUGFIX Check for existance of IIS rewrite module as a value that exists instead of being "1"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@98031 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
ischommer 17764cf273 ENHANCEMENT Removed extension specific RewriteCond from .htaccess, install.php and rewritetest.php to allow for broader range of dynamically handled extensions (e.g. generating GIF files through SilverStripe controllers). See #2958
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@97791 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
sminnee b7fb4b028e BUGFIX: Remove hacky mucking with chdir() and $_SERVER - they're no longer necessary
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@97732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:46 +13:00
sminnee a007499548 MINOR: Reverted r97590
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@97591 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
sminnee fd1a4dde05 MINOR: Accidental commit
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@97590 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
ischommer 4dff1b9ba7 BUGFIX Explicitly set a default administrator in Installer->install() rather than assuming its credentials are set through Security::findAnAdministrator() (see #4271)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@97479 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
sharvey 6015195223 BUGFIX #4791 Potential issue with creating files in SS installer on IIS - use the "b" mode when using fopen() to be more portable on platforms
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@96826 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
wrossiter 0f45be4ccd REVERTED: r95199
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@95206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
wrossiter 8b8199f1f0 BUGFIX: pass $allowHTML through to DatalessField. PATCH via escaped (#4822)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@95199 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
sharvey 2505fbf834 MINOR Convert crlf (Windows) line endings to lf (UNIX) for install.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@93895 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
ischommer 1862b1f8b5 MINOR Removed checks for jsparty/ directory, which is no longer required (merged from r93615)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@93616 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
sharvey 52891a4ecf ENHANCEMENT Easier installation for IIS based configurations by providing the web.config file out of the box, an inaccessible file on Apache based web servers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@93255 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
sharvey 1d8efaa8be MINOR Added location on where to download the MS URL rewrite module when installing on IIS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@93244 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
sharvey 966fdf484d BUGFIX Sometimes SERVER_SIGNATURE isn't populated in PHP, so fall back to using SERVER_SOFTWARE to detect the webserver during SS install
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@93113 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
sharvey adfb282212 ENHANCEMENT #4576 Detection of IIS and the IIS URL Rewrite Module during SS install
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@93110 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
sharvey 0fbaae8ba6 MINOR Fixed ambiguous statements about the database in installation, refer to MySQL specifically since that's what it's checking for
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@93107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
sharvey cb4359feff ENHANCEMENT #4742 Set lower timeout for mysql_connect to avoid long timeouts when mysql_connect can't find a MySQL server locally during SS install, and only do certain MySQL checks if the server can be found, greatly improving install performance
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@93106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
sharvey e285f5af85 MINOR Fixed grammar mistake in install
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92304 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:45 +13:00
ischommer 51ac492824 MINOR Fixed merge errors and omissions from branches/2.3 (from r92258)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92289 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer ef138cb1d9 MINOR Fixed comma where it should've been a dot (from r83449) (from r92249)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92288 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer 4b5ab51fc7 BUGFIX #4356 Removed string checking of PHP version and replaced with version_compare() in SS installer (from r81646) (from r92248)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92287 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer a5f4ac0550 BUGFIX #4171 hamish: Fixed assets/.htaccess for CGI environments. (from r79222) (from r92247)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92286 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer ea2eb97c62 Disable PHP in the assets directory, regardless of virtual-host config (from r74816) (from r92246)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92285 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer 52584eaf87 Added additional switch for a slight variation of the URL parsing code. (from r73224) (from r92245)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92283 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer 6b25d35b7f BUGFIX: Fixed rewriteless operation in IIS 5.1 (from r73166) (from r92244)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer 375340e94c BUGFIX: Fixed mod_rewrite-less operation in the root folder of a windows box (from r72995) (from r92243)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92281 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer 30ddfa5fff MINOR: Use password field for password, dont require call by reference (from r72928) (from r92242)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92278 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer a8e23f092f BUGFIX: Get index.php filename rewriting working for windows (from r72504) (from r92241)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92277 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer c872e76daf ENHANCEMENT: Added index.php that will keep SilverStripe functioning even if the .htaccess doesn't work (svn diff) (from r72495) (from r92240)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92276 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer ed24d08855 BUGFIX: Allow SilverStripe to work when asp_tags is on (from r72337) (from r92239)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92275 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer 0b2032329c MINOR: Changed change log to point to online change log. (from r71924) (from r92238)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92274 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer 0074be8942 Removed DirectorySlash update from installer's default htaccess as it breaks some installation targets (from r67085) (from r92231)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92272 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:44 +13:00
ischommer b7a0f6dd18 MINOR: Removed no-longer-used createHtAccessAlternative() (from r66916) (from r92230)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92271 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:43 +13:00
ischommer 6b48d45114 ENHANCEMENT #3123: Use ajax for mod_rewrite testing (from r66906) (from r92228)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92270 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:43 +13:00
ischommer 2cd8f69c3c BUGFIX: Improved installer operation with PHP4 installed or no PHP installed.
API CHANGE: Reduced number of files needed for installer to work, and moved some into sapphire directory. (from r66896) (from r92227)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92269 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:43 +13:00
ischommer 3a562284a5 ENHANCEMENT #3126: Put site into dev mode for installation so you can see error messages. (from r66890) (from r92226)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92266 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:43 +13:00
ischommer 00fd98a9b4 ENHANCEMENT: Installer checks that Query and HTTPResponse classes don't exist before installing. (from r66886) (from r92224)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:43 +13:00
ischommer 70cfcd681a MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92262 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:43 +13:00
ischommer 9288a062e8 MINOR Reverted accidental commit from r92260
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92261 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:43 +13:00
ischommer 1d6f9318b7 MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@92260 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:43 +13:00
ischommer 371f6c3c1e MINOR Setting trunk in .mergesources
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@90889 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:43 +13:00
ischommer 6ffe876398 MINOR Changed silverstripe.com references to silverstripe.org
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@90887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:43 +13:00
ischommer c449f450f6 MINOR Changed silverstripe.com references to silverstripe.org
MINOR Fixed broken wiki links (#4672)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@90886 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:43 +13:00
ischommer 91fec7ce45 BUGFIX Fixed $ escaping in passwords set by install.php in _config.php (#4676)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@90883 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 18:56:43 +13:00
sharvey d8ee7bde57 BUGFIX #6321 Whitelisted file extensions with uppercase extensions blocked by case sensitive FilesMatch directive in assets/.htaccess (does not affect IIS 7.x which uses web.config) (from r115816)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@115819 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-01-26 03:14:26 +00:00
sharvey e1ad6609b4 ENHANCEMENT Installer now checks for magic_quotes_gpc being turned off. This option turned on can cause issues with serialized data in cookies when unserializing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@115264 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-21 09:28:28 +00:00
sharvey b13c561c51 BUGFIX Fixed conflicting check of mysite directory with recommendation of removal of _config.php in installer (from r115169)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@115170 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-19 22:18:05 +00:00
sharvey 88aea2f456 Removed temporary datetimefields from externals
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@114918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-13 23:42:03 +00:00
sharvey 089e28e004 BUGFIX Installer should check asp_tags is disabled, as it can cause issues with SilverStripe (from r114823)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@114824 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-11 06:02:51 +00:00
sminnee 3f55474dec ENHANCEMENT PHP requirements in installer now check for date.timezone correctly being set for PHP 5.3.0+. This option is *required* to be set starting with 5.3.0 and will cause an error during installation if not (from r114467)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@114495 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-12-05 00:04:05 +00:00
sharvey 4868877ee6 MINOR Merged r113913 through r113984 from phpinstaller/branches/2.4
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@113985 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-21 23:53:50 +00:00
sharvey 945a28f33a MINOR Merged r112269 through r113912 from phpinstaller/branches/2.4
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@113914 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-11-18 05:08:12 +00:00
sharvey 91d00c52b8 MINOR Fixed extraneous else statement in installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112970 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-20 02:00:33 +00:00
sharvey 2ed6a316e7 MINOR Made _config.php work the same way as branches/2.4 phpinstaller
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112969 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-20 02:00:13 +00:00
sminnee 9915ca80d9 MINOR: Blocking unnecessary revisions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112438 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:24:40 +00:00
sminnee 01381abea0 MINOR: Blocking unnecessary revisions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112434 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:22:23 +00:00
sminnee 93105a77ca MINOR Remove whitespace from generated _config.php file in installer (from r112268)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112433 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:22:20 +00:00
sminnee d2bcf47aba ENHANCEMENT Installer exposes database type in "Database support" configuration (from r112247)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112432 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:22:10 +00:00
sminnee 5dc52e9569 ENHANCEMENT "Database Configuration" section in installer shows database version and database type (without the "Database" suffix) for reference (from r111874)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112430 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:22:04 +00:00
sminnee 3df7734b83 MINOR Documentation for phpunit.xml.dist (from r111491)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112429 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:21:58 +00:00
sminnee 4d5c62da03 BUGFIX Installer now checks for session_start() and hash() support (from r111369)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112427 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:21:45 +00:00
sminnee 3de082c417 BUGFIX Installer now checks for iconv support, which is required for DateField? (using Zend libraries) to function correctly (from r111266)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112425 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:21:21 +00:00
sminnee df024e513e MINOR Exclude "sanity check" type tests by default from PHPUnit runs (e.g. PhpSyntaxTest) (from r111117)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112424 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:21:16 +00:00
sminnee ec9ea4c8d6 ENHANCEMENT Added phpunit.xml.dist to avoid setting bootstrap includes and other SilverStripe specific configuration as CLI parameters and test-level includes (from r111055)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112422 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:20:45 +00:00
sminnee 5a20fbed64 #5870 Block web requests to silverstripe-cache directory via htaccess RedirectMatch rule or web.config hiddenSegments functionality if using IIS 7.x (from r110241)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112417 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:19:01 +00:00
sminnee dfbd3e08f6 MINOR: repair installer for sqlite (from r109788)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112416 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:18:52 +00:00
sminnee 991ec354b1 ENHANCEMENT ErrorDocument in default .htaccess so Apache serves default 404 and 500 server error pages (from r108663)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112415 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:18:46 +00:00
sminnee 55d6682cd5 MINOR Changed unknown web server text (from r108571)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112414 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:18:39 +00:00
sminnee 7a2fce3458 MINOR Allow checking for a specific IIS version (parameter to InstallRequirements::isIIS()) (from r108570)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112411 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:18:00 +00:00
sminnee 83567dccdd MINOR Removed double up of similar logic in InstallRequirements (from r108569)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112410 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:17:53 +00:00
sminnee f9d29bd9d6 MINOR Simplified discovery of webserver during install (from r108568)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112408 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:17:42 +00:00
sminnee 2a78807f4b MINOR Removed unncessary isset() check (from r108561)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112407 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:17:34 +00:00
sminnee 7b040c42ac MINOR Disallowing more potentially active file extensions in mysite/.htaccess (from r108208)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112404 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:16:51 +00:00
sminnee a9c1f55bed BUGFIX: Fixed CLI installation. (from r108032)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112402 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:16:43 +00:00
sminnee e44595bda9 BUGFIX: Don't set any dev servers by default, host-based dev-server selection is unreliable. (from r108031)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112401 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:16:37 +00:00
sminnee b3193f2a7f BUGFIX: Don't allow reinstalling without first making the user manually delete mysite/_config.php (from r108030)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112400 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:16:31 +00:00
sminnee 7d4393910a BUGFIX: Don't allow direct access to PHP files in mysite module. (from r108029)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112398 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:16:18 +00:00
sminnee c402bb9eef MINOR Tweaking of installer text to avoid misleading information about "exists" when there's actually an error (from r107366)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112396 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:16:09 +00:00
sminnee 8888693600 BUGFIX If database version can't be determined, just use the database adapter class (from r105726)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112394 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:15:14 +00:00
sminnee 49bf14177f BUGFIX Install now supports sending database version if available from the helper (from r105711)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112393 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:15:10 +00:00
sminnee 66dfdb97c7 BUGFIX ss2stat URL not generated correctly (has NULL values) (from r105705)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112392 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:15:04 +00:00
sminnee 820c49e8b4 MINOR Installer should not repeat "Could not determine your database version" twice in slightly varied words (from r105517)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112391 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:57 +00:00
sminnee b0d11f1693 ENHANCEMENT Added variable for the server configuration file so the config-form can display it for the installation (from r105028)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112390 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:53 +00:00
sminnee 19050a38dc BUGFIX Installer now checks the database version AFTER it has determined a connection can be established, which some databases require first
BUGFIX Database version check failures are now a warning, so a user can install at their own risk (from r104793)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112389 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:48 +00:00
sminnee 30b46e866a BUGFIX Fixed installation problem where version error didn't show (from r104720)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112388 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:44 +00:00
sminnee 0c2f4d39e9 MINOR Installing screen now has a page title called "Installing SilverStripe..." instead of "PHP 5 is required" (from r104710)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112387 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:39 +00:00
sminnee d5e8eed587 MINOR Removed double returns in installer (redundant code) (from r104709)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112386 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:34 +00:00
sminnee cf31776aa2 MINOR Renamed checkdatabase method to checkDatabase to be consistent (from r104708)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112385 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:14:28 +00:00
sminnee 26d3c34630 ENHANCEMENT Installer now supports requireDatabaseVersion() on each database configuration helper implementation, e.g. MySQLDatabaseConfigurationHelper. If it's not defined, the test is skipped. (from r104707)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 01:13:50 +00:00
sminnee c13021e4ca MINOR: Blocking unnecessary revisions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112229 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:47 +00:00
sminnee 2c798ff57d BUGFIX Installer should check for DOMDocument (DOM/XML extension for PHP), as it's required to be there for sapphire to operate correctly (from r103471)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112228 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:45 +00:00
sminnee bc60d451e5 BUGFIX #5326: Fix installation when using _ss_environment.php (from r102087)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112227 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:30 +00:00
sminnee 4a949635a3 API CHANGE: Removed default search controls; use MySQLFulltextSearchable::enable() instead. (from r101813)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112226 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:23 +00:00
sminnee c63d9cc064 BUGFIX Fixed case where $_SERVER['SERVER_SIGNATURE'] was an empty string, use empty() instead of checking if it's set (which it is, but has an empty string) (from r101734)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112225 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:19 +00:00
sminnee 66b1ce5e12 BUGFIX Fixed InstallerRequirements::isApache() which didn't work if $_SERVER['SERVER_SIGNATURE'] is available for Apache (from r101733)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:14 +00:00
sminnee b7de7c502c ENHANCEMENT: tidied up installer process to streamline process. Moved requirements to top and button to bottom and added visual seperation of the individual steps (from r101661)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112223 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:28:09 +00:00
sminnee 408ddac289 ENHANCEMENT: refactored requirements section to hide successful tests (from r101382)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112222 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:27:56 +00:00
sminnee 432413132a BUGFIX Installer bug where apache_get_modules() doesn't exist (installing from IIS) (from r101357)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112221 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:27:51 +00:00
sminnee bdb865ea27 MINOR Changed text "mod_rewrite enabled" to "URL rewriting support" which makes more sense as a requirement (from r101348)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112220 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:57 +00:00
sminnee 61d3293c2f MINOR Removed whitespace in writing of htaccess file for output (from r101344)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112219 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:52 +00:00
sminnee 174ac21ce1 ENHANCEMENT #5080 SilverStripe can now be installed successfully on servers that do not have any rewrite capability (from r101343)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112218 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:40 +00:00
sminnee 0cd20830fd MINOR Removed traces of "firstname" and "surname" from installer (these were removed in config-form in r101314) (from r101315)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112217 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:35 +00:00
sminnee 1af78e980d BUGFIX Fixed installer breaking if stats checkbox unchecked (from r101098)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112216 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:31 +00:00
sminnee 55c0e7e915 MINOR Added todo for exception handling done with default admin (from r101086)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112215 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:27 +00:00
sminnee aba0caf624 MINOR Temporary fix for exception thrown in installer when existing admin account exists, temp fix just leaves existing admin account intact (from r101085)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112214 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:20 +00:00
sminnee 816945682f MINOR Fixed incorrect name "FileSystem" replacing with "Filesystem" (from r101084)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112213 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:16 +00:00
sminnee 77137e1bb2 MINOR Additional fixes for install.php (see r101063) (from r101067)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:11 +00:00
sminnee c5dc242b94 MINOR Fixed install.php to accept "typed" database configuration (see r101054) (from r101063)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112211 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:06 +00:00
sminnee dd1af76763 MINOR Installer generated mysite/_config.php file now has consistent code formatting (from r100984)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112210 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:26:01 +00:00
sminnee 8654d465b6 MINOR Removed registered databases from installer, these are autodiscovered from sapphire/_register_database.php now (from r100903)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112209 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:25:36 +00:00
sminnee 51d4836bda MINOR Updated registered databases in installer from changes to DatabaseRegistry in r100898 (from r100899)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112208 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:25:30 +00:00
sminnee 3f34c41315 BUGFIX Installer now looks in DatabaseRegistry for adapter when checking database requirements (from r100894)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112207 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:25:12 +00:00
sminnee 21b75a3d6e MINOR Installer gets default locale from i18n::get_locale() before trying to autodiscover by USER_AGENT string (from r100877)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:25:07 +00:00
sminnee b9bf36c35b MINOR Fixed improper quoting in locale setting (from r100839)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:39 +00:00
sminnee 24887b13a9 MINOR Code formatting (from r100802)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:35 +00:00
sminnee 9fc052fe58 MINOR: added sqlite to the installer (from r100800)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112202 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:31 +00:00
sminnee 7a3be4418e ENHANCEMENT you can now choose your site locale at install time (from r100769)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112201 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:26 +00:00
sminnee 454d58a04d MINOR phpDoc update for Page (from r100735)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112200 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:21 +00:00
sminnee 7f9d4872a7 MINOR Code formatting fixes for default Page pagetype (from r100734)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112199 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:17 +00:00
sminnee 03edb8b515 MINOR remove the sqlite databases from the installer list. (from r100697)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112198 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:12 +00:00
sminnee 9b1372a29a ENHANCEMENT show all database systems we support, along with messages if the user cannot use them. Also allow 3rd parties to register their own database classes to appear in this list. (from r100696)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112197 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:24:00 +00:00
sminnee 45adbbb8e8 BUGFIX Installer now checks for 5.1.0 PHP version at minimum. Anything less than 5.1.0 will probably have issues with SilverStripe (from r100660)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112196 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:49 +00:00
sminnee b69d0a9539 MINOR Show "Unknown web server" if server couldn't be determined (from r100636)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112194 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:44 +00:00
sminnee 15d13b6f82 MINOR Fixed place where IIS was used instead of checking for 7 (from r100635)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112193 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:39 +00:00
sminnee 322be54599 MINOR Check for IIS/7 specifically, as IIS 6 has a completely different way of installing (from r100634)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112192 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:34 +00:00
sminnee 34fa1f06bf MINOR Removed ecommerce and payment from "make getallmodules" (from r100559)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112191 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:28 +00:00
sminnee e3360ab241 MINOR Fixed character glitch in UPGRADING file (from r100558)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112190 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:19 +00:00
sminnee 0243a2a2e6 MINOR Fixed location to tutorials in INSTALL file which went to an empty page (from r100557)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112189 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:12 +00:00
sminnee 5a10c7afd5 MINOR Removed lighthttpd from INSTALL notes since this server isn't supported during installer process (more details on the server requirements wiki page) (from r100556)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112188 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:23:06 +00:00
sminnee 0cd01f3dd9 MINOR Updated INSTALL notes with minimum PHP version (from r100555)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112187 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:22:58 +00:00
sminnee fbc6cd5db7 BUGFIX Webserver should be encoded properly when sending server stats to ss2stat during SS installation (from r100554)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112186 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:22:40 +00:00
sminnee 0d5b969a49 ENHANCEMENT IIS 7.x no longer throws a server error if the rewrite module isn't installed when first opening the SS installer - instead, the web.config file is written with rules during installation
MINOR Tidied up installer, removing unused methods and clearly defining the web server support (from r100553)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112185 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:22:35 +00:00
sminnee 216b934aeb MINOR Updated INSTALL notes (from r100388)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112184 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:22:22 +00:00
sminnee c153aa6746 MINOR Made the database types clearer by setting the minimum version required alongside the name - e.g. "MySQL 4.1+" (from r100381)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112183 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:22:15 +00:00
sminnee cf647f463e ENHANCEMENT #5024 Installer now checks that the user has entered a username and password correctly for the default admin, an additional button for re-checking requirements is now found at the bottom of the admin configuration section
ENHANCEMENT Error messages for database AND admin configuration are now in the same place at the top of the installer (from r99841)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:21:56 +00:00
sminnee acbe3b9058 MINOR: Updated UPGRADING readme to reference dev/build rather than db/build (from r99742)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112181 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:21:50 +00:00
sminnee 08262a9b38 BUGFIX If SS_DATABASE_CLASS is set to a database that doesn't exist, don't break the installer but fallback to MySQL (from r99598)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112180 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 04:21:40 +00:00
sminnee 3cb0146e36 MINOR: Blocking unnecessary revisions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112117 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:02:18 +00:00
sminnee c91949e7fb MINOR Removed unused method in installer (from r99006)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112116 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:02:03 +00:00
sminnee 6a9193e01a ENHANCEMENT If the database type to install with doesn't allow creation of databases, allow for this case and inform the user they need to create it manually (from r99001)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112115 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 03:01:31 +00:00
sminnee f61920afb1 MINOR Updated UPGRADING notes (#5063) (from r98910)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:59:43 +00:00
sminnee de519f36ac MINOR Removed unnecessary check for conflicting classes Query and HTTPResponse in installer, these are now namespaced as SS_Query and SS_HTTPResponse (from r98896)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112113 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:58:52 +00:00
sminnee ae4cf3b422 MINOR Removed unncessary ?> tag in generated _config.php file (from r98894)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:58:13 +00:00
sminnee b58d4c5f7e BUGFIX Installer should generate MySQLDatabase::set_connection_charset('utf8') in the _config.php to allow for better encoding in MySQL (from r98893)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112110 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:57:56 +00:00
sminnee 22ed5dfd1d MINOR Removed unnecessary end tag which the original _config.php doesn't have anyway (from r98891)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:56:09 +00:00
sminnee 044b0f0f80 BUGFIX If mod_rewrite isn't enabled on Apache, a 500 server error won't be generated which prevents the installer from opening and telling you there's no rewrite support (from r98887)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112108 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:53:34 +00:00
sminnee 4997c0a9bd MINOR Removed MySQL specific checking from the installer until we can figure out how to do it well across different databases. The only remaining MySQL specifics in the installer is the sending of the server information to ss2stats (from r98877)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112107 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:51:12 +00:00
sminnee 1a2f989c06 MINOR Removed check for MySQL function in the main PHP configuration - this is done separately by database helper classes (from r98875)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112106 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:50:56 +00:00
sminnee 2f452bfabb MINOR Reverted r98850 which broke the installer on Windows (from r98862)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:50:28 +00:00
sminnee d2b772726c BUGFIX Installer does not require .htaccess file to be writable if using IIS 7 and 7.5. We assume any other server has some form of .htaccess file (from r98850)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112104 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:49:22 +00:00
sminnee c4de1cb3be MINOR Renamed keys to database configuration results (from r98795)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112103 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:48:46 +00:00
sminnee 6368a4fea0 MINOR Amendments to installer database configuration and small issue detecting database support in PHP (from r98794)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112102 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:48:17 +00:00
sminnee 73964a844f MINOR Removed warning that appears during installation steps (regression from recent changes) (from r98793)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112101 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:47:55 +00:00
sminnee 0c0fe50e49 MINOR Doc for database configuration helper (from r98789)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112100 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:47:38 +00:00
sminnee 42f5002736 API CHANGE Installer now uses a database configuration helper class which isolates the logic of checking the database away from the installer, this interface can be used by other databases like MSSQL and PostgreSQL. The installer now looks for a specific file inside each database module, provided it's configured in install.php MySQL is provided by default, as it lives in sapphire (from r98786)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112099 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:47:16 +00:00
sminnee 7cec02c3f3 BUGFIX Fixed unlink of mysite/_config.php and truncate it instead - when re-creating the file it may not get write permissions on Windows (from r98783)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112098 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:44:34 +00:00
sminnee 3c8aba8ed4 BUGFIX Send the database in use (not just the MySQL version) to ss2stats in installer (from r98782)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112097 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:43:05 +00:00
sminnee 7363fe54a5 BUGFIX Fixed MySQL connection in installer not detecting incorrect credentials (from r98760)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112096 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:42:44 +00:00
sminnee 42144c288d BUGFIX Installer should cache the database connection so queries testing database creation can be made properly (from r98744)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112095 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:42:14 +00:00
sminnee 5663e264e1 MINOR: Several merges from branches/2.4
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112094 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:42:08 +00:00
sminnee e76df36179 BUGFIX: fixed double slash when installed in the root. PATCH via simon_w. #4733 (from r98038)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112093 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:33:55 +00:00
sminnee bf5e862c6a BUGFIX Check for existance of IIS rewrite module as a value that exists instead of being "1" (from r98031)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:33:27 +00:00
sminnee dd015ff76a ENHANCEMENT Removed extension specific RewriteCond from .htaccess, install.php and rewritetest.php to allow for broader range of dynamically handled extensions (e.g. generating GIF files through SilverStripe controllers). See #2958 (from r97791)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112091 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:32:36 +00:00
sminnee 51effb7e78 BUGFIX: Remove hacky mucking with chdir() and $_SERVER - they're no longer necessary (from r97732)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112090 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:32:07 +00:00
sminnee e012b5a418 BUGFIX Explicitly set a default administrator in Installer->install() rather than assuming its credentials are set through Security::findAnAdministrator() (see #4271) (from r97479)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112089 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:29:22 +00:00
sminnee e8bb141aaa BUGFIX #4791 Potential issue with creating files in SS installer on IIS - use the "b" mode when using fopen() to be more portable on platforms (from r96826)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112088 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:27:21 +00:00
sminnee e013e7512b MINOR Convert crlf (Windows) line endings to lf (UNIX) for install.php (from r93895)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112087 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:26:57 +00:00
sminnee eebff68f46 ENHANCEMENT Easier installation for IIS based configurations by providing the web.config file out of the box, an inaccessible file on Apache based web servers (from r93255)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:22:49 +00:00
sminnee 9b340214fd MINOR Added location on where to download the MS URL rewrite module when installing on IIS (from r93244)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112085 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:21:41 +00:00
sminnee 62d6260fab BUGFIX Sometimes SERVER_SIGNATURE isn't populated in PHP, so fall back to using SERVER_SOFTWARE to detect the webserver during SS install (from r93113)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112084 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:20:13 +00:00
sminnee 3077816c25 ENHANCEMENT #4576 Detection of IIS and the IIS URL Rewrite Module during SS install (from r93110)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112083 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:19:24 +00:00
sminnee 44be8c39bc MINOR Fixed ambiguous statements about the database in installation, refer to MySQL specifically since that's what it's checking for (from r93107)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112082 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:17:17 +00:00
sminnee 95f1703979 ENHANCEMENT #4742 Set lower timeout for mysql_connect to avoid long timeouts when mysql_connect can't find a MySQL server locally during SS install, and only do certain MySQL checks if the server can be found, greatly improving install performance (from r93106)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112081 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:16:27 +00:00
sminnee be07c8ca3f MINOR Fixed grammar mistake in install (from r92304)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112080 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-13 02:13:54 +00:00
ischommer 317e179cb1 MINOR Added querystring option to Makefile (from r103746)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@103884 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-03 01:32:42 +00:00
ischommer 429e2421c9 MINOR Temporarily added legacydatetimefields module to trunk until 2.4 is merged back
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@103678 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-28 10:53:57 +00:00
ischommer 3053074464 MINOR Reverting back to a much more boring documentation link
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@100002 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-26 01:34:32 +00:00
ischommer 5157a61f72 w00t
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@100001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-26 01:28:26 +00:00
ischommer 1f80831a30 2
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@99999 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-26 01:28:09 +00:00
ischommer 8230e7b7ac 3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@99998 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-26 01:28:02 +00:00
wrossiter 1cb2814764 Reverted r97231
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@97326 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-01-21 02:36:23 +00:00
fwink 882036e886 MINOR: Initial - still in prgress
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@97321 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-01-21 02:10:09 +00:00
sharvey 28277e9eca MINOR Reverted r96950
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@96953 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-01-14 20:36:57 +00:00
apiening c037177557 FEATURE: new SQLite3 database adapter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@96950 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-01-14 20:18:07 +00:00
sharvey 3b9fef20fd MINOR Removed jsparty from mergesources
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@93736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-27 01:05:13 +00:00
wrossiter bc5208aef8 MINOR: fixed externals to point to public facing repo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@93621 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 08:32:57 +00:00
ischommer 64faf6654a MINOR Removed checks for jsparty/ directory, which is no longer required
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@93615 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 05:18:23 +00:00
ischommer a0cedd3fb5 MINOR Partially reverted r92439, accidental commit to .htaccess
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92877 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 10:36:20 +00:00
ischommer 5832b464e7 API CHANGE Removed jsparty/ directory after merging in jsrewrite feature branch changes. The contained folders are now located in cms/thirdparty and sapphire/thirdparty?
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92854 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 04:12:42 +00:00
ischommer 0d0956b8be MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92466 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 01:54:02 +00:00
ischommer 4322aeb820 MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92447 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 01:27:53 +00:00
ischommer 8a1a426fc6 MINOR: Updating mergeinfo to ignore mergebacks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92446 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 00:54:49 +00:00
ischommer ed7a77a38d MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92441 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 00:46:20 +00:00
ischommer 844acb217d MINOR: Updating mergeinfo to ignore mergebacks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92439 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 00:42:47 +00:00
ischommer 4b3bc1996d MINOR Fixed merge errors and omissions from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92258 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 20:14:26 +00:00
ischommer 43ab9eaca5 MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92256 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 20:00:40 +00:00
ischommer a6a70237ed MINOR Changed silverstripe.com references to silverstripe.org (from r90887)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92255 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:59:17 +00:00
ischommer 1dcca6ef3c MINOR Removed unnecessary mergeinfo from themes subfolders
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92253 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:56:09 +00:00
ischommer 60ff89dfbd BUGFIX Fixed $ escaping in passwords set by install.php in _config.php (#4676) (from r90883)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92252 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:54:50 +00:00
ischommer 48fe08f2d0 MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92251 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:53:31 +00:00
ischommer 2c15f4b61f MINOR Reverted accidental commits in r71146, r71147, r71148, r71149, r71150, r71151 - thought I was committing to another repository... (from r71152)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92250 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:51:49 +00:00
ischommer 6765f0ac06 MINOR Fixed comma where it should've been a dot (from r83449)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92249 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:46:05 +00:00
ischommer 27c046a2a0 BUGFIX #4356 Removed string checking of PHP version and replaced with version_compare() in SS installer (from r81646)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92248 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:45:12 +00:00
ischommer 9eebe737e2 BUGFIX #4171 hamish: Fixed assets/.htaccess for CGI environments. (from r79222)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92247 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:42:55 +00:00
ischommer 5959603955 Disable PHP in the assets directory, regardless of virtual-host config (from r74816)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92246 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:42:02 +00:00
ischommer f3258df376 Added additional switch for a slight variation of the URL parsing code. (from r73224)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92245 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:41:49 +00:00
ischommer ac4fe4b243 BUGFIX: Fixed rewriteless operation in IIS 5.1 (from r73166)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92244 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:41:35 +00:00
ischommer 92db28eaae BUGFIX: Fixed mod_rewrite-less operation in the root folder of a windows box (from r72995)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92243 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:41:12 +00:00
ischommer be063f1285 MINOR: Use password field for password, dont require call by reference (from r72928)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92242 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:40:55 +00:00
ischommer 61f1d5dc2a BUGFIX: Get index.php filename rewriting working for windows (from r72504)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92241 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:39:57 +00:00
ischommer c546a1877a ENHANCEMENT: Added index.php that will keep SilverStripe functioning even if the .htaccess doesn't work (svn diff) (from r72495)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92240 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:39:44 +00:00
ischommer df8dc5f881 BUGFIX: Allow SilverStripe to work when asp_tags is on (from r72337)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92239 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:39:25 +00:00
ischommer dcc2749ed6 MINOR: Changed change log to point to online change log. (from r71924)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92238 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:38:41 +00:00
ischommer aa780a5e41 ... (from r71151)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92237 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:36:45 +00:00
ischommer 4e16f386c2 fixed label display for optionsetfields (from r71149)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92236 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:36:03 +00:00
ischommer 19c7e11c1e added mysite theme (from r71148)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92235 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:35:45 +00:00
ischommer e361bea5a2 removed tutorial files (from r71147)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92234 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:35:27 +00:00
ischommer 3c07e8b53d ... (from r71146)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92233 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:35:12 +00:00
ischommer db6ec11ce9 Added svn:ignore to assets/Uploads (from r70996)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92232 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:34:44 +00:00
ischommer 5bb0d9b138 Removed DirectorySlash update from installer's default htaccess as it breaks some installation targets (from r67085)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92231 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:34:02 +00:00
ischommer 37b79fc8a1 MINOR: Removed no-longer-used createHtAccessAlternative() (from r66916)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92230 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:33:24 +00:00
ischommer b2154e8c91 MINOR: Fixed phpinstaller svn:externals (from r66907)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92229 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:31:26 +00:00
ischommer 9e1b6679fc ENHANCEMENT #3123: Use ajax for mod_rewrite testing (from r66906)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92228 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:31:13 +00:00
ischommer c946d916d3 BUGFIX: Improved installer operation with PHP4 installed or no PHP installed.
API CHANGE: Reduced number of files needed for installer to work, and moved some into sapphire directory. (from r66896)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92227 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:25:37 +00:00
ischommer 89e5e6dc50 ENHANCEMENT #3126: Put site into dev mode for installation so you can see error messages. (from r66890)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92226 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:23:36 +00:00
ischommer 1c01f40a9d MINOR: Converted dos 2 unix (from r66887)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92225 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:21:53 +00:00
ischommer 028ee1c529 ENHANCEMENT: Installer checks that Query and HTTPResponse classes don't exist before installing. (from r66886)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:21:34 +00:00
ischommer 286f4eb29f MINOR: Updating mergeinfo to ignore mergebacks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92223 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:21:22 +00:00
ischommer 7d379183f5 MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92222 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:21:07 +00:00
ischommer d8cbb361b1 MINOR Added mergetracking info
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@92221 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-19 19:18:06 +00:00
ischommer 660861635f MINOR Added 2.4 as mergesource target
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@90888 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 03:09:46 +00:00
ischommer 3eb3a00c91 MINOR Added mergesources.yml
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@90858 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 01:29:21 +00:00
sminnee e09e1f2a4e ENHANCEMENT #3780: Check for token_get_all() support in installer.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@90549 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-31 00:57:27 +00:00
sminnee e0bf303de0 BUGFIX: Prevent 'make test' from running dev/build twice.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@90092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-26 21:26:40 +00:00
sminnee 71531e8231 ENHANCEMENT: Added 'make getallmodules' to help developers run allmodules tests locally
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@90091 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-26 21:26:00 +00:00
sminnee 6815399bc5 ENHANCEMENT: Include $allowed_actions by default on new sites, to encourage people to build more secure sites.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@88520 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:47:05 +00:00
sminnee 733d919ec9 ENHANCEMENT: Enable nested urls by default on new projects.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@88519 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-11 00:46:16 +00:00
ischommer 58ba28451e BUGFIX Removed stop-condition for *.php in default .htaccess file in files generated by rewritetest.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@81848 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-15 00:00:43 +00:00
ischommer 823613bf92 BUGFIX Removed stop-condition for *.php in default .htaccess file to allow non-existent .php files to be handled by SilverStripe. For example, this is handy when dynamically redirecting "legacy URLs" like "index.php?id=42" to new pages through database lookups rather than static rewrites
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@81847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-14 23:57:21 +00:00
sminnee 2de086a97b (nothing)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@81456 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-09 05:34:39 +00:00
ischommer 64628f99ae BUGFIX Sett connection charset to utf8 for installer.php (see r80232)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@80261 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-28 20:37:22 +00:00
sminnee 3a7e2f9f2c BUGFIX #2660: Don't try and connect to the MySQL server just to see if it's there, without a username/password.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@80238 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-28 01:38:19 +00:00
sminnee 8e9ae1d26c ENHANCEMENT: Set connection charset to utf8 for new sites.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@80232 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-27 13:26:54 +00:00
sminnee dcd2dae126 BUGFIX: Ignore deprecation errors for improved PHP 5.3 support.
BUGFIX: Fix behaviour of FILE_TO_URL_MAPPING on Windows.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@80131 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-26 02:46:14 +00:00
sminnee 64bc774dda MINOR: Reverted r77810
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@78550 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-07 23:41:28 +00:00
ischommer ad5e9cfb6e BUGFIX Excluding .json extension from RewriteCond in .htaccess to allow RestfulServer to work with JSON formats - fixed in install.php and rewritetest.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@78433 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-04 22:03:55 +00:00
ischommer e5dd525948 BUGFIX Excluding .json extension from RewriteCond in .htaccess to allow RestfulServer to work with JSON formats (more precise regex)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@78429 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-04 21:53:08 +00:00
ischommer 3b6104ff56 BUGFIX Excluding .json extension from RewriteCond in .htaccess to allow RestfulServer to work with JSON formats
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@78428 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-04 21:44:12 +00:00
wrossiter bd8ee78f12 MINOR: fixed i18n issue with page comment form
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@77810 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-26 02:05:30 +00:00
sminnee c39cb71700 MINOR: Added svn:ignore to assets/Uploads
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@77011 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-17 22:05:11 +00:00
sminnee 3acc32dcf7 MINOR: Fixed buildbot makefile
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@76040 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-05 00:47:36 +00:00
sminnee 405f698b34 Make Page.php compatible with asp_tags setting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@73488 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-03-22 04:41:36 +00:00
phalkunz 38cf565913 Added site search to blackcandy. ticket #1884
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@69919 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-01-08 22:13:29 +00:00
ischommer 61858e2f44 MINOR merged r66513 from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@66514 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-24 21:44:56 +00:00
sminnee b81135443e Updated SQL queries to be ansi compatable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@66400 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-23 00:30:52 +00:00
sminnee abad46e6cb Merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@66396 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-22 03:36:31 +00:00
aoneil e6d311212b Fix externals
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65864 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 21:51:24 +00:00
aoneil 6f84d09f3c Change externals to trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 21:12:18 +00:00
sminnee e8d26a0dc8 Merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65840 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 21:01:24 +00:00
sminnee a0a0d69782 Upgrade memory limit to min 32, rec'd 64
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 02:07:49 +00:00
sharvey 97717ba8f0 MINOR Added missing ?> PHP tag to Page.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65613 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-11 20:46:52 +00:00
sminnee f235497aab Re-added Requirements calls to Page.php for older theme compatability
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65504 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 01:04:45 +00:00
sminnee e655425d2c Removed Requirements call from controller; these should be put in the template now.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65501 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 00:53:41 +00:00
sminnee 78fa0fc32a Reverted r65395
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65396 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 21:01:04 +00:00
sminnee dc2779fe8f Removed redundant code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65395 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 21:00:14 +00:00
sminnee 7acdb0d636 FEATURE: Improved cli execution of installer.
BUGFIX: Removed excessively-specific includes that are no longer necessary thanks to r65385.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65386 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 04:52:45 +00:00
wrossiter f9200e1887 PATCH: MINOR: fixed the url of the themes page. #3006
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65338 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-06 00:31:24 +00:00
sharvey 17e2329c61 Reverted htaccess change
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65331 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 23:13:44 +00:00
phalkunz 3953b0f6ca IMPROVEMENT Fix tab display and button position when adding a record (ticket #3029)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65328 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 23:10:24 +00:00
wrossiter 744fa262c0 BUGFIX: Removed tutorial folder and moved html to its own theme. Now all code can be written in mysite. Edited installer to just switch SSViewer::set_theme(). BUGFIX: Fixed installer on trunk - now includes proper classs
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65323 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 23:01:15 +00:00
sharvey 49b11d2ae4 RequestHandlingData was renamed to RequestHandler - installer updates to fix this
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@65115 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 00:53:19 +00:00
sminnee 8d08bc8474 Removed auth_openid from default install
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@64707 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-23 22:38:16 +00:00
ischommer 55273c83b2 BUGFIX Using include_once() instead of include() for _ss_environment.php in install.php and Core.php to avoid PHP notice errors about double constant defines
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@64561 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 13:26:30 +00:00
sminnee 76a6b8f3a4 Fix notice level errors in command-line installation used in tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@64465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 23:17:06 +00:00
sminnee 320c7179b0 BUGFIX #2903: Fix RewriteBase generation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@64296 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-15 04:35:26 +00:00
ischommer 7a43c6b805 ENHANCEMENT Removing installer dependency on /tutorial folder - only requires it to be writeable if it exists now. This means we can use the installer for custom projects as well
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@64222 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-14 12:03:19 +00:00
sminnee 4e0fba8401 BUGFIX #2903: Fix RewriteBase generation on window
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@64212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-14 04:16:26 +00:00
sminnee 2f8b502bda BUGFIX #2903 - Fix rewritebase for windows
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@64155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-13 21:53:08 +00:00
aoneil 056bc59ec8 BUGFIX: #2527 - Fix mysql version detection on hosts with custom mysql version names (HakTom)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@63903 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-08 22:03:52 +00:00
sminnee a19daa0398 Turned dos line endings into unix
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@63112 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-26 02:22:41 +00:00
sharvey d02ee5d9a2 MINOR installation layout issue with lack of clearing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@62674 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-09-18 07:03:13 +00:00
sminnee 00f94e8867 Installer will now detect if you have an _ss_environment.php, and if so, use conf/ConfigureFromEnv.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@61633 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-27 10:52:53 +00:00
sminnee 9c15d0dae9 Updated installer for new URL handler
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@60454 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-12 01:25:41 +00:00
(no author) 5ded44a52f git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@58902 467b73ca-7a2a-4603-9d3b-597d59a354a9 2008-07-23 04:38:33 +00:00
aoneil 2699b55aff MINOR: #2316 - Installer incorrectly shows "GD2 support" as the failure message for "GD2 support"
(DanielVF)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@56943 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 05:44:20 +00:00
aoneil bd1c680398 Cleaned up ChangeLog (merged from 2.2.2, r51064)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@56927 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 04:44:15 +00:00
aoneil 2405cf0214 updated changelog for 2.2.2 (merged from 2.2.2, r51042)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@56926 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-06-25 04:43:31 +00:00
sminnee 85c97e8bed Added build suffix to test installation function
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@55083 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-05-24 05:25:51 +00:00
sharvey 67314e0bb6 File::sync() is now deprecated, we now use FileSystem::sync() for the installer
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@53171 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-22 01:24:29 +00:00
sharvey 482f2ad509 BUGFIX: Removed undefined variable $mem - we include ini_set for memory_limit in main.php instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@53150 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-04-21 23:51:01 +00:00
ischommer da06ec2142 #2265 Installer falsely claims modrewrite fails (mamp)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@50691 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-07 01:17:15 +00:00
ischommer e022e12125 #2282 Undefined index in install.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@50689 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-07 00:35:54 +00:00
ischommer 3bc42d4458 #2266 Fresh install of SilverStripe doesn't let you upload or view images to insert, until you first go into Files and Images area
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@50688 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-03-07 00:33:19 +00:00
sminnee 561b490b98 #1987 - Fixed sitename/?url=sitename bug
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@49144 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-06 23:24:27 +00:00
aoneil 530c841c7a #1881 - Duplicated words in error message text
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@49059 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-02-04 19:59:31 +00:00
sminnee 32a8c26164 Fixed admin credentials setting from 'make install' and 'make test'
Added the contents of assets/ to svn:ignore

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@48168 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 05:31:14 +00:00
sminnee eeeed9890e Better error for cli-install errors, uses exit(1) to stop make
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@48145 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-17 01:58:10 +00:00
sminnee 5ed785dc71 Allow calling of installer by running 'make install' from an environment with an _ss_environment.php file. This is important for continuous integration.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@48125 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-16 23:47:23 +00:00
aoneil 1fe1614bce #2058 - Installer does not escape passwords in _config files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@47903 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-11 03:10:50 +00:00
aoneil a4cadc80f6 Fix externals
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@47874 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-11 00:10:06 +00:00
aoneil b2156f92bc #1874 - generated .htaccess lacks "Rewritebase"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@47868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 23:40:26 +00:00
aoneil 40fe857bfb #1352 - Better handling of memory limit
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@47824 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-10 02:50:57 +00:00
aoneil 51865bf9d7 Update copyright to 2008
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@47650 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-06 22:46:39 +00:00
aoneil 028dcbe547 Merged revisions 47430 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.2.1

........
  r47430 | aoneil | 2007-12-21 09:45:44 +1300 (Fri, 21 Dec 2007) | 2 lines
  
  Added release date
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@47641 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-06 22:08:45 +00:00
aoneil eb7f72c81b Merged revisions 47262 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.2.1

........
  r47262 | aoneil | 2007-12-18 16:34:56 +1300 (Tue, 18 Dec 2007) | 2 lines
  
  Updated Changelog
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@47640 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-06 22:08:13 +00:00
aoneil 85647510b2 Blocked revisions 46946-46947 via svnmerge
................
  r46946 | ischommer | 2007-12-16 15:20:27 +1300 (Sun, 16 Dec 2007) | 9 lines
  
  Merged revisions 46945 via svnmerge from 
  http://svn.silverstripe.com/open/modules/sapphire/trunk
  
  ........
    r46945 | ischommer | 2007-12-16 15:20:06 +1300 (Sun, 16 Dec 2007) | 1 line
    
    updating czech translation (thanks to GHOPer misakmilan for reviewing!)
  ........
................
  r46947 | ischommer | 2007-12-16 17:17:33 +1300 (Sun, 16 Dec 2007) | 1 line
  
  reverted accidental deletes from r46946
................


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@47639 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-06 22:07:23 +00:00
aoneil 3148450cf4 Merged revisions 46870 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.2.1

........
  r46870 | aoneil | 2007-12-14 15:37:52 +1300 (Fri, 14 Dec 2007) | 2 lines
  
  Updated ChangeLog
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@47638 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-01-06 22:05:39 +00:00
aoneil c871d05a3c Merged revisions 46148-46838 via svnmerge from
svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.2.1

........
  r46148 | aoneil | 2007-12-03 13:31:40 +1300 (Mon, 03 Dec 2007) | 2 lines
  
  Updated ChangeLog
........
  r46803 | aoneil | 2007-12-14 11:11:56 +1300 (Fri, 14 Dec 2007) | 2 lines
  
  Updated ChangeLog
........
  r46838 | aoneil | 2007-12-14 13:25:56 +1300 (Fri, 14 Dec 2007) | 2 lines
  
  Updated ChangeLog
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@46834 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-14 00:39:24 +00:00
aoneil 7116ec725c Initialized merge tracking via "svnmerge" with revisions "0-46136" from
svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.2.1


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@46833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-14 00:36:38 +00:00
aoneil 5331bd49e2 No login form on tutorial theme (merged from 2.2.0 branch, r44949)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@46125 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-12-02 21:47:20 +00:00
aoneil a02b4290b8 Updated changelog
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@45872 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-28 04:16:05 +00:00
aoneil 5232836609 Updated ChangeLog
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@45206 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-20 04:02:11 +00:00
aoneil 06beaf3bc7 Added openid module
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@44712 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-13 02:21:08 +00:00
aoneil a7c2793156 Updated ChangeLog
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@44683 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-13 01:41:48 +00:00
aoneil 9026d0ff61 Updated UPGRADING file
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@44663 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-12 22:02:20 +00:00
aoneil 439fe64824 Updated ChangeLog
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@44295 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 22:44:52 +00:00
aoneil 0cb727769d Fixed tabs instead of spaces
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@44272 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 05:33:31 +00:00
aoneil b53d8fff01 Updated ChangeLog
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@44271 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-05 05:31:46 +00:00
aoneil 04e8b38c41 Updated ChangeLog for 2.1.1
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@44229 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-04 23:24:28 +00:00
aoneil b81efd71a9 Cleaned up the ChangeLog
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@44142 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-02 01:33:30 +00:00
aoneil 654fc8c095 #1558 - Memory limit using ini_set()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@43982 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-29 23:23:38 +00:00
aoneil 4e94efeaaa #1464 - PHP installer doesn't keep the admin username/password when you 'recheck requirements'
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@43975 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-29 22:12:21 +00:00
aoneil e9ae0ff4b7 Hide more open_basedir issues
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@43114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-04 21:47:40 +00:00
aoneil 5d629013d0 Switch installer to trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42994 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 23:47:12 +00:00
aoneil 536708f898 flush when rewrite test is forced
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42756 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 23:27:47 +00:00
aoneil da2608ac76 Fix installer styles
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42700 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 04:37:40 +00:00
aoneil 8892e83027 Added Includes and Layout directory to tutorial
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42588 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 23:16:55 +00:00
aoneil a7ce9fa57b Updated ChangeLog
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42508 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-24 05:32:43 +00:00
aoneil c76f20ef98 Added logo to default install
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42470 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-24 00:25:22 +00:00
aoneil 9efd49d11a Added favicon
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42459 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-23 23:34:09 +00:00
aoneil b716e29743 Optional reporting of versions to SilverStripe
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42412 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-21 04:50:50 +00:00
aoneil ab17337b75 Flush the cache after the rewrite test
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-17 22:00:48 +00:00
aoneil ff8c56927c Don't show open_basedir errors when curl can't access temp dir
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42178 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-17 01:19:15 +00:00
aoneil 984d74e9b6 Make the installer work with short tags
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42175 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-17 00:56:41 +00:00
aoneil decb17bbd6 Make the installer work with short tags
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-17 00:17:51 +00:00
aoneil 3255bcb4c0 Add css requirements to install files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42167 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 22:49:43 +00:00
aoneil 13cbf84a60 Updated ChangeLog
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@42165 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 22:38:33 +00:00
57 changed files with 693 additions and 2254 deletions

15
.cow.json Normal file
View File

@ -0,0 +1,15 @@
{
"github-slug": "silverstripe/silverstripe-installer",
"child-stability-inherit": true,
"dependency-constraint": "loose",
"vendors": [
"silverstripe"
],
"tests": [
"vendor/bin/phpunit vendor/silverstripe/framework/tests/php",
"vendor/bin/phpunit vendor/silverstripe/cms/tests/php"
],
"exclude": [
"silverstripe/recipe-plugin"
]
}

79
.cow/changelog.md.twig Normal file
View File

@ -0,0 +1,79 @@
# {{ version }}
## Overview
A full list of module versions included in CMS Recipe {{ version }} is provided below. We recommend referencing recipes in your dependencies, rather than individual modules, to simplify version tracking. See [Recipes](/getting_started/).
<details>
<summary>Included module versions</summary>
| Module | Version |
| ------ | ------- |
| silverstripe/admin | x.x.x |
| silverstripe/asset-admin | x.x.x |
| silverstripe/assets | x.x.x |
| silverstripe/campaign-admin | x.x.x |
| silverstripe/cms | x.x.x |
| silverstripe/config | x.x.x |
| silverstripe/errorpage | x.x.x |
| silverstripe/framework | x.x.x |
| silverstripe/graphql | x.x.x |
| silverstripe/login-forms | x.x.x |
| silverstripe/mimevalidator | x.x.x |
| silverstripe/reports | x.x.x |
| silverstripe/siteconfig | x.x.x |
| silverstripe/versioned | x.x.x |
| silverstripe/versioned-admin | x.x.x |
</details>
{% if version.stability == 'rc' %}
## Release Candidate
This version of Silverstripe CMS is a **release candidate** for an upcoming stable version, and should not be applied to production websites. We encourage developers to test this version in development / testing environments and [report any issues they encounter via GitHub](/contributing/issues_and_bugs/).
{% elseif version.stable %}
Upgrading to Recipe {{ version }} is recommended for all sites. This upgrade can be carried out by any development team familiar with Silverstripe.
## Security considerations
This release includes security fixes. Please see the release announcements for more detailed
descriptions of each. We highly encourage upgrading your project to include the latest security patches nonetheless.
We have provided a high-level severity rating of the vulnerabilities below based on the CVSS score, however please note this could vary based on the specifics of each project. You can [read the severity rating definitions in the Silverstripe CMS release process](/contributing/release_process/#severity-rating).
* [CVE-0000-0000 The Issue Title](https://www.silverstripe.org/download/security-releases/CVE-0000-0000) Severity: {# Critical/ High/ Medium/ Low #}
* [CVE-0000-0001 The Issue Title](https://www.silverstripe.org/download/security-releases/CVE-0000-0001) Severity: {# Critical/ High/ Medium/ Low #}
## New features
The [release announcement](#) includes the note worthy features, but be sure to review the change log for full detail.
{# other upgrade notes here #}
## Known issues
{#
* [Known issue](GitHub link)
#}
### Expected test failures
The following PHPUnit test failures are expected and do not represent functional issues:
{#
* List test failures here
#}
```
...
```
...
{% endif %}
{{ logs }}

25
.editorconfig Normal file
View File

@ -0,0 +1,25 @@
# For more information about the properties used in
# this file, please see the EditorConfig documentation:
# http://editorconfig.org/
root = true
[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false
[*.{yml,json}]
# The indent size used in the `package.json` file cannot be changed
# https://github.com/npm/npm/pull/3180#issuecomment-16336516
indent_size = 2
indent_style = space
[composer.json]
indent_size = 4

12
.env.example Normal file
View File

@ -0,0 +1,12 @@
# For a complete list of core environment variables see
# https://docs.silverstripe.org/en/4/getting_started/environment_management/#core-environment-variables
# DB credentials
SS_DATABASE_CLASS="MySQLDatabase"
SS_DATABASE_SERVER="localhost"
SS_DATABASE_USERNAME="<user>"
SS_DATABASE_PASSWORD="<password>"
SS_DATABASE_NAME="<database>"
# WARNING: in a live environment, change this to "live" instead of dev
SS_ENVIRONMENT_TYPE="dev"

11
.gitattributes vendored Normal file
View File

@ -0,0 +1,11 @@
.github export-ignore
.cow.json export-ignore
.cow export-ignore
.gitattributes export-ignore
.travis.yml export-ignore
behat.yml export-ignore
build.xml export-ignore
CONTRIBUTING.md export-ignore
LICENSE export-ignore
phpunit.xml.dist export-ignore
README.md

27
.github/workflows/ci.yml vendored Normal file
View File

@ -0,0 +1,27 @@
name: CI
on:
push:
pull_request:
workflow_dispatch:
jobs:
ci:
name: CI
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
with:
# installer contains a sample behat.yml file, though there are no behat tests to run
endtoend: false
# require the following in ci.yml rather than composer.json require-dev specifically for installer because unlike
# regular modules, require-dev will get installed to projects during `composer create-project silverstripe/installer`
composer_require_extra: silverstripe/recipe-testing:^2 silverstripe/frameworktest:^0.4.2 mikey179/vfsstream:^1.6.10
extra_jobs: |
- endtoend: true
endtoend_suite: admin
endtoend_config: vendor/silverstripe/admin/behat.yml
- endtoend: true
endtoend_suite: asset-admin
endtoend_config: vendor/silverstripe/asset-admin/behat.yml
- endtoend: true
endtoend_suite: cms
endtoend_config: vendor/silverstripe/cms/behat.yml

16
.github/workflows/dispatch-ci.yml vendored Normal file
View File

@ -0,0 +1,16 @@
name: Dispatch CI
on:
# At 4:00 PM and 5:00 PM
schedule:
- cron: '0 16,17 * * *'
jobs:
dispatch-ci:
name: Dispatch CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Dispatch CI
uses: silverstripe/gha-dispatch-ci@v1

17
.github/workflows/keepalive.yml vendored Normal file
View File

@ -0,0 +1,17 @@
name: Keepalive
on:
workflow_dispatch:
# The 8th of every month at 4:50pm UTC
schedule:
- cron: '50 16 8 * *'
jobs:
keepalive:
name: Keepalive
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Keepalive
uses: silverstripe/gha-keepalive@v1

8
.gitignore vendored Normal file
View File

@ -0,0 +1,8 @@
/silverstripe-cache/
/.env
/vendor/
/themes/simple/
/_resources/
/public/_resources/
/.graphql-generated/
/public/_graphql/

View File

View File

@ -0,0 +1,2 @@
RewriteEngine On
RewriteRule ^(.*)$ public/$1

28
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,28 @@
# Contributing
Any open source product is only as good as the community behind it. You can participate by sharing code, ideas, or simply helping others. No matter what your skill level is, every contribution counts. See our [high level contribution overview](http://silverstripe.org/contributing-to-silverstripe) on silverstripe.org on how you can help out.
## Bugtracker ##
Bugs are tracked on [github.com](https://github.com/silverstripe/framework/issues).
Please read our [issue reporting guidelines](http://doc.silverstripe.org/framework/en/misc/contributing/issues).
## Development and Contribution ##
For submitting patches, please read our [guide to contributing code](http://doc.silverstripe.org/framework/en/misc/contributing/code). We only accept pull requests on github.com.
## Links ##
* [Server Requirements](http://doc.silverstripe.org/framework/en/installation/server-requirements)
* [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/)
* [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues)
* [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues)
* [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues)
* [Forums](http://silverstripe.org/forums)
* [Developer Mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)
## Copyright
**IMPORTANT: By supplying code to the SilverStripe core team in patches, tickets and pull requests, you agree to assign copyright of that code to SilverStripe Limited, on the condition that SilverStripe Limited releases that code under the BSD license.**
We ask for this so that the ownership in the license is clear and unambiguous, and so that community involvement doesn't stop us from being able to continue supporting these projects. By releasing this code under a permissive license, this copyright assignment won't prevent you from using the code in any way you see fit.

264
ChangeLog
View File

@ -1,264 +0,0 @@
SilverStripe ChangeLog
2.1.0
- Theme support
- Widget support
- Better extension API
- Unit testing framework
- Comment administration section, and comment moderation
- TinyMCE has been updated to 2.1.1.1
- Drastically improved database build performance
- Support for running SilverStripe in safe mode
- Improved spam detection
- More API documentation
- PHP notice fixes
- Added support for __ss_environment.php files
- Use normal authentification rather than basicauth for db/build
- Moved RestfulService from mashups module into sapphire core
- Added BBCodeParser
- Fix CSS of profiler pop-up
- Fix specific newsletter bug
- Added sorting, highlighting, formatting to TableListField
- Automatic filesystem backup of POST-data in Form
- Support for right-aligned titles in FormField
- Custom CSS-clases in FormFields by addExtraClass() and removeExtraClass()
- Validation in ComplexTableField_Popup
- Added BankAccountField
- Changed DropdownField.php $emptyString-syntax from '0' to ''
- Better validation in PhoneNumberField
- Validation and RequiredFields for TableField
- Fixed IE6 DOM-parsing bug caused by FormResponse::load_form()
- Triggering previewwrite for 'delete' and 'replace' SQL-actions
- Changed record-insertion in DataObject
- Added DataObjectSet->getRange()
- Added Date::past_date()
- Boolean.php accepts database-default
- Added Varchar->RTF()
- Added Convert::raw2htmlatt(), Convert::raw2mailto()
- Optionally hide backtrace-headers in Debug::message() and Debug::show() (applied in 'showqueries')
- Improved validation in Email::is_valid_address()
- MimeType-fallback for Email (from /etc/mime.types)
- Added Description-field to Group.php
- Added $strict-flag to Permission::check()
- Fixed Permission::get_members_by_permission()
- Implemented showIndicator() and hideIndicator(), Improved statusMessage() to clear manually instead of fixed interval, added hideStatusMessage()
- Added memory_limit to publishall()
- Styling changes in TreeDropdownField, TableListField
- Allow member cms fields to be added by DataObjectDecorators
- Fix many-many component set relation setting
- Added FiledSet::insertAfter()
- Allow classes other than typography to be set on HtmlEditorFields
- Added readonly transforamtion for ImageField
- The Link for a RedirectorPage points to its target
- Add SQL_ prefix in place it was missing in Email
- Added ContentController::project()
- layout.css, form.css and typography.css are automatically included
- Allow CMS users to limit view/edit access to a page.
- Added a check to make sure record exists before calling hasMethod on it in CheckboxSetField
- Don't show classes user doesn't have permissions to change to in class dropdown
- Fixed bug in DataObject::addStaticVars()
- Check for string 'true' as well as boolean in SiteTree::MetaTags()
- Fix AllNewsletters value not being passed to OptionSetField in SubscribeForm
- Fix reading of Live pages in CMSMain
- Fix double page reading after changing the class
- Fix insert flash
- Fix version regex for release candidates
- Fix delete in Files and Images section
- Fixed saving root folder causes error
- Fixed "non-numeric ID" error that occurs when visiting newsletter section for a newsletter that doesn't exist (caused by session sometimes)
- Added anchors to page comments, and made rss feed link to them
- Show an rss link for page comments on each page
- Fixed MetaTags so it accepts a string or a boolean, which means it will behave correctly in templates
- Improved the encapsulation of ErrorPage publication
- Added ID,ID,ID syntax for populating many-many joins
- Fix redirect back after failing login
- Fixed renaming of .tar.gz and .tar.bz2 files
- Added validation to TableField
- Fixed validation of DateField, EmailField and NumericField
- Fix livesite bug for visibility handling difference between PHP5.2.0 and PHP5.1.6
- Changed colouring of db/build to be more appropriate for the actual meaning of the messages
- Added PaddedImage to Image
- Allow passing of an array of permission codes to Permission::get_members_by_permission()
- Refactored newsletter system to put recipient selection and form-fieldset generation into the NewsletterType class, to allow for subclassing NewsletterType to create special system newsletters.
- Fixed redirection from /home/ to /./ in IE6
- Use the homepage as a model for the security base-page, so that things like the current subsite are factored in
- Added Director::redirected_to / Controller::redirectedTo() for redirection-detection
- Added '<% if HasPerm(PERM_CODE() %>' to ViewableData for template
- Sorted permission codes in Permission::get_codes
- Added EDIT_PERMISSIONS permission code for SecurityAdmin
- Added Permission::get_groups_by_permission
- Refactored CMS page-URL accessing to use ->AbsoluteLink(), which can be overridden by defining alternateAbsoluteLink()
- Allow logging in via BasicAuth
- Allow the dev and test servers to be set via Director
- Installer changes
- New installer look based on BlackCandy
- Use the new theme system
- Add first and last name fields
- Added ability to set servers that will be in dev mode
- When the posix module isn't present, throw a warning instead of dying
- Warn if PHP version is less that 5.2.0 in support of GoPHP5 (http://www.gophp5.org)
2.0.2
- BlackCandy is the new default theme
- Much more API Documentation
- Reduced warnings when E_NOTICE is enabled
- Modules must now have _config.php files in order to be loaded
- Forms in newsletter & security section were incorrectly submitting when enter was pressed
- Fixed validation of date fields in a user defined form
- Fixed search in MemberTableField
- Fixed multiple security groups being created when logging in with default admin
- Ensure that WYSIWYG context menu always appears on the screen
- Fixed permissions for administrating page comments
- Added pagination for page comments
- Fixed a bug where you couldn't always edit the bottom of an WYSIWYG editor field
- Fixed ContentController::PageComments() method to die if spammers are POSTing form data when comments are disabled
- Fixed permission checking on PHP 5.0.5
- Fixed 'cannot access protected property' error in Security section on PHP 5.0.5
- Fixed javascript validation of forms
- Don't show popup when validation fails in Security section
- Fixed error when asp_tags = On
- Fixed bug where you have a non-required field with numeric validation
- Added ContentNegotiator::set_encoding() to choose a character set other than utf-8
- Added a limit of 20 steps in Breadcrumbs generation
- Changed SiteTree.Title length from 100 to 255
- Fixed random password generator in Member::createNewPassword()
- Fixed bug where scrollbars aren't shown in the CMS
- Let CMSMain be used to manage objects without Sort
- Fixed BatchProcess to not display an error if no objects could be processed
- The help button now redirects to http://userhelp.silverstripe.com
- Fixed a bug where a user is redirected incorrectly after logging in
- Changed temp-folder selection to not leave temp files lying around, and put silverstripe temp files into a silverstripe-cache folder
- Removed duplicate XML class
- Made guid of PageComments in rss feed unique
- Performance improvements to client-side javascript
- Fixed bugs caused by missing html elements
- Optimised behaviour load times
- Sorted the output of profiler
- Performance enhancements to form and template code
- Added trace argument to Profiler::show
- Added profiling scaffolds
- Fixed code to remove need for short_open_tag
- Fixed FileSize generation for sizes of just over 1 meg
- only show $messageBlock in FormField::FieldHolder() if $Message is existing
- fixed rightTitle and id in FormField::FieldHolder()
- Added Email::send_all_emails_to to assist in testing
- Added Email::cc_all_emails_to() and Email::bcc_all_emails_to()
- Fixed ?isDev=1 mode
- Replaced sendLiveErrorsTo with send_errors_to, for more flexibility
- Set default of sendWarnings on Debug::send_errors_to
- Fixed formatting of error emails sent from ajax requests
- Removed debug plumbing from the results of Debug::backtrace()
- Added ?profile_trace=1 url variable tool to show a trace on the profiler
- Simplified return data of htmlEmail, an inconsequential internal optimisation
- Create assets folder if it doesn't exist when uploading a file
- Improvements to profiling information
- Fixed bug in SiteTree::NestedTitle()
- Updated CalendarDateField, adding a calendar icon to the right of it
- Updated date field in CMS-edited forms to use CalendarDateField
- Added Form::current_action() and Form::single_field_required() to aid in form optimisation
- Don't append /home to the home page URL
- Small fix for windows installations
- Fixed efficiency problems in Versioned::get_latest_version
- Fixed File::sync(), to let it recurse into new directories in a single execution
- Fixed bug with getting form action that was breaking form submission and complextablefield pop-up
- Prepared CheckboxSetField for use editing a many-many join in the CMS, popualted with a SQLMap object
- Added TreeDropdownField::setTreeBaseID, for showing a sub-tree in your field
- Fixed SQLMap iteration
- Added option to TableField, to aid putting TableFields inside the ComplexTableField? popup
- Simplified EmailField validation error message
- Fixed some bugs in the debug emailer
- Reduced amount of ajax-refetching that the TreeSelectorFields do
- Added 'open in new window' checkbox to link inserter
- Fix macron support in reports
- Improved debug message (remove big blocks of redundant data)
- Allow for the disabling of default buttons. Apply this to CMSMain and GenericDataAdmin in the administration, so that we don't default to clicking the *DELETE* button.
- Added default value to first arg of permissionFailure(); it's not actually used!
- Added PermissionProvider class and Permission::get_codes()
- Added ClassInfo::implementorsOf()
- Added providePermissions() for core items, and set up a dropdown interface for the security CMS admin
- Added DataObject::add_extension() for adding decorators in _config.php
- Added DataObjectDecorator::extraDBFields() for modifying the decorated data objects, adding extra database fields
- Improved handling of EditableFormFields on new UserDefinedForms
- Version displayed in CMS now works correctly
- Removed non-XHTML compliant border attributes from editor
- Updated GenericDataAdmin to use new permissions model
- Fixed CMS action button support when text size increases
- Added message when report is empty
- fixed (overrides) to CSS to avoid larger font-size due to em values
- Fixed tree scrolling and resizing issues
- Improved search results message shown on first load
- Added 2nd argument to LeftAndMain::setApplicationName so that the name in the top corner and the name shown elsewhere can be 2 different strings
- Added event.setStyle to prototype_improvements.js
- Fix weird bug in behaviour to do with class.applyToChildren
- Add class text field to image properties dialog in TinyMCE
- Added ?debug_behaviour=1 URL option for debugging behaviour calls with Firebug
- Made calendar control register a date change when the calendar is used
- Improved console.log alternative
- Fixed sizing issues with CMS right content area
- Fixed bug with image insertion
- Set some good defaults in DataObjectSet::TotalPages() if they have not been set
- Changes to support forum
- Removed db/populate as it was a security risk, the initial content is now loaded via requireDefaultRecords()
- Require authenficiation to do a db/build on live sites
- Close directories before trying to remove them
- Fixed bug where new pages weren't being highlighted in the CMS
- Fixed bug where the last page in the site tree wasn't being highlighted in the CMS
- Fixed a bug where CheckboxSetField wouldn't save if there was a method the same as the field name
- Fixed reordering of groups in security section
- Improvements to image inserter
- Fix multiple "broken" in class attribute of HTML Content
- Fixed bug with TreeDropdownField when you clicked the expand link 3 or more times, it wouldn't close
- Added dimension fields when inserting images
- Fixed bug when editing properties of new text fields
- Added FormField::Required(), so that you can put asterisks into a form template if you wish
- Fixed duplicate of UserDefinedForm objects
- Installer changes
- Added option of installing either the default template, or the tutorial template
- mod_rewrite check now works with http authentification
- Workaround for 'URL file-access is disabled in the server configuration' using curl for mod_rewrite test
- Better error message if the installer can't detect the web server
- Added an alternative .htaccess configuration
- Less file permissions required by the installer
- Made deleting the installer files more prominent, it now deletes all the installations files, not just php.
- MySQL password is now a hidden field.
2.0.1
- Text->FirstParagraph() now only shows the first paragraph
- Fixed HTMLText->Summary()
- Fixed layout issues on IE7 for TreeDropdownField
- Don't show Akismet errors to user
- Removed overloaded MemberTableField->sourceItems() that was causing problems
- Improved layout of UserDefinedForm submissions in CMS
- Fixed UserDefinedForm submission emails
- Fixed UserDefinedForm permissions
- If a file extension doesn't have a maximum upload size associated with it, then allow uploads of any size
- Fixed a bug with the TreeMultiselectField that prevented it from displaying the checkboxes
- Made Scheduled tasks concrete so they can be instantiated
- Fixed sizing of tabs in CMS
- Fixed popup for single asset in Files & Images section
- Mime types fallback for servers don't have /etc/mime.types
- Fixed link to CMS on default homepage
- TableField fixes
- mb_string module is now an optional dependency
- Fixed security vunerability in search
- Fixed permissions table in Security section
- GD::color_web2gd() was using incorrect substr
- Fixed last link css
- Fixed el no properties error in IE
- Fixed duplicate checkbox fields in UserDefinedForm
- Fixed css in UserDefinedForm
- Don't show name field on root folder in Assets section
- Pressing the flash button a second time now hides the dropdown
- Added strong_create method to Object, as useCustomClass was not working correctly
- Installer fixes
- Fixed MySQL version check
- Merge with existing .htaccess file
- Test that mod_rewrite is working
- Added option to delete installer files after successful install
- Fixed PHP4 parse error so installer loads and shows correct error message
- Apache test passes if apache is used but apache php functions are not available
- SilverStripe needs at least PHP version 5.0.4
2.0.0
- Initial release

22
INSTALL
View File

@ -1,22 +0,0 @@
Thanks for downloading SilverStripe CMS.
Simply extract the archive to a folder in a web-accessible location and visit the folder
in your web browser (which in turn runs index.php).
This will lead you through a web-based installation process.
Server Requirements
* PHP 5+
* MySQL 4.1+
* Apache or Lighttpd webserver (feel free to try with others)
* Details at http://doc.silverstripe.com/doku.php?id=server-requirements
General documentation, tutorials:
* Wiki: http://doc.silverstripe.com/
* Tutorials: http://doc.silverstripe.com/doku.php?id=silverstripe-tutorial
Forum
* http://www.silverstripe.com/silverstripe-forum/

View File

@ -1,17 +1,17 @@
Copyright (c) 2007, SilverStripe Limited - www.silverstripe.com
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of SilverStripe nor the names of its contributors may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.
Copyright (c) 2007-2017, SilverStripe Limited - www.silverstripe.com
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of SilverStripe nor the names of its contributors may be used to endorse or promote products derived from this software
without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.

32
README.md Normal file
View File

@ -0,0 +1,32 @@
## Overview
[![CI](https://github.com/silverstripe/silverstripe-installer/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-installer/actions/workflows/ci.yml)
[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
Base project folder for a Silverstripe ([http://silverstripe.org](http://silverstripe.org)) installation. Required modules are installed via [http://github.com/silverstripe/recipe-cms](http://github.com/silverstripe/recipe-cms). For information on how to change the dependencies in a recipe, please have a look at [https://github.com/silverstripe/recipe-plugin](https://github.com/silverstripe/recipe-plugin). In addition, installer includes [theme/simple](https://github.com/silverstripe-themes/silverstripe-simple) as a default theme.
## Installation ##
`composer create-project silverstripe/installer my-app`
See [Getting Started](https://docs.silverstripe.org/en/4/getting_started/) for more information.
## Bugtracker ##
Bugs are tracked on github.com ([framework issues](https://github.com/silverstripe/silverstripe-framework/issues),
[cms issues](https://github.com/silverstripe/silverstripe-cms/issues)).
Please read our [issue reporting guidelines](https://docs.silverstripe.org/en/4/contributing/issues_and_bugs/).
## Development and Contribution ##
If you would like to make changes to the Silverstripe core codebase, we have an extensive [guide to contributing code](https://docs.silverstripe.org/en/4/contributing/code/).
## Links ##
* [Changelogs](https://docs.silverstripe.org/en/4/changelogs/)
* [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues)
* [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues)
* [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues)
* [Forums](http://silverstripe.org/forums)
* [Developer Mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev)
* [License](./LICENSE)

View File

@ -1,6 +0,0 @@
To upgrade your installation of SilverStripe, simply copy the
sapphire, cms & jsparty folders overtop of your existing installation.
Then flush the cache and rebuild the database (db/build?flush=1).
If there are any special notes on upgrading to a particular version,
these will be documented here.

26
app/_config/assets.yml Normal file
View File

@ -0,0 +1,26 @@
# SilverStripe 4.4 changes the way files are resolved. `silverstripe-assets` resolves files using a variety of formats
# by default. When starting a brand new project on SilverStripe 4.4 or greater, those extra formats are not needed and
# will slowdown file resolution requests a bit. This config removes those redundant formats.
---
Name: project-assetsflysystem
After: '#assetsflysystem'
---
SilverStripe\Core\Injector\Injector:
# Define public resolution strategy
SilverStripe\Assets\FilenameParsing\FileResolutionStrategy.public:
class: SilverStripe\Assets\FilenameParsing\FileIDHelperResolutionStrategy
properties:
ResolutionFileIDHelpers:
- '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
- '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper'
DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\NaturalFileIDHelper'
VersionedStage: Live
# Define protected resolution strategy
SilverStripe\Assets\FilenameParsing\FileResolutionStrategy.protected:
class: SilverStripe\Assets\FilenameParsing\FileIDHelperResolutionStrategy
properties:
DefaultFileIDHelper: '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
ResolutionFileIDHelpers:
- '%$SilverStripe\Assets\FilenameParsing\HashFileIDHelper'
VersionedStage: Stage

9
app/_config/email.yml Normal file
View File

@ -0,0 +1,9 @@
# See https://docs.silverstripe.org/en/4/developer_guides/email/ for additional information about setting up email
---
Name: project-emailconfig
After:
- '#emailconfig'
---
SilverStripe\Core\Injector\Injector:
Swift_Transport:
class: Swift_SendmailTransport

8
app/_config/theme.yml Executable file
View File

@ -0,0 +1,8 @@
---
Name: mytheme
---
SilverStripe\View\SSViewer:
themes:
- '$public'
- 'simple'
- '$default'

21
behat.yml Normal file
View File

@ -0,0 +1,21 @@
# Note: Currently chrome latest is recommended
# Behat test setup requires an `.env` with `SS_BASE_URL` defined, as well
# as each of the following commands to initiate a test run:
# ========================================================================= #
# composer require silverstripe/recipe-testing ^1
# vendor/bin/behat-ss @<module>
# ========================================================================= #
default:
suites: []
extensions:
SilverStripe\BehatExtension\MinkExtension:
default_session: facebook_web_driver
javascript_session: facebook_web_driver
facebook_web_driver:
browser: chrome
wd_host: "http://127.0.0.1:9515" #chromedriver port
browser_name: chrome
SilverStripe\BehatExtension\Extension:
bootstrap_file: vendor/silverstripe/cms/tests/behat/serve-bootstrap.php
screenshot_path: '%paths.base%/artifacts/screenshots'
retry_seconds: 4 # default is 2

55
build.xml Normal file
View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Phing build tooling for SilverStripe releases (see phing.info).
Install through "pear channel-discover pear.phing.info && pear install phing/phing".
Most tooling is placed in a separate module, install with "composer require silverstripe/buildtools".
It is safe to remove this file for normal website operation.
-->
<project name="silverstripe-installer" default="help" phingVersion="2.4.5">
<import file="buildtools/build.xml" optional="true" />
<property name="basedir" value="." override="true" />
<target name="help">
<phingcall target="buildtools.help" />
</target>
<target name="phpunit"
description="Runs unit tests as defined through phpunix.xml. Requires the 'phpunit' binary.">
<if>
<available file="${basedir}/vendor/bin/phpunit" />
<then>
<property name="phpunit_bin" value="vendor/bin/phpunit" />
</then>
<else>
<property name="phpunit_bin" value="phpunit" />
</else>
</if>
<exec command="${phpunit_bin}" checkreturn="true" passthru="true" />
</target>
<target name="behat" if="basedir"
description="Runs behaviour tests through Behat, on the 'framework' and 'cms' modules (if available). Requires phpunit, composer and behat.">
<if>
<available file="${basedir}/framework/" type="dir" />
<then>
<echo msg="Testing 'framework' module" />
<exec command="vendor/bin/behat --ansi @framework" checkreturn="true" passthru="true" />
</then>
</if>
<if>
<available file="${basedir}/cms/" type="dir" />
<then>
<echo msg="Testing 'cms' module" />
<exec command="vendor/bin/behat --ansi @cms" checkreturn="true" passthru="true" />
</then>
</if>
</target>
</project>

View File

@ -1,22 +0,0 @@
<?php
if(ini_get("short_open_tag")) {
header("Location: install.php");
} else {
echo "Please set the PHP option short_open_tag to true, restart your webserver, and then refresh your browser to continue.";
}
?>
<!--<?php /*-->
<html>
<head>
<title>No PHP Support</title>
</head>
<body>
<h1>No PHP Support</h1>
<p>
<p>Before I can install SilverStripe 2, you must add PHP support to your webserver.</p>
<p><a href="check-php.php">Try again</a></p>
</body>
</html>
<!--*/?>-->

37
composer.json Normal file
View File

@ -0,0 +1,37 @@
{
"name": "silverstripe/installer",
"type": "silverstripe-recipe",
"description": "The SilverStripe Framework Installer",
"require": {
"php": "^7.4 || ^8.0",
"silverstripe/recipe-plugin": "^1.2",
"silverstripe/recipe-cms": "4.x-dev",
"silverstripe-themes/simple": "~3.2.0",
"silverstripe/login-forms": "4.x-dev"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
},
"extra": {
"project-files": [
"app/_config/*",
".env.example",
".graphql-generated/*"
],
"public-files": [
"assets/*",
"favicon.ico"
],
"resources-dir": "_resources"
},
"config": {
"process-timeout": 600,
"allow-plugins": {
"composer/installers": true,
"silverstripe/recipe-plugin": true,
"silverstripe/vendor-plugin": true
}
},
"prefer-stable": true,
"minimum-stability": "dev"
}

View File

@ -1,113 +0,0 @@
body {
text-align: center;
}
#Container * {
text-align: left;
}
ul#Themes{
list-style: none;
margin: 5px;
}
ul#Themes li {
clear: both;
padding: 3px 0;
}
ul#Themes input {
float: left;
width: 10px;
height: 10px;
}
ul#Themes label {
margin: -2px 5px 0 15px;
}
.good td {
color: green;
}
.warning td {
color: #ef7f24;
}
.testResults .error td {
border: 1px #CCC solid;
color: red;
}
p.error {
padding: 0.5em;
background-color: #ffe9e9;
border: 1px #ff8e8e solid;
color: #f03838;
}
p.warning {
padding: 0.5em;
background-color: #fef1e1;
border: 1px #ffc28b solid;
color: #cb6a1c;
}
p.warning label {
display: inline;
margin-left: 5px;
color: #cb6a1c
}
p.good {
padding: 0.5em;
background-color: #e2fee1;
border: 1px #43cb3e solid;
color: #359318;
}
p.error a,
p.warning a,
p.good a {
color: inherit;
text-decoration: underline;
}
p.error a:hover {
text-decoration: none;
}
span.middleColumn {
width: 312px;
margin-right: 0;
padding: 4px;
}
input.text, textarea, select {
padding: 2px;
border: 1px solid #A7A7A7;
color: #000;
font-size: 1.2em;
font-weight: bold;
width: 305px;
}
table.testResults {
border-collapse: collapse;
width: 100%;
margin: 10px 0;
}
#Layout h4 {
font-size: 2em;
}
.testResults td {
border: 1px #CCC solid;
width: 400px;
padding: 4px;
}
.clear {
clear: both;
}
p.mysql,
p.adminAcc,
p.devHelp {
padding-top: 20px;
}
p#mysql_credentials,
p#AdminAccount,
p#DevSites {
width: 330px;
margin-top: 0;
float: left;
}
#Layout input.action {
text-align: center;
width: 160px;
font-size: 1em;
}

View File

@ -1,162 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<title>SilverStripe CMS Installation</title>
<script type="text/js">
function show(id) {
document.getElementById(id).style.display = '';
}
function hide(id) {
document.getElementById(id).style.display = 'none';
}
</script>
<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/layout.css" />
<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/typography.css" />
<link rel="stylesheet" type="text/css" href="themes/blackcandy/css/form.css" />
<link rel="stylesheet" type="text/css" href="config-form.css" />
</head>
<body>
<div id="BgContainer">
<div id="Container">
<div id="Header">
<h1>SilverStripe CMS Installation</h1>
<p>Version <?= $silverstripe_version ?></p>
</div>
<div id="Layout">
<div class="typography">
<h1>Welcome to SilverStripe</h1>
<p>Thanks for choosing to use SilverStripe! Please follow the instructions below to get SilverStripe installed.</p>
<form action="install.php" method="post">
<?php if(isset($hasErrorOtherThanDatabase)) { ?>
<p class="error">
You aren't currently able to install the software. Please <a href="#requirements">see below</a> for details.
</p>
<?php } else { ?>
<?php if($req->hasWarnings()) { ?>
<p class="warning">
There are some issues that we recommend you look at before installing, however, you are still able to install the software.
Please see below for details.
</p>
<?php } else if(!$dbReq->hasErrors()) { ?>
<p class="good">
You're ready to install! &nbsp;&nbsp;
</p>
<?php } ?>
<p>
<b>Template to install:</b>
</p>
<ul id="Themes">
<li><input type="radio" name="template" value="default" id="BlackCandy" checked="checked" /><label for="BlackCandy">BlackCandy, default template ready to use.</label></li>
<li><input type="radio" name="template" value="tutorial" id="EmptyTemplate" /><label for="EmptyTemplate">Empty template, ready to begin the tutorial.</label></li>
</ul>
<p>You can change the template or download another from the SilverStripe website after installation.</p>
<?php if($alreadyInstalled) { ?>
<p class="warning">
<strong>Note:</strong> It seems as though SilverStripe is already installed here. If you ask me to install, I will overwrite
the <strong>.htaccess</strong> and <strong>mysite/_config.php</strong> files.
<br />
<input type="checkbox" id="ReIn" name="force_reinstall" onclick="document.getElementById('install_button').disabled = !this.checked" /><label for="ReIn">That's okay, please re-install SilverStripe and overwrite these files.</label>
</p>
<? } ?>
<p>
<?php if($alreadyInstalled) { ?>
<input id="install_button" type="submit" disabled="disabled" class="action" name="go" value="Install SilverStripe" onclick="document.getElementById('saving_top').style.display = ''; this.value = 'Installing SilverStripe...'" />
<?php } else { ?>
<input id="install_button" type="submit" class="action" name="go" value="Install SilverStripe" onclick="document.getElementById('saving_top').style.display = ''; this.value = 'Installing SilverStripe...'" />
<? } ?>
<span id="saving_top" style="display: none">
&nbsp;
<img src="cms/images/network-save.gif" />
(this will take a minute or so)
</span>
</p>
<?php } ?>
<input type="hidden" name="database" value="MySQLDatabase" />
<h4>MySQL Database</h4>
<?php if($dbReq->hasErrors()) { ?>
<p class="error"><!-- class="error" -->
These database details don't appear to be correct. Please enter the correct details before installing.
</p>
<?php } else { ?>
<p class="good">
These database details look all good!
</p>
<?php } ?>
<p id="mysql_credentials">
<label for="mysql_server">MySQL server:</label>
<span class="middleColumn"><input id="mysql_server" class="text" type="text" name="mysql[server]" value="<?= $databaseConfig['server'] ?>" /></span>
<label for="mysql_username">MySQL username:</label>
<span class="middleColumn"><input id="mysql_username" class="text" type="text" name="mysql[username]" value="<?= $databaseConfig['username'] ?>" /></span>
<label for="mysql_password">MySQL password:</label>
<span class="middleColumn"><input id="mysql_password" class="text" type="password" name="mysql[password]" value="<?= $databaseConfig['password'] ?>" /></span>
<label for="mysql_database">MySQL database:</label>
<span class="middleColumn"><input id="mysql_database" class="text" type="text" name="mysql[database]" value="<?= $databaseConfig['database'] ?>" onchange="this.value = this.value.replace(/[^A-Za-z0-9_]+/g,'');" /></span>
<input type="submit" class="action" value="Re-check requirements" />
</p>
<p class="mysql">SilverStripe stores its content in a MySQL database. Please provide the username and password to connect to the server here. If this account has permission to create databases, then we will create the database for you; otherwise, you must give the name of a database that already exists.</p>
<div class="clear"><!-- --></div>
<h5>Details</h5>
<?php $dbReq->showTable("MySQL Configuration"); ?>
<br />
<h4>SilverStripe Administration Account</h4>
<p id="AdminAccount">
<label for="username">Administrator email:</label>
<span class="middleColumn"><input type="text" class="text" name="username" id="username" value="admin" /></span>
<label for="password">Administrator password:</label>
<span class="middleColumn"><input type="text" class="text" name="password" id="password" value="password" /></span>
<label for="firstname">Administrator first name:</label>
<span class="middleColumn"><input type="text" class="text" name="firstname" id="firstname" value="" /></span>
<label for="surname">Administrator surname:</label>
<span class="middleColumn"><input type="text" class="text" name="surname" id="surname" value="" /></span>
</p>
<p class="adminAcc">
We will set up 1 administrator account for you automatically. Enter the email address and password. If you'd
rather log-in with a username instead of an email address, enter that instead.
</p>
<br />
<h4>Development Servers</h4>
<p id="DevSites">
<label for="devsites">Development servers:</label>
<span class="middleColumn"><textarea name="devsites" id="devsites" rows="5" />localhost
127.0.0.1</textarea></span>
</p>
<p class="devHelp">
SilverStripe allows you to run a site in <a href="http://doc.silverstripe.com/doku.php?id=devmode">development mode</a>.
This shows all error messages in the web browser instead of emailing them to the administrator, and allows
the database to be built without logging in as administrator. Please enter the host/domain names for servers
you will be using for development.
</p>
<br />
<h4 id="requirements">Requirements</h4>
<?php
$req->showTable();
?>
</form>
</div>
</div>
</div>
<div id="Footer">
<p>Copyright &copy; 2007 | Powered by <a href="http://www.silverstripe.com">SilverStripe Open Source CMS</a></p>
</div>
</div>
</body>
</html>

View File

@ -1,17 +0,0 @@
<html>
<!--
This simple page will redirect to check-php.php
check-php.php will either redirect to install.php or no-php.html, depending on whether PHP support
is installed
-->
<head>
</head>
<body>
<script>
window.location = 'check-php.php';
</script>
<noscript>
<a href="install.php">Click here to install</a>
</noscript>
</body>
</html>

View File

@ -1,3 +0,0 @@
<?php
header("Location: check-php.php");
?>

View File

@ -1,923 +0,0 @@
<?php
/**
* SilverStripe CMS Installer
* This installer doesn't use any of the fancy Sapphire stuff in case it's unsupported.
*/
ini_set('max_execution_time', 300);
// Load database config
if(isset($_REQUEST['mysql'])) {
$databaseConfig = $_REQUEST['mysql'];
} else {
$databaseConfig = array(
"server" => "localhost",
"username" => "root",
"password" => "",
"database" => "SS_mysite",
);
}
$alreadyInstalled = (file_exists('mysite/_config.php') || file_exists('tutorial/_config.php'));
if(file_exists('sapphire/silverstripe_version')) {
$sapphireVersionFile = file_get_contents('sapphire/silverstripe_version');
if(strstr($sapphireVersionFile, "/sapphire/trunk")) {
$silverstripe_version = "trunk";
} else {
preg_match("/sapphire\/(?:(?:branches)|(?:tags))(?:\/rc)?\/([A-Za-z0-9._-]+)\/silverstripe_version/", $sapphireVersionFile, $matches);
$silverstripe_version = $matches[1];
}
} else {
$silverstripe_version = "unknown";
}
// Check requirements
$req = new InstallRequirements();
$req->check();
if($req->hasErrors()) {
$hasErrorOtherThanDatabase = true;
}
if($databaseConfig) {
$dbReq = new InstallRequirements();
$dbReq->checkdatabase($databaseConfig);
}
// Actual processor
if(isset($_REQUEST['go']) && !$req->hasErrors() && !$dbReq->hasErrors()) {
// Confirm before reinstalling
if(!isset($_REQUEST['force_reinstall']) && $alreadyInstalled) {
include('config-form.html');
} else {
$inst = new Installer();
$inst->install($_REQUEST);
}
// Show the config form
} else {
include('config-form.html');
}
/**
* This class checks requirements
* Each of the requireXXX functions takes an argument which gives a user description of the test. It's an array
* of 3 parts:
* $description[0] - The test catetgory
* $description[1] - The test title
* $description[2] - The test error to show, if it goes wrong
*/
class InstallRequirements {
var $errors, $warnings, $tests;
/**
* Just check that the database configuration is okay
*/
function checkdatabase($databaseConfig) {
if($this->requireFunction('mysql_connect', array("PHP Configuration", "MySQL support", "MySQL support not included in PHP."))) {
$this->requireMySQLServer($databaseConfig['server'], array("MySQL Configuration", "Does the server exist",
"Can't find the a MySQL server on '$databaseConfig[server]'", $databaseConfig['server']));
if($this->requireMysqlConnection($databaseConfig['server'], $databaseConfig['username'], $databaseConfig['password'],
array("MySQL Configuration", "Are the access credentials correct", "That username/password doesn't work"))) {
@$this->requireMySQLVersion("4.1", array("MySQL Configuration", "MySQL version at least 4.1", "MySQL version 4.1 is required, you only have ", "MySQL " . mysql_get_server_info()));
}
$this->requireDatabaseOrCreatePermissions($databaseConfig['server'], $databaseConfig['username'], $databaseConfig['password'], $databaseConfig['database'],
array("MySQL Configuration", "Can I access/create the database", "I can't create new databases and the database '$databaseConfig[database]' doesn't exist"));
}
}
/**
* Check everything except the database
*/
function check() {
$this->errors = null;
$this->requirePHPVersion('5.2.0', '5.0.4', array("PHP Configuration", "PHP5 installed", null, "PHP version " . phpversion()));
// Check that we can identify the root folder successfully
$this->requireFile('config-form.html', array("File permissions",
"Does the webserver know where files are stored?",
"The webserver isn't letting me identify where files are stored.",
$this->getBaseDir()
));
$this->requireFile('mysite', array("File permissions", "mysite/ folder exists", "There's no mysite folder."));
$this->requireFile('sapphire', array("File permissions", "sapphire/ folder exists", "There's no sapphire folder."));
$this->requireFile('cms', array("File permissions", "cms/ folder exists", "There's no cms folder."));
$this->requireFile('jsparty', array("File permissions", "jsparty/ folder exists", "There's no jsparty folder."));
$this->requireWriteable('.htaccess', array("File permissions", "Is the .htaccess file writeable?", null));
$this->requireWriteable('mysite', array("File permissions", "Is the mysite/ folder writeable?", null));
$this->requireWriteable('tutorial', array("File permissions", "Is the tutorial/ folder writeable?", null));
$this->requireWriteable('assets', array("File permissions", "Is the assets/ folder writeable?", null));
$this->requireTempFolder(array('File permissions', 'Is the temporary folder writeable?', null));
// Check for rewriting
$webserver = strip_tags(trim($_SERVER['SERVER_SIGNATURE']));
if($webserver == '') {
$webserver = "I can't tell what webserver you are running";
}
$this->isRunningApache(array("Webserver Configuration", "Server software", "$webserver. Without Apache I can't tell if mod_rewrite is enabled.", $webserver));
if(function_exists('apache_get_modules')) {
$this->requireApacheModule('mod_rewrite', array("Webserver Configuration", "mod_rewrite enabled", "You need mod_rewrite to run SilverStripe CMS, but it is not enabled."));
} else {
$this->warning(array("Webserver Configuration", "mod_rewrite enabled", "I can't tell whether mod_rewrite is running. You may need to configure a rewriting rule yourself."));
}
// Check for $_SERVER configuration
$this->requireServerVariables(array('SCRIPT_NAME','HTTP_HOST','SCRIPT_FILENAME'), array("Webserver config", "Recognised webserver", "You seem to be using an unsupported webserver. The server variables SCRIPT_NAME, HTTP_HOST, SCRIPT_FILENAME need to be set."));
// Check for GD support
if(!$this->requireFunction("imagecreatetruecolor", array("PHP Configuration", "GD2 support", "PHP must have GD version 2."))) {
$this->requireFunction("imagecreate", array("PHP Configuration", "GD2 support", "GD2 support", "GD support for PHP not included."));
}
// Check for XML support
$this->requireFunction('xml_set_object', array("PHP Configuration", "XML support", "XML support not included in PHP."));
// Check for MySQL support
$this->requireFunction('mysql_connect', array("PHP Configuration", "MySQL support", "MySQL support not included in PHP."));
// Check memory allocation
$this->requireMemory(20*1024*1024, 32*1024*1024, array("PHP Configuration", "Memory allocated (PHP config option 'memory_limit')", "SilverStripe needs a minimum of 20M allocated to PHP, but recommends 32M.", ini_get("memory_limit")));
// Check allow_call_time_pass_reference
$this->suggestPHPSetting('allow_call_time_pass_reference', array(1,'1','on','On'), array("PHP Configuration", "Check that the php.ini setting allow_call_time_pass_reference is on",
"You can install with allow_call_time_pass_reference not set, but some warnings may get displayed. For best results, turn it on."));
return $this->errors;
}
function suggestPHPSetting($settingName, $settingValues, $testDetails) {
$this->testing($testDetails);
$val = ini_get($settingName);
if(!in_array($val, $settingValues) && $val != $settingValues) {
$testDetails[2] = "$settingName is set to '$val' in php.ini. $testDetails[2]";
$this->warning($testDetails);
}
}
function requireMemory($min, $recommended, $testDetails) {
$this->testing($testDetails);
$mem = $this->getPHPMemory();
if($mem < $min && $mem > 0) {
$testDetails[2] .= " You only have " . ini_get("memory_limit") . " allocated";
$this->error($testDetails);
} else if($mem < $recommended && $mem > 0) {
$testDetails[2] .= " You only have " . ini_get("memory_limit") . " allocated";
$this->warning($testDetails);
} elseif($mem == 0) {
$testDetails[2] .= " We can't determine how much memory you have allocated. Install only if you're sure you've allocated at least 20 MB.";
$this->warning($testDetails);
}
}
function getPHPMemory() {
$memString = ini_get("memory_limit");
switch(strtolower(substr($memString,-1))) {
case "k":
return round(substr($memString,0,-1)*1024);
case "m":
return round(substr($memString,0,-1)*1024*1024);
case "g":
return round(substr($memString,0,-1)*1024*1024*1024);
default:
return round($memString);
}
}
function listErrors() {
if($this->errors) {
echo "<p>The following problems are preventing me from installing SilverStripe CMS:</p>";
foreach($this->errors as $error) {
echo "<li>" . htmlentities($error) . "</li>";
}
}
}
function showTable($section = null) {
if($section) {
$tests = $this->tests[$section];
echo "<table class=\"testResults\" width=\"100%\">";
foreach($tests as $test => $result) {
echo "<tr class=\"$result[0]\"><td>$test</td><td>" . nl2br(htmlentities($result[1])) . "</td></tr>";
}
echo "</table>";
} else {
foreach($this->tests as $section => $tests) {
echo "<h5>$section</h5>";
echo "<table class=\"testResults\">";
foreach($tests as $test => $result) {
echo "<tr class=\"$result[0]\"><td>$test</td><td>" . nl2br(htmlentities($result[1])) . "</td></tr>";
}
echo "</table>";
}
}
}
function showInstallStatus() {
if($this->warnings) {
echo "I have installed SilverStripe CMS, however, you should note the following:";
foreach($this->warnings as $warning) {
echo "<li>" . htmlentities($warning) . "</li>";
}
} else {
?>
<p>I have installed SilverStripe CMS successfully!</p>
<p><a href="./admin/" target="_blank">Open the CMS tool</a><br />
<a href="./" target="_blank">Open the site</a></p>
<?
}
}
function requireFunction($funcName, $testDetails) {
$this->testing($testDetails);
if(!function_exists($funcName)) $this->error($testDetails);
else return true;
}
function requirePHPVersion($recommendedVersion, $requiredVersion, $testDetails) {
$this->testing($testDetails);
list($recA, $recB, $recC) = explode('.', $recommendedVersion);
list($reqA, $reqB, $reqC) = explode('.', $requiredVersion);
list($a, $b, $c) = explode('.', phpversion());
$c = ereg_replace('-.*$','',$c);
if($a > $recA || ($a == $recA && $b > $recB) || ($a == $reqA && $b == $reqB && $c >= $reqC)) {
$testDetails[2] = "SilverStripe recommends PHP version $recommendedVersion or later, only $a.$b.$c is installed. While SilverStripe should run, you may run into issues, and future versions of SilverStripe may require a later version. Upgrading PHP is recommended.";
$this->warning($testDetails);
return;
}
if($a > $reqA) return true;
if($a == $reqA && $b > $reqB) return true;
if($a == $reqA && $b == $reqB && $c >= $reqC) return true;
if(!$testDetails[2]) {
if($a < $reqA) {
$testDetails[2] = "You need PHP version $version or later, only $a.$b.$c is installed. Unfortunately PHP$a and PHP$reqA have some incompatabilities, so if you are on a your web-host may need to move you to a different server. Some software doesn't work with PHP5 and so upgrading a shared server could be problematic.";
} else {
$testDetails[2] = "You need PHP version $requiredVersion or later, only $a.$b.$c is installed. Please upgrade your server, or ask your web-host to do so.";
}
}
$this->error($testDetails);
}
function requireFile($filename, $testDetails) {
$this->testing($testDetails);
$filename = $this->getBaseDir() . $filename;
if(!file_exists($filename)) {
$testDetails[2] .= " (file '$filename' not found)";
$this->error($testDetails);
}
}
function requireNoFile($filename, $testDetails) {
$this->testing($testDetails);
$filename = $this->getBaseDir() . $filename;
if(file_exists($filename)) {
$testDetails[2] .= " (file '$filename' found)";
$this->error($testDetails);
}
}
function moveFileOutOfTheWay($filename, $testDetails) {
$this->testing($testDetails);
$filename = $this->getBaseDir() . $filename;
if(file_exists($filename)) {
if(file_exists("$filename.bak")) rm("$filename.bak");
rename($filename, "$filename.bak");
}
}
function requireWriteable($filename, $testDetails) {
$this->testing($testDetails);
$filename = $this->getBaseDir() . $filename;
if(function_exists('posix_getgroups')) {
if(!is_writeable($filename)) {
$user = posix_getpwuid(posix_geteuid());
$groups = posix_getgroups();
foreach($groups as $group) {
$groupInfo = posix_getgrgid($group);
$groupList[] = $groupInfo['name'];
}
$groupList = "'" . implode("', '", $groupList) . "'";
$testDetails[2] .= "User '$user[name]' needs to write be able to write to this file:\n$filename";
$this->error($testDetails);
}
} else {
$testDetails[2] .= "Unable to detect whether I can write to files. Please ensure $filename is writable.";
$this->warning($testDetails);
}
}
function requireTempFolder($testDetails) {
$this->testing($testDetails);
if(function_exists('sys_get_temp_dir')) {
$sysTmp = sys_get_temp_dir();
} elseif(isset($_ENV['TMP'])) {
$sysTmp = $_ENV['TMP'];
} else {
$tmpFile = tempnam('adfadsfdas','');
unlink($tmpFile);
$sysTmp = dirname($tmpFile);
}
$worked = true;
$ssTmp = "$sysTmp/silverstripe-cache";
if(!@file_exists($ssTmp)) {
@$worked = mkdir($ssTmp);
if(!$worked) {
$ssTmp = dirname($_SERVER['SCRIPT_FILENAME']) . "/silverstripe-cache";
$worked = true;
if(!@file_exists($ssTmp)) {
@$worked = mkdir($ssTmp);
}
if(!$worked) {
$testDetails[2] = "Permission problem gaining access to a temp folder. " .
"Please create a folder named silverstripe-cache in the base folder " .
"of the installation and ensure it has the adequate permissions";
$this->error($testDetails);
}
}
}
}
function requireApacheModule($moduleName, $testDetails) {
$this->testing($testDetails);
if(!in_array($moduleName, apache_get_modules())) $this->error($testDetails);
}
function requireMysqlConnection($server, $username, $password, $testDetails) {
$this->testing($testDetails);
$conn = @mysql_connect($server, $username, $password);
if($conn) {
return true;
/*
if(mysql_query("CREATE DATABASE testing123")) {
mysql_query("DROP DATABASE testing123");
return true;
} else {
$testDetails[2] .= " (user '$username' doesn't have CREATE DATABASE permissions.)";
$this->error($testDetails);
}
*/
} else {
$testDetails[2] .= ": " . mysql_error();
$this->error($testDetails);
}
}
function requireMySQLServer($server, $testDetails) {
$this->testing($testDetails);
$conn = @mysql_connect($server, null, null);
if($conn || mysql_errno() < 2000) {
return true;
} else {
$testDetails[2] .= ": " . mysql_error();
$this->error($testDetails);
}
}
function requireMySQLVersion($version, $testDetails) {
$this->testing($testDetails);
if(!mysql_get_server_info()) {
$testDetails[2] = 'Cannot determine the version of MySQL installed. Please ensure at least version 4.1 is installed.';
$this->warning($testDetails);
} else {
list($majorRequested, $minorRequested) = explode('.', $version);
list($majorHas, $minorHas) = explode('.', mysql_get_server_info());
if(($majorHas > $majorRequested) || ($majorHas == $majorRequested && $minorHas >= $minorRequested)) {
return true;
} else {
$testDetails[2] .= "{$majorHas}.{$minorHas}.";
$this->error($testDetails);
}
}
}
function requireDatabaseOrCreatePermissions($server, $username, $password, $database, $testDetails) {
$this->testing($testDetails);
$conn = @mysql_connect($server, $username, $password);
if(@mysql_select_db($database)) {
$okay = "Database '$database' exists";
} else {
if(@mysql_query("CREATE DATABASE testing123")) {
mysql_query("DROP DATABASE testing123");
$okay = "Able to create a new database";
} else {
$testDetails[2] .= " (user '$username' doesn't have CREATE DATABASE permissions.)";
$this->error($testDetails);
return;
}
}
if($okay) {
$testDetails[3] = $okay;
$this->testing($testDetails);
}
}
function requireServerVariables($varNames, $errorMessage) {
//$this->testing($testDetails);
foreach($varNames as $varName) {
if(!$_SERVER[$varName]) $missing[] = '$_SERVER[' . $varName . ']';
}
if(!isset($missing)) {
return true;
} else {
$testDetails[2] .= " (the following PHP variables are missing: " . implode(", ", $missing) . ")";
$this->error($testDetails);
}
}
function isRunningApache($testDetails) {
$this->testing($testDetails);
if(function_exists('apache_get_modules') || stristr($_SERVER['SERVER_SIGNATURE'], 'Apache'))
return true;
$this->warning($testDetails);
return false;
}
function getBaseDir() {
return dirname($_SERVER['SCRIPT_FILENAME']) . '/';
}
function testing($testDetails) {
if(!$testDetails) return;
$section = $testDetails[0];
$test = $testDetails[1];
$message = "OK";
if(isset($testDetails[3])) $message .= " ($testDetails[3])";
$this->tests[$section][$test] = array("good", $message);
}
function error($testDetails) {
$section = $testDetails[0];
$test = $testDetails[1];
$this->tests[$section][$test] = array("error", $testDetails[2]);
$this->errors[] = $testDetails;
}
function warning($testDetails) {
$section = $testDetails[0];
$test = $testDetails[1];
$this->tests[$section][$test] = array("warning", $testDetails[2]);
$this->warnings[] = $testDetails;
}
function hasErrors() {
return sizeof($this->errors);
}
function hasWarnings() {
return sizeof($this->warnings);
}
}
class Installer extends InstallRequirements {
function install($config) {
session_start();
?>
<h1>Installing SilverStripe...</h1>
<p>I am now running through the installation steps (this should take about 30 seconds)</p>
<p>If you receive a fatal error, refresh this page to continue the installation
<?
flush();
// Delete old _config.php files
if(file_exists('tutorial/_config.php')) {
unlink('tutorial/_config.php');
}
if(file_exists('mysite/_config.php')) {
unlink('mysite/_config.php');
}
// Write the config file
$template = $_POST['template'] == 'tutorial' ? 'tutorial' : 'mysite';
$theme = '';
if($_POST['template'] == 'default') {
$theme = <<<PHP
// This line set's the current theme. More themes can be
// downloaded from http://www.silverstripe.com/cms-themes-and-skin
SSViewer::set_theme('blackcandy');
PHP;
}
echo "<li>Creating '$template/_config.php'...</li>";
flush();
$devServers = $this->var_export_array_nokeys(explode("\n", $_POST['devsites']));
$this->createFile("$template/_config.php", <<<PHP
<?
error_reporting(E_ALL ^ E_NOTICE);
global \$project;
\$project = '$template';
global \$databaseConfig;
\$databaseConfig = array(
"type" => "$config[database]",
"server" => "{$config['mysql']['server']}",
"username" => "{$config['mysql']['username']}",
"password" => "{$config['mysql']['password']}",
"database" => "{$config['mysql']['database']}",
);
// Sites running on the following servers will be
// run in development mode. See
// http://doc.silverstripe.com/doku.php?id=devmode
// for a description of what dev mode does.
Director::set_dev_servers($devServers);
$theme
?>
PHP
);
echo "<li>Creating '.htaccess' file...</li>";
flush();
$this->createHtaccess();
// Load the sapphire runtime
$_SERVER['SCRIPT_FILENAME'] = dirname($_SERVER['SCRIPT_FILENAME']) . '/sapphire/main.php';
chdir('sapphire');
require_once('core/Core.php');
require_once('core/ManifestBuilder.php');
require_once('core/ClassInfo.php');
require_once('core/Object.php');
require_once('core/control/Director.php');
require_once('core/ViewableData.php');
require_once('core/Session.php');
require_once('core/control/Controller.php');
require_once('filesystem/Filesystem.php');
echo "<li>Building database schema...</li>";
flush();
// Build database
$_GET['flush'] = true;
$con = new Controller();
$con->pushCurrent();
ManifestBuilder::compileManifest();
$dbAdmin = new DatabaseAdmin();
$dbAdmin->init();
$dbAdmin->doBuild(true);
$adminmember = DataObject::get_one('Member',"`Email`= '".$_REQUEST['username']."'");
if($adminmember){
if($adminmember->_isAdmin()){
$adminmember->FirstName = $_REQUEST['firstname'];
$adminmember->Surname = $_REQUEST['surname'];
$adminmember->write();
}
}
echo "<li>Checking mod_rewrite works</li>";
$_SESSION['username'] = $_REQUEST['username'];
$_SESSION['password'] = $_REQUEST['password'];
if($this->checkModRewrite()) {
if($this->errors) {
} else {
echo "<p>Installed SilverStripe successfully. I will now try and direct you to
<a href=\"home/successfullyinstalled?flush=1\">home/successfullyinstalled</a> to confirm that the installation was successful.</p>
<script>setTimeout(function() { window.location.href = 'home/successfullyinstalled?flush=1'; }, 1000);</script>
";
}
}
return $this->errors;
}
function makeFolder($folder) {
$base = $this->getBaseDir();
if(!file_exists($base . $folder)) {
if(!mkdir($base . $folder, 02775)) {
$this->error("Couldn't create a folder called $base$folder");
} else {
chmod($base . $folder, 02775);
}
}
}
function renameFolder($oldName, $newName) {
if($oldName == $newName) return true;
$base = $this->getBaseDir();
if(!rename($base . $oldName, $base . $newName)) {
$this->error("Couldn't rename $base$oldName to $base$newName");
return false;
} else {
return true;
}
}
function copyFolder($oldName, $newName) {
if($oldName == $newName) return true;
$base = $this->getBaseDir();
if(!copyr($base . $oldName, $base . $newName)) {
$this->error("Couldn't rename $base$oldName to $base$newName");
return false;
} else {
return true;
}
}
function createFile($filename, $content) {
$base = $this->getBaseDir();
if(($fh = fopen($base . $filename, 'w')) && fwrite($fh, $content) && fclose($fh)) {
return true;
} else {
$this->error("Couldn't write to file $base$filename");
}
}
function createHtaccess() {
$start = "### SILVERSTRIPE START ###\n";
$end= "\n### SILVERSTRIPE END ###";
$rewrite = <<<TEXT
RewriteEngine On
RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$
RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L]
TEXT
;
$baseURL = dirname($_SERVER['SCRIPT_NAME']);
if($baseURL == "/") {
$baseURL = "";
}
if(file_exists('.htaccess')) {
$htaccess = file_get_contents('.htaccess');
if(strpos($htaccess, '### SILVERSTRIPE START ###') === false && strpos($htaccess, '### SILVERSTRIPE END ###') === false) {
$htaccess .= "\n### SILVERSTRIPE START ###\n### SILVERSTRIPE END ###\n";
}
if(strpos($htaccess, '### SILVERSTRIPE START ###') !== false && strpos($htaccess, '### SILVERSTRIPE END ###') !== false) {
$start = substr($htaccess, 0, strpos($htaccess, '### SILVERSTRIPE START ###')) . "### SILVERSTRIPE START ###\n";
$end = "\n" . substr($htaccess, strpos($htaccess, '### SILVERSTRIPE END ###'));
}
}
$this->createFile('.htaccess', $start . $rewrite . $end);
}
function createHtaccessAlternative() {
$start = "### SILVERSTRIPE START ###\n";
$end= "\n### SILVERSTRIPE END ###";
$rewrite = <<<TEXT
RewriteEngine On
RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$
RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule .* $_SERVER[DOCUMENT_ROOT]/sapphire/main.php?url=%1&%{QUERY_STRING} [L]
TEXT
;
$baseURL = dirname($_SERVER['SCRIPT_NAME']);
if($baseURL == "/") {
$baseURL = "";
}
if(file_exists('.htaccess')) {
$htaccess = file_get_contents('.htaccess');
if(strpos($htaccess, '### SILVERSTRIPE START ###') === false && strpos($htaccess, '### SILVERSTRIPE END ###') === false) {
$htaccess .= "\n### SILVERSTRIPE START ###\n### SILVERSTRIPE END ###\n";
}
if(strpos($htaccess, '### SILVERSTRIPE START ###') !== false && strpos($htaccess, '### SILVERSTRIPE END ###') !== false) {
$start = substr($htaccess, 0, strpos($htaccess, '### SILVERSTRIPE START ###')) . "### SILVERSTRIPE START ###\n";
$end = "\n" . substr($htaccess, strpos($htaccess, '### SILVERSTRIPE END ###'));
}
}
$this->createFile('.htaccess', $start . $rewrite . $end);
}
function restoreHtaccess() {
$start = "### SILVERSTRIPE START ###\n";
$end= "\n### SILVERSTRIPE END ###";
if(file_exists('.htaccess')) {
$htaccess = file_get_contents('.htaccess');
if(strpos($htaccess, '### SILVERSTRIPE START ###') === false && strpos($htaccess, '### SILVERSTRIPE END ###') === false) {
$htaccess .= "\n### SILVERSTRIPE START ###\n### SILVERSTRIPE END ###\n";
}
if(strpos($htaccess, '### SILVERSTRIPE START ###') !== false && strpos($htaccess, '### SILVERSTRIPE END ###') !== false) {
$start = substr($htaccess, 0, strpos($htaccess, '### SILVERSTRIPE START ###')) . "### SILVERSTRIPE START ###\n";
$end = "\n" . substr($htaccess, strpos($htaccess, '### SILVERSTRIPE END ###'));
}
}
$this->createFile('.htaccess', $start . $end);
}
function checkModRewrite() {
if($this->performModRewriteTest() == true) {
return true;
}
$this->createHtaccessAlternative();
if($this->performModRewriteTest() == false) {
echo "<li>ERROR: mod_rewrite not working, redirecting to mod_rewrite test page</li>";
$this->restoreHtaccess();
echo "I will now try and direct you to <a href=\"rewritetest.php\">rewritetest</a> to troubleshoot mod_rewrite</p>
<script>setTimeout(function() { window.location.href = 'rewritetest.php'; }, 1000);</script>
";
return false;
}
return true;
}
function performModRewriteTest() {
$baseURL = dirname($_SERVER['SCRIPT_NAME']);
if($baseURL == "/") {
$baseURL = "";
}
// Check if mod_rewrite works properly
$location = 'http://' . (isset($_SERVER['PHP_AUTH_USER']) ? "$_SERVER[PHP_AUTH_USER]:$_SERVER[PHP_AUTH_PW]@" : '') . $_SERVER['HTTP_HOST'] . $baseURL . '/InstallerTest/testRewrite';
@$testrewriting = file_get_contents($location);
if($testrewriting == 'OK') {
return true;
}
// Workaround for 'URL file-access is disabled in the server configuration' using curl
if(function_exists('curl_init')) {
$ch = curl_init($location);
$fp = @fopen(dirname(tempnam('adfadsfdas','')) . '/rewritetest', "w");
curl_setopt($ch, CURLOPT_FILE, $fp);
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_exec($ch);
curl_close($ch);
fclose($fp);
$testrewriting = file_get_contents(dirname(tempnam('adfadsfdas','')) . '/rewritetest');
unlink(dirname(tempnam('adfadsfdas','')) . '/rewritetest');
if($testrewriting == 'OK') {
return true;
}
}
return false;
}
function var_export_array_nokeys($array) {
$retval = "array(\n";
foreach($array as $item) {
$retval .= "\t'";
$retval .= trim($item);
$retval .= "',\n";
}
$retval .= ")";
return $retval;
}
}
/**
* Copy a file, or recursively copy a folder and its contents
*
* @author Aidan Lister <aidan@php.net>
* @version 1.0.1
* @link http://aidanlister.com/repos/v/function.copyr.php
* @param string $source Source path
* @param string $dest Destination path
* @return bool Returns TRUE on success, FALSE on failure
*/
function copyr($source, $dest)
{
// Simple copy for a file
if (is_file($source)) {
return copy($source, $dest);
}
// Make destination directory
if (!is_dir($dest)) {
mkdir($dest);
}
// Loop through the folder
$dir = dir($source);
while (false !== $entry = $dir->read()) {
// Skip pointers
if ($entry == '.' || $entry == '..') {
continue;
}
// Deep copy directories
if ($dest !== "$source/$entry") {
copyr("$source/$entry", "$dest/$entry");
}
}
// Clean up
$dir->close();
return true;
}
function rm($fileglob)
{
if (is_string($fileglob)) {
if (is_file($fileglob)) {
return unlink($fileglob);
} else if (is_dir($fileglob)) {
$ok = rm("$fileglob/*");
if (! $ok) {
return false;
}
return rmdir($fileglob);
} else {
$matching = glob($fileglob);
if ($matching === false) {
trigger_error(sprintf('No files match supplied glob %s', $fileglob), E_USER_WARNING);
return false;
}
$rcs = array_map('rm', $matching);
if (in_array(false, $rcs)) {
return false;
}
}
} else if (is_array($fileglob)) {
$rcs = array_map('rm', $fileglob);
if (in_array(false, $rcs)) {
return false;
}
} else {
trigger_error('Param #1 must be filename or glob pattern, or array of filenames or glob patterns', E_USER_ERROR);
return false;
}
return true;
}
?>

View File

@ -1,14 +0,0 @@
<?
class Page extends SiteTree {
static $db = array(
);
static $has_one = array(
);
}
class Page_Controller extends ContentController {
}
?>

26
phpcs.xml.dist Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<ruleset name="SS3">
<description>Coding standard for SilverStripe 4.x</description>
<file>app</file>
<!-- Don't sniff third party libraries -->
<exclude-pattern>*/vendor/*</exclude-pattern>
<exclude-pattern>*/thirdparty/*</exclude-pattern>
<!-- Show progress and output sniff names on violation, and add colours -->
<arg value="sp"/>
<arg name="colors"/>
<!-- Use PSR-2 as a base standard -->
<rule ref="PSR2">
<!-- Allow classes to not declare a namespace -->
<exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
<!-- Allow underscores in class names -->
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
<!-- Allow non camel cased method names -->
<exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
</rule>
</ruleset>

59
phpunit.xml.dist Normal file
View File

@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
PHPUnit configuration for SilverStripe
Requires PHPUnit 9+
Usage:
- "vendor/bin/phpunit": Runs all tests in all folders
- "vendor/bin/phpunit vendor/silverstripe/framework/tests/": Run all tests of the framework module
- "vendor/bin/phpunit vendor/silverstripe/framework/tests/filesystem": Run all filesystem tests within framework
- "vendor/bin/phpunit vendor/silverstripe/framework/tests/filesystem/FolderTest.php": Run a single test
- "vendor/bin/phpunit <dash><dash>coverage-html assets/": Generate coverage report (replace
<dash> with "-", requires xdebug or phpdbg)
More information:
- http://www.phpunit.de/manual/current/en/textui.html
- http://doc.silverstripe.org/framework/en/topics/testing/#configuration
It is safe to remove this file for normal website operation.
-->
<phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
<testsuites>
<testsuite name="Default">
<directory>app/tests</directory>
<directory>vendor/silverstripe/cms/tests/php</directory>
<directory>vendor/silverstripe/framework/tests/php</directory>
</testsuite>
<!-- Framework ORM tests are split up to run in parallel -->
<testsuite name="framework-core">
<directory>vendor/silverstripe/framework/tests/php</directory>
<exclude>vendor/silverstripe/framework/tests/php/ORM</exclude>
</testsuite>
<testsuite name="framework-orm">
<directory>vendor/silverstripe/framework/tests/php/ORM</directory>
</testsuite>
<!-- other core components -->
<testsuite name="core">
<directory>vendor/silverstripe/assets/tests/php/</directory>
<directory>vendor/silverstripe/versioned/tests/php/</directory>
</testsuite>
<!-- admin components -->
<testsuite name="admin">
<directory>vendor/silverstripe/admin/tests/php/</directory>
<directory>vendor/silverstripe/asset-admin/tests/php/</directory>
<directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
<directory>vendor/silverstripe/cms/tests/</directory>
<directory>vendor/silverstripe/config/tests/</directory>
<directory>vendor/silverstripe/errorpage/tests/</directory>
<directory>vendor/silverstripe/graphql/tests/</directory>
<directory>vendor/silverstripe/login-forms/tests/php/</directory>
<directory>vendor/silverstripe/mimevalidator/tests/</directory>
<directory>vendor/silverstripe/reports/tests/</directory>
<directory>vendor/silverstripe/siteconfig/tests/php/</directory>
</testsuite>
</testsuites>
</phpunit>

0
public/_graphql/.gitkeep Normal file
View File

4
public/assets/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
/**/*
!.gitignore
!.htaccess
!web.config

35
public/assets/.htaccess Normal file
View File

@ -0,0 +1,35 @@
#
# Whitelist appropriate assets files.
# This file is automatically generated via File.allowed_extensions configuration
# See AssetAdapter::renderTemplate() for reference.
#
# We disable PHP via several methods
# Replace the handler with the default plaintext handler
AddHandler default-handler php phtml php3 php4 php5 inc
<IfModule mod_php5.c>
# Turn the PHP engine off
php_flag engine off
</IfModule>
<IfModule mod_rewrite.c>
<IfModule mod_env.c>
SetEnv HTTP_MOD_REWRITE On
</IfModule>
RewriteEngine On
# Allow error pages
RewriteCond %{REQUEST_FILENAME} -f
RewriteRule error[^\\/]*\.html$ - [L]
# Block invalid file extensions
RewriteCond %{REQUEST_URI} !^[^.]*\.(?i:css|js|ace|arc|arj|asf|au|avi|bmp|bz2|cab|cda|csv|dmg|doc|docx|dotx|flv|gif|gpx|gz|hqx|ico|jpeg|jpg|kml|m4a|m4v|mid|midi|mkv|mov|mp3|mp4|mpa|mpeg|mpg|ogg|ogv|pages|pcx|pdf|png|pps|ppt|pptx|potx|ra|ram|rm|rtf|sit|sitx|tar|tgz|tif|tiff|txt|wav|webm|wma|wmv|xls|xlsx|xltx|zip|zipx)$
RewriteRule .* - [F]
# Non-existent files passed to requesthandler
RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule .* ../index.php [QSA]
</IfModule>

101
public/assets/web.config Normal file
View File

@ -0,0 +1,101 @@
<!--
Configuration to whitelist appropriate asset files, for IIS.
Note that you will need to maintain this whitelist yourself if you modify File::$allowed_extensions
If you are not using IIS then you can ignore this file.
If you are using Apache then you should look at assets/.htaccess instead.
To add an extension to to the list, you will need to add another <add> entry inside the <fileExtensions>
tag.
For example, to add *.exe files to the list of downloadable assets, add this line below the
<fileExtensions line>:
<add fileExtension=".exe" allowed="true" />
Once you do this, visitors will be able to download *.exe files that are uploaded to the assets
directory.
-->
<configuration>
<system.webServer>
<security>
<requestFiltering>
<fileExtensions allowUnlisted="false" applyToWebDAV="true">
<add fileExtension=".html" allowed="true" />
<add fileExtension=".htm" allowed="true" />
<add fileExtension=".xhtml" allowed="true" />
<add fileExtension=".js" allowed="true" />
<add fileExtension=".css" allowed="true" />
<add fileExtension=".bmp" allowed="true" />
<add fileExtension=".png" allowed="true" />
<add fileExtension=".gif" allowed="true" />
<add fileExtension=".jpg" allowed="true" />
<add fileExtension=".jpeg" allowed="true" />
<add fileExtension=".ico" allowed="true" />
<add fileExtension=".pcx" allowed="true" />
<add fileExtension=".tif" allowed="true" />
<add fileExtension=".tiff" allowed="true" />
<add fileExtension=".au" allowed="true" />
<add fileExtension=".mid" allowed="true" />
<add fileExtension=".midi" allowed="true" />
<add fileExtension=".mpa" allowed="true" />
<add fileExtension=".mp3" allowed="true" />
<add fileExtension=".ogg" allowed="true" />
<add fileExtension=".m4a" allowed="true" />
<add fileExtension=".ra" allowed="true" />
<add fileExtension=".wma" allowed="true" />
<add fileExtension=".wav" allowed="true" />
<add fileExtension=".cda" allowed="true" />
<add fileExtension=".avi" allowed="true" />
<add fileExtension=".mpg" allowed="true" />
<add fileExtension=".mpeg" allowed="true" />
<add fileExtension=".asf" allowed="true" />
<add fileExtension=".wmv" allowed="true" />
<add fileExtension=".m4v" allowed="true" />
<add fileExtension=".mov" allowed="true" />
<add fileExtension=".mkv" allowed="true" />
<add fileExtension=".mp4" allowed="true" />
<add fileExtension=".ogv" allowed="true" />
<add fileExtension=".webm" allowed="true" />
<add fileExtension=".swf" allowed="true" />
<add fileExtension=".flv" allowed="true" />
<add fileExtension=".ram" allowed="true" />
<add fileExtension=".rm" allowed="true" />
<add fileExtension=".doc" allowed="true" />
<add fileExtension=".docx" allowed="true" />
<add fileExtension=".txt" allowed="true" />
<add fileExtension=".rtf" allowed="true" />
<add fileExtension=".xls" allowed="true" />
<add fileExtension=".xlsx" allowed="true" />
<add fileExtension=".pages" allowed="true" />
<add fileExtension=".ppt" allowed="true" />
<add fileExtension=".pptx" allowed="true" />
<add fileExtension=".pps" allowed="true" />
<add fileExtension=".csv" allowed="true" />
<add fileExtension=".cab" allowed="true" />
<add fileExtension=".arj" allowed="true" />
<add fileExtension=".tar" allowed="true" />
<add fileExtension=".zip" allowed="true" />
<add fileExtension=".zipx" allowed="true" />
<add fileExtension=".sit" allowed="true" />
<add fileExtension=".sitx" allowed="true" />
<add fileExtension=".gz" allowed="true" />
<add fileExtension=".tgz" allowed="true" />
<add fileExtension=".bz2" allowed="true" />
<add fileExtension=".ace" allowed="true" />
<add fileExtension=".arc" allowed="true" />
<add fileExtension=".pkg" allowed="true" />
<add fileExtension=".dmg" allowed="true" />
<add fileExtension=".hqx" allowed="true" />
<add fileExtension=".jar" allowed="true" />
<add fileExtension=".xml" allowed="true" />
<add fileExtension=".pdf" allowed="true" />
<add fileExtension=".gpx" allowed="true" />
<add fileExtension=".kml" allowed="true" />
</fileExtensions>
</requestFiltering>
</security>
</system.webServer>
</configuration>

BIN
public/favicon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -1,170 +0,0 @@
<?php
createHtaccess();
$baseURL = dirname($_SERVER['SCRIPT_NAME']);
if($baseURL == "/") {
$baseURL = "";
}
if(isset($_REQUEST['force'])) {
echo "Forced continue, attempting to redirect to <a href=\"home/successfullyinstalled\">home/successfullyinstalled</a>.
<script>setTimeout(function() { window.location.href = 'home/successfullyinstalled'; }, 1000);</script>";
} else {
$modRewriteWorking = performModRewriteTest();
if(!$modRewriteWorking) {
createHtaccessAlternative();
$modRewriteWorking = performModRewriteTest();
}
if($modRewriteWorking) {
echo "mod_rewrite is working! I will now try and direct you to
<a href=\"home/successfullyinstalled\">home/successfullyinstalled</a> to confirm that the installation was successful.
<script>setTimeout(function() { window.location.href = 'home/successfullyinstalled'; }, 1000);</script>
";
} else {
restoreHtaccess();
echo "mod_rewrite doesn't appear to be working. Make sure:" .
"<ul>" .
"<li>mod_rewrite is enabled in your httpd.conf</li>" .
"<li>AllowOverride is enabled for the current path.</li>" .
"</ul>" .
"Please check these options, then refresh this page." .
"If you believe that your configuration is correct, <a href=\"rewritetest.php?force=1\">click here to proceed anyway.</a>";
}
}
function performModRewriteTest() {
$baseURL = dirname($_SERVER['SCRIPT_NAME']);
if($baseURL == "/") {
$baseURL = "";
}
// Check if mod_rewrite works properly
$location = 'http://' . (isset($_SERVER['PHP_AUTH_USER']) ? "$_SERVER[PHP_AUTH_USER]:$_SERVER[PHP_AUTH_PW]@" : '') . $_SERVER['HTTP_HOST'] . $baseURL . '/InstallerTest/testRewrite';
@$testrewriting = file_get_contents($location);
if($testrewriting == 'OK') {
return true;
}
// Workaround for 'URL file-access is disabled in the server configuration' using curl
if(function_exists('curl_init')) {
$ch = curl_init($location);
$fp = @fopen(dirname(tempnam('adfadsfdas','')) . '/rewritetest', "w");
curl_setopt($ch, CURLOPT_FILE, $fp);
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_exec($ch);
curl_close($ch);
fclose($fp);
$testrewriting = file_get_contents(dirname(tempnam('adfadsfdas','')) . '/rewritetest');
unlink(dirname(tempnam('adfadsfdas','')) . '/rewritetest');
if($testrewriting == 'OK') {
return true;
}
}
return false;
}
function createHtaccess() {
$start = "### SILVERSTRIPE START ###\n";
$end= "\n### SILVERSTRIPE END ###";
$rewrite = <<<TEXT
RewriteEngine On
RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$
RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule .* sapphire/main.php?url=%1&%{QUERY_STRING} [L]
TEXT
;
$baseURL = dirname($_SERVER['SCRIPT_NAME']);
if($baseURL == "/") {
$baseURL = "";
}
if(file_exists('.htaccess')) {
$htaccess = file_get_contents('.htaccess');
if(strpos($htaccess, '### SILVERSTRIPE START ###') === false && strpos($htaccess, '### SILVERSTRIPE END ###') === false) {
$htaccess .= "\n### SILVERSTRIPE START ###\n### SILVERSTRIPE END ###\n";
}
if(strpos($htaccess, '### SILVERSTRIPE START ###') !== false && strpos($htaccess, '### SILVERSTRIPE END ###') !== false) {
$start = substr($htaccess, 0, strpos($htaccess, '### SILVERSTRIPE START ###')) . "### SILVERSTRIPE START ###\n";
$end = "\n" . substr($htaccess, strpos($htaccess, '### SILVERSTRIPE END ###'));
}
}
createFile('.htaccess', $start . $rewrite . $end);
}
function createHtaccessAlternative() {
$start = "### SILVERSTRIPE START ###\n";
$end= "\n### SILVERSTRIPE END ###";
$rewrite = <<<TEXT
RewriteEngine On
RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$
RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule .* $_SERVER[DOCUMENT_ROOT]/sapphire/main.php?url=%1&%{QUERY_STRING} [L]
TEXT
;
$baseURL = dirname($_SERVER['SCRIPT_NAME']);
if($baseURL == "/") {
$baseURL = "";
}
if(file_exists('.htaccess')) {
$htaccess = file_get_contents('.htaccess');
if(strpos($htaccess, '### SILVERSTRIPE START ###') === false && strpos($htaccess, '### SILVERSTRIPE END ###') === false) {
$htaccess .= "\n### SILVERSTRIPE START ###\n### SILVERSTRIPE END ###\n";
}
if(strpos($htaccess, '### SILVERSTRIPE START ###') !== false && strpos($htaccess, '### SILVERSTRIPE END ###') !== false) {
$start = substr($htaccess, 0, strpos($htaccess, '### SILVERSTRIPE START ###')) . "### SILVERSTRIPE START ###\n";
$end = "\n" . substr($htaccess, strpos($htaccess, '### SILVERSTRIPE END ###'));
}
}
createFile('.htaccess', $start . $rewrite . $end);
}
function restoreHtaccess() {
$start = "### SILVERSTRIPE START ###\n";
$end= "\n### SILVERSTRIPE END ###";
if(file_exists('.htaccess')) {
$htaccess = file_get_contents('.htaccess');
if(strpos($htaccess, '### SILVERSTRIPE START ###') === false && strpos($htaccess, '### SILVERSTRIPE END ###') === false) {
$htaccess .= "\n### SILVERSTRIPE START ###\n### SILVERSTRIPE END ###\n";
}
if(strpos($htaccess, '### SILVERSTRIPE START ###') !== false && strpos($htaccess, '### SILVERSTRIPE END ###') !== false) {
$start = substr($htaccess, 0, strpos($htaccess, '### SILVERSTRIPE START ###')) . "### SILVERSTRIPE START ###\n";
$end = "\n" . substr($htaccess, strpos($htaccess, '### SILVERSTRIPE END ###'));
}
}
createFile('.htaccess', $start . $end);
}
function getBaseDir() {
return dirname($_SERVER['SCRIPT_FILENAME']) . '/';
}
function createFile($filename, $content) {
$base = getBaseDir();
if(($fh = fopen($base . $filename, 'w')) && fwrite($fh, $content) && fclose($fh))
return true;
}
?>

View File

@ -1,17 +0,0 @@
<?
class Page extends SiteTree {
static $db = array(
);
static $defaults = array(
);
}
class Page_Controller extends ContentController {
}
?>

View File

@ -1,14 +0,0 @@
/**
* This support file is used to style the WYSIWYG editor in the CMS
*/
@import "typography.css";
body.mceContentBody {
min-height: 200px;
font-size: 62.5%;
}
body.mceContentBody a.broken {
background-color: #FF7B71;
border: 1px red solid;
}

View File

@ -1,64 +0,0 @@
/* GENERIC FORM STYLING */
#Content form {
width:378px;
}
#Content form fieldset {
border:0;
padding:12px;
}
#Content .message {
color:red;
background:#ddd;
border:1px solid #ccc;
padding:5px;
margin:5px;
}
#Content span.message {
width: 300px;
}
#Content form div {
margin-top:10px;
width:100%;
}
#Content form label {
font-size:1.1em;
color:#333;
}
#Content form label.left {
float:left;
width:12em;
}
#Content form label.FormHeading {
font-size:1.3em;
color:#ff7200;
font-weight:bold;
}
#Content form input.text,
#Content form textarea,
#Content form select {
width:200px;
color:#000;
background:#f8f8f8;
border:1px solid #aaa;
padding:3px;
}
#Content form input.numeric {
width:20px;
background:#f0f0f0;
border:1px solid #aaa;
padding:3px;
color:#000;
margin-right:4px;
}
#Content form input.year {
width:35px;
}
#Content form p.Actions {
text-align:right;
padding:0 22px 15px 0;
}
#Content form p.Actions input {
padding:2px;
}

View File

@ -1,287 +0,0 @@
/* Global Resetting */
html{
width: 100%;
height: 100%;
background:url(../images/body_bg.gif) repeat;
}
body {
width: 100%;
height: 100%;
font-size: 62.5%;
/* reset font-sizes to 1em == 10px */
}
* {
font-size: 1em;
/* reset font-sizes to 1em == 10px */
padding: 0;
margin: 0;
font-family:Verdana,Helvetica,sans-serif;
list-style:none;
}
a img{
border:0;
}
.clear{
clear:both;
}
/* Layout CSS */
#Main {
margin:20px auto;
width:900px;
}
#Header {
background:url(../images/blueback.gif) bottom left repeat-x;
border-left:1px solid #ccc;
border-right:1px solid #ccc;
clear:left;
}
#Header h1 {
color:#fff;
font-size:1.5em;
line-height:4.5em;
padding-left:20px;
}
#Menu1 {
padding:10px 50px 0;
}
#Menu1 li {
float:left;
margin-left:2px;
background:url(../images/menu1_right.gif) no-repeat right top;
}
#Menu1 li.current,
#Menu1 li.section {
background:url(../images/menu1_right_on.gif) no-repeat right top;
}
#Menu1 li a {
display:block;
color:#fff;
font-weight:bold;
font-size:1.1em;
text-decoration:none;
padding:5px 15px;
background:url(../images/menu1_left.gif) no-repeat left top;
}
#Menu1 li a:hover {
color:#d2ebff;
}
#Menu1 li.current a,
#Menu1 li.section a {
background:url(../images/menu1_left_on.gif) no-repeat left top;
color:#d2ebff;
}
#ContentContainer {
background:#f5f5f5 url(../images/ss_watermark.gif) bottom left no-repeat;
padding-top:20px;
padding-bottom:20px;
overflow: auto;
}
#Banner {
text-align: center;
}
#Menu2 {
margin-left: 20px;
width: 17em;
float:left;
background:#f0f0f0;
border:1px solid #ddd;
padding:10px 10px 10px 10px;
}
#Menu2 li {
padding-left:15px;
background:url(../images/menu2_arrow.gif) no-repeat left center;
}
#Menu2 a {
color:#333;
font-weight:bold;
font-size:1.1em;
line-height:1.6em;
text-decoration:none;
}
#Menu2 a:hover {
text-decoration:underline;
}
#Menu2 li.current a,
#Menu2 li.section a {
color:#0083C8;
}
#Content {
float: left;
margin: 0px 20px;
width:70%;
}
div.breadcrumbs {
margin-bottom:10px;
font-size:1em;
color:#666;
}
div.breadcrumbs a {
text-decoration:none;
}
#Footer {
background:#015581;
clear:both;
text-align:right;
padding-right:20px;
border:1px solid #ccc;
border-top:0;
}
#Footer span {
color:#ccc;
font-size:1.1em;
line-height:2em;
font-weight:bold;
padding-left:20px;
background:url(../images/ss_logo.gif) no-repeat;
}
#Footer a {
color:#fff;
}
#Footer a:hover {
text-decoration:none;
}
/* The rest of this file is for the second tutorial */
#NewsList,
#StaffList {
background:#f0f0f0;
border:1px dotted #ccc;
padding:10px;
}
#NewsList li,
#StaffList li {
margin: 0;
list-style-type: none;
}
#NewsList li.newsDateTitle span {
color:#666;
line-height:2em;
}
#NewsList li.newsDateTitle a {
font-size:1.3em;
font-weight:bold;
color:#0083C8;
text-decoration:none;
padding-left:20px;
background:url(../images/treeicons/news-file.gif) no-repeat left center;
}
#NewsList li.newsDateTitle a:hover {
border-bottom:1px dotted #0083C8;
}
#NewsList li.newsSummary {
margin-bottom:20px;
}
#NewsList li.newsSummary span {
font-size:1.1em;
line-height:1.5em;
color:#333;
}
#NewsList li.newsSummary a.readMoreLink {
color:#0083C8;
text-decoration:none;
}
#NewsList li.newsSummary a.readMoreLink:hover {
border-bottom:1px dotted #0083C8;
}
div.newsDetails {
margin-bottom:10px;
}
div.newsDetails p {
color:#666;
margin:0;
font-size:1em;
}
div.pageComments {
background:#f0f0f0;
border:1px dotted #ccc;
padding:10px;
}
#StaffList .staffname {
clear: both;
padding-left: 60px;
height: 1.2em;
}
#StaffList .staffphoto {
float: left;
margin-left: 3px;
margin-top: -1.2em;
}
#StaffList .staffphoto img {
border:1px solid #AAA;
}
#StaffList .staffdescription {
margin-left: 60px;
margin-bottom:30px;
}
#StaffPhoto {
float: left;
margin-right: 10px;
}
#StaffPhoto img {
border:1px solid #AAA;
}
#PageComments {
list-style:none;
background:#e9e9e9;
border:1px solid #ccc;
border-bottom:0;
padding:0;
margin:0;
}
#PageComments li {
list-style:none;
padding:5px;
margin:0;
font-size:1em;
border-bottom:1px dotted #bbb;
}
#PageComments li p span {
font-style:italic;
}
#PageComments a.deletelink {
font-weight:bold;
}
#PageNumbers {
font-weight:bold;
color:#333;
font-size:1.1em;
text-align:center;
padding:5px;
border:1px solid #ddd;
background:#e9e9e9;
}
#PageNumbers * {
padding:0 5px;
line-height:1.5em;
}
#PageNumbers a {
color:#0083C8;
text-decoration:none;
}
#PageNumbers a:hover {
text-decoration:underline;
}

View File

@ -1,113 +0,0 @@
/**
* This typography file is included in the WYSIWYG editor
*/
.typography * {
font-family:Verdana,Arial,sans-serif;
font-size:1em;
}
.typography blockquote {
margin-left:20px;
}
.typography hr {
padding:5px;
}
.typography p,
.typography ul li,
.typography ol li,
.typography a {
color:#333;
line-height:1.5em;
font-size:1.1em;
}
.typography p {
margin-bottom:20px;
}
/** CMS LIST STYLES **/
.typography ul,
.typography ol {
margin-left:10px;
margin-bottom:20px;
}
.typography ul li,
.typography ol li {
margin:4px 10px;
line-height:1.4em;
}
.typography ul li {
list-style-type:disc;
}
.typography ol li {
list-style-type:decimal;
}
/* HEADER STYLES */
.typography h1,
.typography h2,
.typography h3,
.typography h4 {
margin-bottom:14px;
color:#0083C8;
}
.typography h1,
.typography h4 {
font-weight:bold;
}
.typography h2,
.typography h3 {
font-weight:normal;
}
.typography h1 {
font-size:2.2em;
}
.typography h2 {
font-size:2.2em;
}
.typography h3 {
font-size:1.6em;
}
.typography h4 {
font-size:1.4em;
}
/* LINK STYLES */
.typography a {
color:#0083C8;
font-size:1em;
text-decoration:none;
}
.typography a:hover {
text-decoration:underline;
}
.typography table {
font-size:1.1em;
}
.typography table tr td {
padding:3px 5px;
}
/* WYSIWYG EDITOR ALIGNMENT CLASSES */
.typography .left {
text-align:left;
}
.typography .center {
text-align:center;
}
.typography .right {
text-align:right;
}
.typography img.right {
float:right;
}
.typography img.left {
float:left;
}
.typography p.MsoNormal, .typography p.MsoBodyText {
margin: 0;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 312 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 446 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 556 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
<head>
<% base_tag %>
<link rel="stylesheet" type="text/css" href="tutorial/css/layout.css" />
<link rel="stylesheet" type="text/css" href="tutorial/css/typography.css" />
<link rel="stylesheet" type="text/css" href="tutorial/css/form.css" />
</head>
<body>
<div id="Main">
<div id="Header">
<h1>&nbsp;</h1>
</div>
<div id="ContentContainer">
<div id="Content" class="typography">
$Content
</div>
</div>
<div id="Footer">
<span>Visit <a href="http://www.silverstripe.com" title="Visit www.silverstripe.com">www.silverstripe.com</a> to download the CMS</span>
</div>
</div>
$SilverStripeNavigator
</body>
</html>

23
web.config Normal file
View File

@ -0,0 +1,23 @@
<!-- Routing configuration for Microsoft IIS web server -->
<configuration>
<system.webServer>
<rewrite>
<rules>
<rule name="SilverStripe Global URLs">
<match url="^(.*)$" />
<conditions>
<add input="{R:1}" matchType="Pattern" pattern="public(/|$)" negate="true" />
</conditions>
<action type="Rewrite" url="public/{R:1}" appendQueryString="true" />
</rule>
<rule name="SilverStripe Preprocessed URLs" stopProcessing="true">
<match url="^(.*)$" />
<conditions>
<add input="{REQUEST_FILENAME}" matchType="IsFile" negate="true" />
</conditions>
<action type="Rewrite" url="public/index.php" appendQueryString="true" />
</rule>
</rules>
</rewrite>
</system.webServer>
</configuration>