coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:outline/outline into zapier

Browse Source
This commit is contained in:
Tom Moor
2018-09-30 17:37:35 -07:00
parent b36977cf80 3f0202f660
commit f284dd1ebf
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/routes.js
View File

@ -67,15 +67,15 @@ export default function Routes() {
path={`/doc/${slug}/history/:revisionId?`} path={`/doc/${slug}/history/:revisionId?`}
component={Document} component={Document}
/> />
<Route path={`/doc/${slug}`} component={Document} />
<Route exact path="/search" component={Search} />
<Route exact path="/search/:query" component={Search} />
<Route path="/404" component={Error404} />
<RouteSidebarHidden <RouteSidebarHidden
exact exact
path={`/doc/${slug}/edit`} path={`/doc/${slug}/edit`}
component={Document} component={Document}
/> />
<Route path={`/doc/${slug}`} component={Document} />
<Route exact path="/search" component={Search} />
<Route exact path="/search/:query" component={Search} />
<Route path="/404" component={Error404} />
<RouteSidebarHidden <RouteSidebarHidden
exact exact
path="/collections/:id/new" path="/collections/:id/new"

2
package.json
View File

@ -159,7 +159,7 @@
"react-waypoint": "^7.3.1", "react-waypoint": "^7.3.1",
"redis": "^2.6.2", "redis": "^2.6.2",
"redis-lock": "^0.1.0", "redis-lock": "^0.1.0",
"rich-markdown-editor": "5.0.4", "rich-markdown-editor": "5.0.3",
"safestart": "1.1.0", "safestart": "1.1.0",
"sequelize": "4.28.6", "sequelize": "4.28.6",
"sequelize-cli": "^2.7.0", "sequelize-cli": "^2.7.0",

6
yarn.lock
View File

@ -8850,9 +8850,9 @@ retry-axios@0.3.2, retry-axios@^0.3.2:
version "0.3.2" version "0.3.2"
resolved "https://registry.yarnpkg.com/retry-axios/-/retry-axios-0.3.2.tgz#5757c80f585b4cc4c4986aa2ffd47a60c6d35e13" resolved "https://registry.yarnpkg.com/retry-axios/-/retry-axios-0.3.2.tgz#5757c80f585b4cc4c4986aa2ffd47a60c6d35e13"
rich-markdown-editor@5.0.4: rich-markdown-editor@5.0.3:
version "5.0.4" version "5.0.3"
resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-5.0.4.tgz#0ae4624b95ec836486712ffda17090422fdc5e90" resolved "https://registry.yarnpkg.com/rich-markdown-editor/-/rich-markdown-editor-5.0.3.tgz#6503328518419abef89e00548efceb54a57608c7"
dependencies: dependencies:
"@tommoor/slate-drop-or-paste-images" "^0.8.1" "@tommoor/slate-drop-or-paste-images" "^0.8.1"
babel-plugin-transform-async-to-generator "^6.24.1" babel-plugin-transform-async-to-generator "^6.24.1"