Commit Graph

  • ee92941f87
    DOCS update comments for supported versions Daniel Hensby 2017-11-07 12:58:43 +0000
  • 97c8f25543 Update development dependencies 4.0.0-rc3 Damian Mooyman 2017-11-03 17:01:11 +1300
  • f60b63e6b8 Update development dependencies 4.0.0-rc2 Damian Mooyman 2017-11-02 16:46:13 +1300
  • edf9baa580 Update development dependencies 4.0.0-rc1 Damian Mooyman 2017-10-25 16:50:47 +1300
  • d6c528b8bc Fix test paths Damian Mooyman 2017-10-25 16:20:00 +1300
  • 8dc64d17d0 Merge pull request #204 from open-sausages/pulls/4.0/update-plugin Chris Joe 2017-10-25 11:21:34 +1300
  • 35a17cc9c0
    Update recipe-plugin to 1.0 Damian Mooyman 2017-10-25 11:14:32 +1300
  • 3d7d31a557
    Update dependencies to 2.x-dev Damian Mooyman 2017-10-12 10:20:56 +1300
  • 543757f640
    Merge remote-tracking branch 'origin/4' Damian Mooyman 2017-10-12 10:19:54 +1300
  • 46ca9bf59d
    Update 4.1 dependencies Damian Mooyman 2017-10-12 10:17:25 +1300
  • d6c07093ce
    Update branch alias Damian Mooyman 2017-10-12 10:16:42 +1300
  • 2900212357 Update development dependencies 4.0.0-beta4 Damian Mooyman 2017-10-11 17:52:50 +1300
  • 8fa7c9a27a Update test paths Damian Mooyman 2017-10-11 17:48:36 +1300
  • ed0e2297a4 Remove obsolete branch-alias Damian Mooyman 2017-10-11 17:31:50 +1300
  • 33aa9ab719 Merge pull request #203 from open-sausages/pulls/4.0/better-beta4-upgrade Chris Joe 2017-10-10 16:59:22 +1300
  • 64211f1b1d
    Move files to recipe-core Damian Mooyman 2017-10-10 15:36:17 +1300
  • e32b1bbd07 Merge pull request #202 from open-sausages/pulls/4/request-uri Ingo Schommer 2017-10-09 10:41:39 +0100
  • c369cd2358 Move index.php to recipe-core Ingo Schommer 2017-10-05 08:18:51 +0100
  • bce724ca76 Use index.php for serving content Ingo Schommer 2017-10-03 15:43:14 +0100
  • edf6f4c1d3 Merge pull request #201 from open-sausages/pulls/4/gitignore Damian Mooyman 2017-10-05 09:00:31 +1300
  • ec36574665 Update gitignore for vendor module move Ingo Schommer 2017-10-04 09:54:57 +0100
  • 67ed44823e Merge pull request #200 from open-sausages/pulls/4/vendorise-me-baby Damian Mooyman 2017-10-03 16:11:06 +1300
  • 8ab058a3fd
    Update unit test paths and asset .htaccess Damian Mooyman 2017-10-03 15:09:02 +1300
  • 96045afc65 Adjust phpunit path to framework Ingo Schommer 2017-10-03 05:09:43 +1300
  • 7de2e07139 Fix main.php path in install.php Ingo Schommer 2017-10-03 03:19:23 +1300
  • 2d53abd2c2 Removed stylesheet from frameworkmissing file Ingo Schommer 2017-10-03 02:38:09 +1300
  • e88f7654da Fix main.php path Ingo Schommer 2017-10-03 01:44:14 +1300
  • f22d9b3735 Fix main.php path Ingo Schommer 2017-10-03 01:44:14 +1300
  • a1384f67b7 Simplify serving static assets in index.php Ingo Schommer 2017-10-03 01:44:06 +1300
  • 41b87ab2d5 Merge pull request #198 from open-sausages/pulls/4.0/adjust-timeout Chris Joe 2017-09-29 12:03:02 +1300
  • 0cf5924277
    Update .travis.yml Damian Mooyman 2017-09-29 10:03:30 +1300
  • 2c81adf3e6 Adjust behat timeout for asset-admin tests Damian Mooyman 2017-08-23 12:15:33 +1200
  • beefaac422
    Merge branch '4' Daniel Hensby 2017-09-28 17:21:27 +0100
  • 40c78de6af Update development dependencies 4.0.0-beta3 Damian Mooyman 2017-09-08 17:16:44 +1200
  • 9e6114c151 Merge pull request #195 from sminnee/gimme-more-files Chris Joe 2017-09-06 15:24:55 +1200
  • a356efd0b6
    Merge branch '4' Daniel Hensby 2017-08-14 12:10:33 +0100
  • 40c6fcf18f Merge pull request #197 from open-sausages/pulls/4.0/recipe-info Chris Joe 2017-08-14 23:05:50 +1200
  • 26cd654dbb Provide information related to recipe Saophalkun Ponlu 2017-08-14 10:05:43 +1200
  • 5f65f83416
    Update development dependencies 4.0.0-beta2 Damian Mooyman 2017-08-07 16:05:11 +1200
  • 4df28ad121
    Added archive config Damian Mooyman 2017-08-04 16:39:39 +1200
  • 424b1c04dd FIX: Include .env.example and .editorconfig in git export Sam Minnee 2017-07-31 17:36:33 +1200
  • 5a5c37f083
    Merge branch '4' Daniel Hensby 2017-07-25 11:49:16 +0100
  • 980bf834b7 Fix recipe plugin version constraint Damian Mooyman 2017-07-25 11:13:55 +1200
  • dd2ebad5dc Merge pull request #193 from open-sausages/pulls/4.0/recipe-concept Chris Joe 2017-07-24 15:13:35 +1200
  • 2d04b844b7
    API Convert installer to recipe Damian Mooyman 2017-07-11 16:04:01 +1200
  • 8e0fa3812f
    Merge branch '4' Daniel Hensby 2017-07-15 16:13:20 +0100
  • d3de9e075f Merge pull request #191 from nfauchelle/patch-1 Damian Mooyman 2017-07-07 22:05:01 +1200
  • afb523424e Update .gitignore Nick 2017-07-07 21:02:29 +1200
  • f9bc5a3fc0 Merge pull request #190 from robbieaverill/patch-1 Damian Mooyman 2017-07-06 14:46:24 +1200
  • 5284ca65b0 Add editorconfig rule for composer.json to be allowed four spaces Robbie Averill 2017-07-06 12:41:02 +1200
  • adca3aea68 Update composer alias Christopher Joe 2017-07-06 09:03:09 +1200
  • a24639538f Update composer alias Christopher Joe 2017-07-05 14:16:52 +1200
  • 757585d4a9
    Update composer constraints Daniel Hensby 2017-07-04 14:26:48 +0100
  • a41b7bc221
    Update composer alias Daniel Hensby 2017-07-04 14:09:57 +0100
  • bbf1004ed1
    Merge remote-tracking branch 'origin/4.0' Damian Mooyman 2017-07-04 13:53:39 +1200
  • bf3c4ccc55 Update development dependencies 4.0.0-beta1 Damian Mooyman 2017-07-03 17:44:45 +1200
  • 7b68ac77ab Remove obsolete branch-alias Damian Mooyman 2017-07-03 16:53:55 +1200
  • 1e7d9f9a15 Merge pull request #185 from robbieaverill/patch-1 Daniel Hensby 2017-06-27 23:38:47 +0100
  • b8750d9399 FIX Delete Page_Controller from SS4 compat branch Robbie Averill 2017-06-28 10:05:38 +1200
  • 69441aba44
    Merge branch '3' Daniel Hensby 2017-06-27 13:27:40 +0100
  • 61bf3af041
    Merge branch '3.6' into 3 Daniel Hensby 2017-06-27 13:10:11 +0100
  • 6eadd1e6a4
    Merge tag '3.6.1' into 3.6 3.6.2-beta2 3.6.2-beta1 3.6.2 Daniel Hensby 2017-06-27 12:56:12 +0100
  • c9c9cf7d58 Merge pull request #182 from jonom/master Damian Mooyman 2017-06-27 14:30:48 +1200
  • 333d3a5408 Merge pull request #183 from open-sausages/pulls/4.0/app-object Ingo Schommer 2017-06-22 22:58:14 +1200
  • a74e513a29
    Remove unneeded globals Damian Mooyman 2017-06-20 17:20:00 +1200
  • 4f68a04730 Added errorpage module Jono Menz 2017-06-15 16:02:13 -0700
  • b2db7dc990 Merge pull request #1 from silverstripe-security/patch/3.6.0/SS-2017-017 3.6.1-alpha2 3.6.1-alpha1 3.6.1 Daniel Hensby 2017-06-14 14:43:37 +0100
  • 5aa694953e Merge pull request #180 from open-sausages/pulls/4.0/remove-dummy Chris Joe 2017-06-08 10:49:28 +1200
  • bf76193e13
    Remove redundant dummy file in assets Damian Mooyman 2017-06-06 11:45:15 +1200
  • d0de968167
    Merge branch '3.6' into 3 Daniel Hensby 2017-05-30 23:50:37 +0100
  • f589adb0b9
    Merge branch '3.5' into 3.6 Daniel Hensby 2017-05-30 23:49:40 +0100
  • ed34be06c1
    Merge tag '3.6.0' into 3.6 Daniel Hensby 2017-05-30 23:49:34 +0100
  • 1aac471131
    Merge branch '3.4' into 3.5 3.5.5-beta2 3.5.5-beta1 3.5.5 Daniel Hensby 2017-05-30 23:48:39 +0100
  • f7cb994ab6
    Merge tag '3.5.4' into 3.5 Daniel Hensby 2017-05-30 23:48:37 +0100
  • d07a18a643
    Merge tag '3.4.6' into 3.4 Daniel Hensby 2017-05-30 23:47:06 +0100
  • a32988fc04
    Merge remote-tracking branch 'security/3.5.4' into 3.6.0 3.6.0-rc1 3.6.0 Daniel Hensby 2017-05-29 01:29:55 +0100
  • 6475ac9e7d
    Merge remote-tracking branch 'security/3.4.6' into 3.5.4 3.5.4-rc1 3.5.4 Daniel Hensby 2017-05-29 01:03:15 +0100
  • a063c1caec
    Merge pull request #174 from robbieaverill/phpcs-standard-3.x 3.4.6-rc2 3.4.6-rc1 3.4.6 Daniel Hensby 2017-05-28 21:37:39 +0000
  • c25478bef7
    [SS-2017-017] FIX SVG uploads disabled by default Daniel Hensby 2017-05-25 13:11:59 +0100
  • 0e85f88204 Merge pull request #178 from open-sausages/pulls/4.0/add-behat-tests Chris Joe 2017-05-25 12:57:55 +1200
  • 2e94a11c8b
    API Add pgsql + behat tests to installer Damian Mooyman 2017-05-22 13:41:00 +1200
  • 320073f423 Merge 69775d4f2a into d406fa365f Sam Minnée 2017-05-22 11:36:40 +0000
  • d406fa365f Merge pull request #179 from nfauchelle/ignore-modules-handled-by-composer Damian Mooyman 2017-05-22 21:17:05 +1200
  • 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 Nick 2017-05-22 20:44:14 +1200
  • a4658330e0 Merge 4b3a1ea5cf into d9f28b2017 Ingo Schommer 2017-05-15 21:06:13 +0000
  • d9f28b2017 Merge pull request #177 from nfauchelle/psr-2-adjustments Damian Mooyman 2017-05-15 09:15:09 +1200
  • d3ed3f7476 Update the PHP files to PSR-2 spec Nick 2017-05-14 21:48:27 +1200
  • f54ff29a02 API Remove BlockUntrustedIPs Damian Mooyman 2017-04-13 13:39:21 +1200
  • 02e3e102c1
    Merge branch '3.6' into 3 Daniel Hensby 2017-05-08 16:20:04 +0100
  • 9dfe62577b
    Merge branch '3.5' into 3.6 Daniel Hensby 2017-05-08 16:19:40 +0100
  • e35dd82f2d
    Merge branch '3.4' into 3.5 Daniel Hensby 2017-05-08 15:49:49 +0100
  • df40d5f8c6 Update for behat 3 Damian Mooyman 2017-04-21 16:43:35 +1200
  • 73ea742909 Update development dependencies 4.0.0-alpha7 Aaron Carlino 2017-05-02 13:25:49 +1200
  • 69775d4f2a Fix travis configs Sam Minnee 2017-04-28 09:38:40 +1200
  • 3397ab4927 This is necessary to allow package downgrade Sam Minnee 2017-04-28 09:25:59 +1200
  • 247878f03b Merge pull request #174 from robbieaverill/phpcs-standard-3.x Ingo Schommer 2017-04-28 08:27:30 +1200
  • 9acd97791a Update code formatting for the SS3 PHPCS ruleset, separate Page_Controller to new file Robbie Averill 2017-04-28 07:33:07 +1200
  • 451e7961d2 Add PHPCS configuration for SilverStripe 3.x Robbie Averill 2017-04-28 07:28:35 +1200
  • 593ad60970 FIX: Add behat requirements Sam Minnee 2017-04-27 20:47:34 +1200
  • 167d10bcac NEW: Add behat tests to combined test build. Sam Minnee 2017-04-27 18:02:38 +1200