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