Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX Add core SS4 modules #39

Merged
merged 2 commits into from
Jun 26, 2017
Merged

FIX Add core SS4 modules #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90f7fdf
FIX Add core SS4 modules
robbieaverill Jun 26, 2017
2854ebb
FIX Remove GraphQL example code
robbieaverill Jun 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,5 @@ Examples:
* `/search/lookup.php?q=DataObject`: Shows `DataObject` docs in `trunk` version of framework
* `/search/lookup.php?q=DataObject::get()&version=3.0`: Shows `DataObject::get()` docs in `3.0` version of framework
* `/search/lookup.php?q=DataObject::get()&version=3.0`: Shows `DataObject::get()` docs in `3.6` version of framework (or whatever is the latest stable minor version)
* `/search/lookup.php?q=DPSPayment&module=payemnt`: Shows `DPSPayment` class docs in the `ecommerce` module
* `/search/lookup.php?q=DPSPayment&module=payment`: Shows `DPSPayment` class docs in the `ecommerce` module
* `/search/lookup.php?q=SilverStripe\ORM\DataExtension::onBeforeWrite()&version=4`: Shows `SilverStripe\ORM\DataExtension::onBeforeWrite()` docs in `master` (4.x) version of framework
2 changes: 1 addition & 1 deletion conf/apigen/apigen.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mask to exclude file or directory from processing
exclude: ['*/tests/*', '*/thirdparty/*', '*/lang/*']
exclude: ['*/tests/*', '*/thirdparty/*', '*/lang/*', '*/examples/*']

# Grouping of classes
groups: packages
Expand Down
9 changes: 8 additions & 1 deletion makedoc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,17 @@ function generate {
mkdir -p "$STORAGE_DIR"

# master
checkout 'git://github.com/silverstripe/silverstripe-admin.git' 'master' 'admin'
checkout 'git://github.com/silverstripe/silverstripe-asset-admin.git' 'master' 'asset-admin'
checkout 'git://github.com/silverstripe/silverstripe-assets.git' 'master' 'assets'
checkout 'git://github.com/silverstripe/silverstripe-campaign-admin.git' 'master' 'campaign-admin'
checkout 'git://github.com/silverstripe/silverstripe-cms.git' 'master' 'cms'
checkout 'git://github.com/silverstripe/silverstripe-config.git' 'master' 'config'
checkout 'git://github.com/silverstripe/silverstripe-framework.git' 'master' 'framework'
checkout 'git://github.com/silverstripe/silverstripe-siteconfig.git' 'master' 'siteconfig'
checkout 'git://github.com/silverstripe/silverstripe-graphql.git' 'master' 'graphql'
checkout 'git://github.com/silverstripe/silverstripe-reports.git' 'master' 'reports'
checkout 'git://github.com/silverstripe/silverstripe-siteconfig.git' 'master' 'siteconfig'
checkout 'git://github.com/silverstripe/silverstripe-versioned.git' 'master' 'versioned'
generate 'master' 'SilverStripe master API Docs'

# 3.6
Expand Down
2 changes: 1 addition & 1 deletion src/Lookup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function handle($return = false)
{
$paths = array();

// Only include modules path if we're not request core.
// Only include modules path if we're not requesting core.
if ($this->getArg('module') && !in_array($this->getArg('module'), array('cms', 'framework', 'sapphire'))) {
$paths[] = 'modules/' . $this->getArg('module');
}
Expand Down