Commit Graph

  • 39653972a7 Merge 59b696f0f2 into 4e6e8f1dbc Tim Snadden 2014-06-19 09:14:18 +0000
  • 4e6e8f1dbc Merge pull request #65 from JLeft/patch-1 3.1.6-rc3 3.1.6-rc2 3.1.6-rc1 3.1.6 Damian Mooyman 2014-06-18 08:35:16 +1200
  • bf642b09e0 Capitalisation of 'GitHub' JLeft 2014-06-17 13:17:05 +0100
  • 0c9539942f Revert accidental commit to behat.yml (setting a specific base URL) Ingo Schommer 2014-06-16 08:51:41 +1200
  • f7c23b9007 Merge remote-tracking branch 'origin/3.1' Ingo Schommer 2014-06-16 08:44:42 +1200
  • 10dc891fee Removed goutte driver from Behat, not supported Ingo Schommer 2014-06-16 08:41:43 +1200
  • 59b696f0f2 Simplify .htaccess Tim Snadden 2014-05-06 07:54:59 +1200
  • b3acbcfa5f Merge remote-tracking branch 'origin/3.0' into 3.1 3.1.5-rc1 3.1.5 3.1.4-rc1 3.1.4 Damian Mooyman 2014-04-01 08:52:34 +1300
  • 3b3cda59d2 Merge remote-tracking branch 'origin/3.1' Ingo Schommer 2014-02-18 22:38:26 +1300
  • aa07a0edd8 BUGFIX #34 Only block root vendor folder 3.1.3-rc2 3.1.3-rc1 3.1.3 colymba 2013-04-20 10:31:47 +0300
  • bcfe76ad30 Merge f820563a36 into 16c9312f29 Mateusz U 2014-02-04 20:04:02 -0800
  • 16c9312f29 Merge pull request #61 from silverstripe/pulls/remove-tutorial Sean Harvey 2014-02-02 14:31:29 -0800
  • a31512afc8 Remove obsolete tutorial theme (fixes #60) Ingo Schommer 2014-02-03 08:09:54 +1300
  • 1098bdee31 Merge pull request #35 from colymba/3.0-htaccess-fix 3.0.9-rc1 3.0.9 3.0.11-rc1 3.0.11 3.0.10-rc1 3.0.10 Ingo Schommer 2013-12-19 16:39:35 -0800
  • 6ba8838239 Merge pull request #59 from oddnoc/yaml-syntax Ingo Schommer 2013-12-19 16:17:22 -0800
  • d80afcf5b6 Correct YAML syntax Fred Condo 2013-12-19 15:04:46 -0800
  • c7fe54d082 Merge pull request #56 from gordonbanderson/3.1 Ingo Schommer 2013-11-22 04:32:41 -0800
  • 50dff80399 Merge pull request #55 from jonom/patch-1 Will Rossiter 2013-11-11 21:28:44 -0800
  • 72e8ae0b87 Addition of geographical file formats (gpx,kml) Gordon Anderson 2013-11-12 11:39:12 +0700
  • 68b8b08b2c Addition of geographic files (gpx, kml) Gordon Anderson 2013-11-12 11:37:26 +0700
  • e0ce35217c Removed misleading comments and legacy requirement calls jonom 2013-11-11 09:22:36 +0700
  • 0936dd9bee Merge cd0d48ab23 into 1e729183c8 tiaitsch85 2013-10-30 15:16:13 -0700
  • cd0d48ab23 Update web.config tiaitsch85 2013-10-30 23:15:40 +0100
  • 1e729183c8 Show snippets in behat.yml defaults, more dev friendly 3.1.2-rc1 3.1.2 Ingo Schommer 2013-10-21 13:17:43 +0200
  • 20b3957c78 Merge remote-tracking branch 'origin/3.1' Ingo Schommer 2013-10-21 00:08:50 +0200
  • f62874d001 Exclude @todo from behat runs by default Ingo Schommer 2013-10-21 00:08:19 +0200
  • 304cb25808 Merge remote-tracking branch 'origin/3.0' into 3.1 Ingo Schommer 2013-10-19 12:02:28 +0200
  • a90c403b05 Merge pull request #51 from stevie-mayhew/patch-1 Will Rossiter 2013-10-07 00:02:02 -0700
  • 7a4fdca3fa Merge cd30cdd0af into 69a19b220d Stevie Mayhew 2013-10-06 13:16:33 -0700
  • cd30cdd0af MINOR: correct paths for framework and cms issues Stevie Mayhew 2013-10-07 09:16:11 +1300
  • 8e3ddd8881 Merge 102c0a5b58 into 69a19b220d Stevie Mayhew 2013-10-06 12:36:49 -0700
  • 102c0a5b58 MINOR: correct paths for framework and cms issues Stevie Mayhew 2013-10-07 08:36:11 +1300
  • 69a19b220d Link to both framework and cms issues in README Ingo Schommer 2013-10-02 16:02:55 +0200
  • a0c89ad707 Merge tag '2.4.13' into 2.4 Ingo Schommer 2013-09-27 00:25:13 +0200
  • dae9b18558 Merge tag '3.0.7-rc1' into 3.0 3.0.8 3.0.7 Ingo Schommer 2013-09-27 00:21:56 +0200
  • 1434fedf10 Tagged 3.1.0-rc3 3.1.1 3.1.0-rc3 3.1.0 Ingo Schommer 2013-09-26 01:42:31 +0200
  • 2a70eedee1 Tagged 3.0.7-rc1 3.0.7-rc1 Ingo Schommer 2013-09-26 01:32:46 +0200
  • 73344bcce0 Tagged 2.4.13 2.4.13 Ingo Schommer 2013-09-26 01:12:04 +0200
  • 0d5eab3a5f Tagged 3.0.6 3.0.6 Ingo Schommer 2013-09-26 00:35:09 +0200
  • e86bb3020b Behat: Hide snippets by default, exclude @todo tags Ingo Schommer 2013-09-14 22:25:16 +0200
  • 2cc4150b6c Tagged 3.1.0-rc2 3.1.0-rc2 Ingo Schommer 2013-09-12 17:02:20 +0200
  • f80f7a5291 Tagged 3.0.6-rc2 3.0.6-rc2 Ingo Schommer 2013-09-12 16:48:20 +0200
  • 55c538bd47 Tagged 2.4.12 2.4.12 Ingo Schommer 2013-09-12 16:29:36 +0200
  • 9c0c049b64 Merge remote-tracking branch 'origin/2.4' into post-2.4 Ingo Schommer 2013-08-07 21:54:34 +0200
  • b1eba0f9b9 Merge remote-tracking branch 'origin/2.4' into 3.0 3.0.6-rc1 Ingo Schommer 2013-08-07 20:37:03 +0200
  • 69889ec786 Updated SS logo sample file Ingo Schommer 2013-08-07 20:36:08 +0200
  • 77ef39fedd FIX: Put self.version in composer dependencies. 2.4.11 Sam Minnee 2013-05-13 21:07:57 +1200
  • cff42f2338 Merge remote-tracking branch 'origin/2.4' into 3.0 Ingo Schommer 2013-08-03 15:12:24 +0200
  • c76cce5e4a Merge pull request #47 from hafriedlander/fix/flush_24 Ingo Schommer 2013-08-03 04:56:38 -0700
  • 06dbef750b Merge f27fb07e4d into d640f826d0 Hamish Friedlander 2013-08-01 15:54:56 -0700
  • f27fb07e4d FIX Include flushtoken when install redirects to successfullyinstalled Hamish Friedlander 2013-08-02 10:53:35 +1200
  • 24892c6b66 Merge branch '3.1' Sean Harvey 2013-07-30 14:43:37 +1200
  • d4e5748835 Merge pull request #44 from silverstripe/remove_post_scripts 3.1.0-rc1 Stig Lindqvist 2013-07-29 17:03:47 -0700
  • 3af678b92e Merge 8be1dea481 into 0b59ef4026 Sean Harvey 2013-07-25 23:58:36 -0700
  • 8be1dea481 Fixing regression in composer post scripts Sean Harvey 2013-07-26 18:58:07 +1200
  • 8b76cb8fb9 Merge branch '3.1' Simon Welsh 2013-07-01 13:01:14 +1200
  • 0b59ef4026 Merge remote-tracking branch 'origin/3.0' into 3.1 Simon Welsh 2013-07-01 13:00:52 +1200
  • 4fd75527dc Block access to .yaml files as well as .yml Simon Welsh 2013-07-01 12:59:31 +1200
  • f820563a36 BUG Prevent VCS from being accessed via HTTP. Mateusz Uzdowski 2013-06-11 15:48:02 +1200
  • 623685aedc Merge remote-tracking branch 'origin/3.0' into 3.1 Ingo Schommer 2013-06-03 10:32:30 +0200
  • 93f206a125 Revert composer.lock addition, unclear usage, breaks builds Ingo Schommer 2013-06-03 10:27:04 +0200
  • 26ec73fde8 Fixed composer.json (merge error) Ingo Schommer 2013-06-02 20:38:13 +0200
  • 6b8192e7bd Merge remote-tracking branch 'origin/3.1' Ingo Schommer 2013-05-31 18:10:15 +0200
  • f283290e2a Merge pull request #42 from sminnee/composer-post-install Sean Harvey 2013-05-29 21:57:55 -0700
  • 2cff613d00 Merge 26147bb962 into c88c6af039 Sam Minnée 2013-05-29 21:50:20 -0700
  • c88c6af039 Merge branch '3.0' into 3.1 Sam Minnee 2013-05-30 16:27:55 +1200
  • e9f13512dc git commit -m "FIX: Move install composer.json to use self.version. Sam Minnee 2013-05-30 16:27:27 +1200
  • 26147bb962 NEW: Added post-install and post-update dev/build call. Sam Minnee 2013-05-30 16:23:29 +1200
  • 16c72aacb6 Merge pull request #41 from uniun/HTML5-video-file-types Ingo Schommer 2013-05-29 08:36:26 -0700
  • adce447b1a Merge 7403a844e0 into dbe882c11e uniun 2013-05-27 11:33:30 -0700
  • 7403a844e0 HTML5 video file types. Elvinas 2013-05-27 21:32:04 +0300
  • dbe882c11e Merge pull request #40 from NightJar/hackfest_may_2013 Simon Welsh 2013-05-25 01:09:47 -0700
  • 3d72cc8a96 Merge 04be573187 into 0975787f00 NightJar 2013-05-25 00:52:58 -0700
  • 04be573187 case insensitive the assets/ allowed extensions for Apache Nightjar 2013-05-25 19:43:13 +1200
  • 0975787f00 Updated github path Ingo Schommer 2013-05-17 00:49:19 +0200
  • 16380f68bf Updated github path Ingo Schommer 2013-05-17 00:49:19 +0200
  • a11f4be84a Merge pull request #39 from sminnee/composer-uses-self-version Ingo Schommer 2013-05-13 02:19:26 -0700
  • 07d8bb1840 Merge bf81f0394a into b23c744f41 Sam Minnée 2013-05-13 02:10:09 -0700
  • bf81f0394a FIX: Put self.version in composer dependencies. Sam Minnee 2013-05-13 21:07:57 +1200
  • b23c744f41 Merge remote-tracking branch 'origin/3.0' into 3.1 Ingo Schommer 2013-05-09 16:55:44 +0200
  • c929a5944d Updated behat.yml to reflect changes in behat-extension module Ingo Schommer 2013-05-09 16:00:50 +0200
  • 08b3685927 Merge pull request #36 from chillu/pulls/require-dev Sam Minnée 2013-05-07 02:54:56 -0700
  • 7b7d03cee3 Merge 345a32ec3e into 1aca785e6d Ingo Schommer 2013-05-07 01:57:28 -0700
  • 345a32ec3e Remove require-dev section, composer doesn't handle it well Ingo Schommer 2013-05-07 10:51:47 +0200
  • 7085f074d2 BUGFIX #34 Only block root vendor folder colymba 2013-04-20 10:31:47 +0300
  • 63a2d1abf9 Added composer.lock for 3.1.0-beta3 3.1.0-beta3 Ingo Schommer 2013-04-18 20:03:41 +0200
  • 1aca785e6d Merge pull request #29 from chillu/pulls/gitattributes Ingo Schommer 2013-04-18 09:32:56 -0700
  • 24902c1b4b Merge 377a68848e into b0188e9bfd Ingo Schommer 2013-04-18 09:32:05 -0700
  • b0188e9bfd Merge pull request #32 from sunnysideup/patch-1 Sean Harvey 2013-04-02 19:56:14 -0700
  • 77279cdf6c Merge 5c91cc1f61 into 2e4913d351 Nicolaas 2013-04-02 19:54:43 -0700
  • 5c91cc1f61 IIS 7.5 does not like forward slash at the end of silverstripe-cache Nicolaas 2013-04-03 15:54:31 +1300
  • f35ca6470c Merge remote-tracking branch 'origin/3.1' Ingo Schommer 2013-04-02 02:04:33 +0200
  • b466217548 Merge remote-tracking branch 'origin/3.0' into 3.1 Ingo Schommer 2013-04-02 02:03:40 +0200
  • 2e4913d351 Contribution guidelines, new bugtracker links Ingo Schommer 2013-04-02 01:52:32 +0200
  • 27f63fe19f Updated bugtracker links Ingo Schommer 2013-04-02 01:19:15 +0200
  • d640f826d0 Removed @stable markers from 2.4 dev branch Ingo Schommer 2013-03-27 16:00:14 +0100
  • cd56f026ce Merge remote-tracking branch 'origin/3.1' Ingo Schommer 2013-03-26 01:22:48 +0100
  • fbb4d1c42b FIX: Update Page/Page_Controller statics to match new 3.1 expectations. Sam Minnee 2013-03-25 14:38:58 +1300
  • aaa382cdaa Merge bac9e2fc00 into 41761472b2 Ingo Schommer 2013-03-21 12:26:13 -0700
  • bac9e2fc00 Added mysite/_config/config.yml, removed obsolete PHP config (#8317) Ingo Schommer 2013-03-15 18:02:21 +0100