diff --git a/.gitignore b/.gitignore index b3d5320..0133453 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ /staticpublisher/ /toolbar/ /display_logic/ +/silverstripe-dynamodb/ +/crontask/ \ No newline at end of file diff --git a/app/_config.php b/app/_config.php index 8fe7818..9d63437 100644 --- a/app/_config.php +++ b/app/_config.php @@ -4,10 +4,11 @@ global $project; $project = 'app'; global $database; -$database = 'SS_ssdoc'; -if (defined('SS_DATABASE_NAME')) { +if(defined('SS_DATABASE_NAME') && SS_DATABASE_NAME) { $database = SS_DATABASE_NAME; +} else { + $database = 'SS_ssdoc'; } if(isset($_ENV['CLEARDB_DATABASE_URL'])) { diff --git a/app/_config/docsviewer.yml b/app/_config/docsviewer.yml index 8fcda1d..bf830cc 100644 --- a/app/_config/docsviewer.yml +++ b/app/_config/docsviewer.yml @@ -10,19 +10,19 @@ DocumentationManifest: automatic_registration: false register_entities: - - Path: "src/framework_master/docs/" + Path: "assets/src/framework_master/docs/" Title: "Framework" Version: "4.0" Branch: "master" DefaultEntity: true - - Path: "src/framework_3/docs/" + Path: "assets/src/framework_3/docs/" Title: "Framework" Version: "3.4" Branch: "3" DefaultEntity: true - - Path: "src/framework_3.3/docs/" + Path: "assets/src/framework_3.3/docs/" Title: "Framework" Version: "3.3" Branch: "3.3" @@ -34,17 +34,17 @@ DocumentationManifest: Stable: true DefaultEntity: true - - Path: "src/framework_3.1/docs/" + Path: "assets/src/framework_3.1/docs/" Title: "Framework" Version: "3.1" DefaultEntity: true - - Path: "src/framework_3.0/docs/" + Path: "assets/src/framework_3.0/docs/" Title: "Framework" Version: "3.0" DefaultEntity: true - - Path: "src/framework_2.4/docs/" + Path: "asserts/src/framework_2.4/docs/" Title: "Framework" Version: "2.4" DefaultEntity: true diff --git a/bin/update.sh b/bin/update.sh index 28ad974..ed529de 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -1,6 +1,6 @@ #!/bin/bash -dir=$1 +dir=$1/assets if [ ! "$dir" ]; then echo "Usage: $0 /base/folder/to/docs" diff --git a/composer.json b/composer.json index 8a5f99f..6a29945 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,8 @@ "ext-mbstring": "*", "silverstripe/docsviewer": "dev-master", "silverstripe/framework": "^3.2", - "silverstripe/toolbar": "^4.0" + "silverstripe/toolbar": "^4.0", + "silverstripe/dynamodb": "^1.1" }, "require-dev": { "phpunit/PHPUnit": "~3.7@stable" diff --git a/composer.lock b/composer.lock index 9bd0e37..836e30e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,25 +4,88 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "cd69d6da542e5a55eb70de4717509fec", - "content-hash": "2d681db39312cbcf607f72a193a9c2b1", + "hash": "1ddd85476025c0b7a81ac788f843c0ee", + "content-hash": "fc7210e99b3e3e346c1ea1bd9edf7cb8", "packages": [ { - "name": "composer/installers", - "version": "v1.0.22", + "name": "aws/aws-sdk-php", + "version": "2.8.27", "source": { "type": "git", - "url": "https://github.com/composer/installers.git", - "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046" + "url": "https://github.com/aws/aws-sdk-php.git", + "reference": "c1605360b6624958a5397601ad5543cd45fcf8f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/bd9b14f094c89c8b5804a4e41edeb7853bb85046", - "reference": "bd9b14f094c89c8b5804a4e41edeb7853bb85046", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c1605360b6624958a5397601ad5543cd45fcf8f7", + "reference": "c1605360b6624958a5397601ad5543cd45fcf8f7", "shasum": "" }, "require": { - "composer-plugin-api": "1.0.0" + "guzzle/guzzle": "~3.7", + "php": ">=5.3.3" + }, + "require-dev": { + "doctrine/cache": "~1.0", + "ext-openssl": "*", + "monolog/monolog": "~1.4", + "phpunit/phpunit": "~4.0", + "phpunit/phpunit-mock-objects": "2.3.1", + "symfony/yaml": "~2.1" + }, + "suggest": { + "doctrine/cache": "Adds support for caching of credentials and responses", + "ext-apc": "Allows service description opcode caching, request and response caching, and credentials caching", + "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages", + "monolog/monolog": "Adds support for logging HTTP requests and responses", + "symfony/yaml": "Eases the ability to write manifests for creating jobs in AWS Import/Export" + }, + "type": "library", + "autoload": { + "psr-0": { + "Aws": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Amazon Web Services", + "homepage": "http://aws.amazon.com" + } + ], + "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project", + "homepage": "http://aws.amazon.com/sdkforphp", + "keywords": [ + "amazon", + "aws", + "cloud", + "dynamodb", + "ec2", + "glacier", + "s3", + "sdk" + ], + "time": "2016-01-30 00:53:32" + }, + { + "name": "composer/installers", + "version": "v1.0.23", + "source": { + "type": "git", + "url": "https://github.com/composer/installers.git", + "reference": "6213d900e92647831f7a406d5c530ea1f3d4360e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/installers/zipball/6213d900e92647831f7a406d5c530ea1f3d4360e", + "reference": "6213d900e92647831f7a406d5c530ea1f3d4360e", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0" }, "replace": { "roundcube/plugin-installer": "*", @@ -103,7 +166,77 @@ "zend", "zikula" ], - "time": "2015-10-29 23:28:48" + "time": "2016-01-27 12:54:22" + }, + { + "name": "doctrine/cache", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/cache.git", + "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6", + "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6", + "shasum": "" + }, + "require": { + "php": "~5.5|~7.0" + }, + "conflict": { + "doctrine/common": ">2.2,<2.4" + }, + "require-dev": { + "phpunit/phpunit": "~4.8|~5.0", + "predis/predis": "~1.0", + "satooshi/php-coveralls": "~0.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Caching library offering an object-oriented API for many cache backends", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "cache", + "caching" + ], + "time": "2015-12-31 16:37:02" }, { "name": "erusev/parsedown", @@ -188,18 +321,205 @@ ], "time": "2014-09-16 11:54:01" }, + { + "name": "guzzle/guzzle", + "version": "v3.9.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle3.git", + "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", + "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "php": ">=5.3.3", + "symfony/event-dispatcher": "~2.1" + }, + "replace": { + "guzzle/batch": "self.version", + "guzzle/cache": "self.version", + "guzzle/common": "self.version", + "guzzle/http": "self.version", + "guzzle/inflection": "self.version", + "guzzle/iterator": "self.version", + "guzzle/log": "self.version", + "guzzle/parser": "self.version", + "guzzle/plugin": "self.version", + "guzzle/plugin-async": "self.version", + "guzzle/plugin-backoff": "self.version", + "guzzle/plugin-cache": "self.version", + "guzzle/plugin-cookie": "self.version", + "guzzle/plugin-curlauth": "self.version", + "guzzle/plugin-error-response": "self.version", + "guzzle/plugin-history": "self.version", + "guzzle/plugin-log": "self.version", + "guzzle/plugin-md5": "self.version", + "guzzle/plugin-mock": "self.version", + "guzzle/plugin-oauth": "self.version", + "guzzle/service": "self.version", + "guzzle/stream": "self.version" + }, + "require-dev": { + "doctrine/cache": "~1.3", + "monolog/monolog": "~1.0", + "phpunit/phpunit": "3.7.*", + "psr/log": "~1.0", + "symfony/class-loader": "~2.1", + "zendframework/zend-cache": "2.*,<2.3", + "zendframework/zend-log": "2.*,<2.3" + }, + "suggest": { + "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.9-dev" + } + }, + "autoload": { + "psr-0": { + "Guzzle": "src/", + "Guzzle\\Tests": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Guzzle Community", + "homepage": "https://github.com/guzzle/guzzle/contributors" + } + ], + "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "time": "2015-03-18 18:23:50" + }, + { + "name": "mtdowling/cron-expression", + "version": "v1.0.4", + "source": { + "type": "git", + "url": "https://github.com/mtdowling/cron-expression.git", + "reference": "fd92e883195e5dfa77720b1868cf084b08be4412" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mtdowling/cron-expression/zipball/fd92e883195e5dfa77720b1868cf084b08be4412", + "reference": "fd92e883195e5dfa77720b1868cf084b08be4412", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "phpunit/phpunit": "4.*" + }, + "type": "library", + "autoload": { + "psr-0": { + "Cron": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "CRON for PHP: Calculate the next or previous run date and determine if a CRON expression is due", + "keywords": [ + "cron", + "schedule" + ], + "time": "2015-01-11 23:07:46" + }, + { + "name": "silverstripe/crontask", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/silverstripe-labs/silverstripe-crontask.git", + "reference": "0db152c8edf448e3ed9797d60e181800ac67ed75" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/silverstripe-labs/silverstripe-crontask/zipball/0db152c8edf448e3ed9797d60e181800ac67ed75", + "reference": "0db152c8edf448e3ed9797d60e181800ac67ed75", + "shasum": "" + }, + "require": { + "mtdowling/cron-expression": "1.0.*", + "silverstripe/framework": "~3.1" + }, + "require-dev": { + "phpunit/phpunit": "~3.7@stable" + }, + "type": "silverstripe-module", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "SilverStripe", + "homepage": "http://silverstripe.com" + }, + { + "name": "The SilverStripe Community", + "homepage": "http://silverstripe.org" + } + ], + "description": "Module for running tasks with a standard cron timeschedule", + "keywords": [ + "cron", + "silverstripe" + ], + "time": "2014-11-20 01:20:17" + }, { "name": "silverstripe/docsviewer", "version": "dev-master", "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-docsviewer.git", - "reference": "2f0cbfe4f675dd3957623055cfbeccd8ebf1bfef" + "reference": "f70d5fde0a2bae46d6ee49779f57249c72b55e69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/2f0cbfe4f675dd3957623055cfbeccd8ebf1bfef", - "reference": "2f0cbfe4f675dd3957623055cfbeccd8ebf1bfef", + "url": "https://api.github.com/repos/silverstripe/silverstripe-docsviewer/zipball/f70d5fde0a2bae46d6ee49779f57249c72b55e69", + "reference": "f70d5fde0a2bae46d6ee49779f57249c72b55e69", "shasum": "" }, "require": { @@ -227,7 +547,48 @@ "documentation", "silverstripe" ], - "time": "2015-11-17 03:04:08" + "time": "2016-01-24 12:24:56" + }, + { + "name": "silverstripe/dynamodb", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/silverstripe/silverstripe-dynamodb.git", + "reference": "1336a57cbb5b8a19abd2b9f67099db9a20aaf8c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/silverstripe/silverstripe-dynamodb/zipball/1336a57cbb5b8a19abd2b9f67099db9a20aaf8c4", + "reference": "1336a57cbb5b8a19abd2b9f67099db9a20aaf8c4", + "shasum": "" + }, + "require": { + "aws/aws-sdk-php": "~2.8.24", + "doctrine/cache": "1.*", + "silverstripe/crontask": "*" + }, + "type": "silverstripe-module", + "extra": { + "installer-name": "silverstripe-dynamodb" + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Stig Lindqvist", + "email": "stig@silverstripe.com" + } + ], + "description": "SilverStripe DynamoDB integration.", + "keywords": [ + "aws", + "dynamodb", + "silverstripe" + ], + "time": "2015-11-23 20:48:17" }, { "name": "silverstripe/framework", @@ -280,16 +641,16 @@ }, { "name": "silverstripe/toolbar", - "version": "4.1.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/silverstripe/silverstripe-globaltoolbar.git", - "reference": "108fc37a26d5c96780a4c4c29a79dbcc79fb9c70" + "reference": "74111995b046d7fffc372ad26b05ee6dfd62604d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/108fc37a26d5c96780a4c4c29a79dbcc79fb9c70", - "reference": "108fc37a26d5c96780a4c4c29a79dbcc79fb9c70", + "url": "https://api.github.com/repos/silverstripe/silverstripe-globaltoolbar/zipball/74111995b046d7fffc372ad26b05ee6dfd62604d", + "reference": "74111995b046d7fffc372ad26b05ee6dfd62604d", "shasum": "" }, "require": { @@ -317,27 +678,87 @@ "silverstripe" ], "support": { - "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/4.1.0", + "source": "https://github.com/silverstripe/silverstripe-globaltoolbar/tree/4.1.1", "issues": "https://github.com/silverstripe/silverstripe-globaltoolbar/issues" }, - "time": "2015-11-03 22:53:02" + "time": "2015-12-07 03:08:14" }, { - "name": "unclecheese/display-logic", - "version": "1.3.1", + "name": "symfony/event-dispatcher", + "version": "v2.8.2", "source": { "type": "git", - "url": "https://github.com/unclecheese/silverstripe-display-logic.git", - "reference": "6f8870aeddc56821d00cabdf6d9d9f040ae90c4c" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "ee278f7c851533e58ca307f66305ccb9188aceda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/unclecheese/silverstripe-display-logic/zipball/6f8870aeddc56821d00cabdf6d9d9f040ae90c4c", - "reference": "6f8870aeddc56821d00cabdf6d9d9f040ae90c4c", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ee278f7c851533e58ca307f66305ccb9188aceda", + "reference": "ee278f7c851533e58ca307f66305ccb9188aceda", "shasum": "" }, "require": { - "silverstripe/framework": "3.2.*" + "php": ">=5.3.9" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~2.0,>=2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.6|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony EventDispatcher Component", + "homepage": "https://symfony.com", + "time": "2016-01-13 10:28:07" + }, + { + "name": "unclecheese/display-logic", + "version": "1.3.2", + "source": { + "type": "git", + "url": "https://github.com/unclecheese/silverstripe-display-logic.git", + "reference": "43a2213c4748c3f56fc91842ab3a4a3b22caacf0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/unclecheese/silverstripe-display-logic/zipball/43a2213c4748c3f56fc91842ab3a4a3b22caacf0", + "reference": "43a2213c4748c3f56fc91842ab3a4a3b22caacf0", + "shasum": "" + }, + "require": { + "silverstripe/framework": "^3.2" }, "replace": { "silverstripe/display-logic": "*" @@ -364,7 +785,7 @@ "logic", "silverstripe" ], - "time": "2015-10-30 08:29:38" + "time": "2015-12-14 22:02:51" } ], "packages-dev": [ @@ -732,16 +1153,16 @@ }, { "name": "symfony/yaml", - "version": "v2.7.6", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "eca9019c88fbe250164affd107bc8057771f3f4d" + "reference": "34c8a4b51e751e7ea869b8262f883d008a2b81b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d", - "reference": "eca9019c88fbe250164affd107bc8057771f3f4d", + "url": "https://api.github.com/repos/symfony/yaml/zipball/34c8a4b51e751e7ea869b8262f883d008a2b81b8", + "reference": "34c8a4b51e751e7ea869b8262f883d008a2b81b8", "shasum": "" }, "require": { @@ -750,13 +1171,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -774,7 +1198,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2016-01-13 10:28:07" } ], "aliases": [], diff --git a/robots.txt b/robots.txt index 1385938..0900ed8 100644 --- a/robots.txt +++ b/robots.txt @@ -1,4 +1,6 @@ User-agent: * -Disallow: /src/ +Disallow: /admin +Disallow: /assets/src Disallow: /en/4.0/ Disallow: /en/3.3/ +Crawl-Delay: 4 \ No newline at end of file