33691 Commits

Author SHA1 Message Date
Jim LAURIE
7d9cbb75f2
Merge branch 'master' into master 2018-12-23 21:02:44 +01:00
Abdón Rodríguez Davila
7d039644fa Check if plugins.json exists 2018-12-23 17:02:45 +01:00
Abdón Rodríguez Davila
809ecb6a69
Merge branch 'master' into fix-gae-deploy 2018-12-23 16:42:31 +01:00
Jim LAURIE
d35211a054
Merge pull request #2529 from Palivonas/patch-1
Fix anchor in link from i18n guide to concepts
2018-12-23 14:53:04 +01:00
Jim LAURIE
53dd67340e
Merge branch 'master' into patch-1 2018-12-23 14:52:58 +01:00
Jim LAURIE
4886538212
Merge pull request #2528 from devdavecman/patch-1
Fix spelling mistake
2018-12-23 14:48:22 +01:00
Andrius Palivonas
73b65abf77
Fix anchor in i18n concepts links 2018-12-23 13:14:13 +02:00
devdavecman
7d05e098f9
fix spelling mistake
change line 88 from "[...] returned objects is formatted [...]" to "[...] returned objects are formatted [...]"
2018-12-23 09:21:28 +01:00
Amin Zibayi
ec7c2f9d78
Improve text quality 2018-12-22 15:21:22 +03:30
Jim LAURIE
335503b67a
Merge pull request #2485 from strapi/fix/2437
Add support for Apollo server tracing in GraphQL
2018-12-21 17:00:42 +01:00
Jim LAURIE
da501688cb
Merge branch 'master' into fix/2437 2018-12-21 17:00:33 +01:00
Amin Zibayi
12a15f4d9f
Update quick start documentation 2018-12-21 19:03:54 +03:30
Jim LAURIE
9f147324b1
Merge pull request #2489 from KempfCreative/bugfix/plugin-documentation-readme
Plugin Quick Start does not work as expected
2018-12-21 12:59:51 +01:00
cupofnestor
e82d755194
Merge pull request #2 from strapi/master
up to 1.7
2018-12-20 14:43:57 -05:00
Michael Barajas
cbcd8749a3
Updated models to document mongodbs index 2018-12-19 14:40:33 -05:00
Abdón Rodríguez Davila
df162c1387 Avoid write actions.json if not development environment 2018-12-19 19:42:10 +01:00
Abdón Rodríguez Davila
a5dc07c0a5 Avoid write files if not development environment 2018-12-19 19:25:52 +01:00
gianca970226
a22d7010a3
Merge branch 'master' into master 2018-12-19 07:34:24 -05:00
Jonathan Kempf
8c01331176 Merge branch 'master' of https://github.com/strapi/strapi into bugfix/plugin-documentation-readme 2018-12-18 10:31:46 -05:00
Jim LAURIE
1233d5fac9
Merge pull request #2509 from strapi/3.0.0-alpha.17
3.0.0-alpha.17
2018-12-18 15:27:50 +01:00
Jim LAURIE
d6e1c8fc02 Fix publish documentation plugin 2018-12-18 15:18:00 +01:00
Jim LAURIE
e48204bc75 Add migration guide from alpha.16 to alpha.17 2018-12-18 14:54:51 +01:00
gianca970226
66b5607351
Merge branch 'master' into master 2018-12-18 08:46:41 -05:00
Jim LAURIE
fd3ae96498 3.0.0-alpha.17 v3.0.0-alpha.17 2018-12-18 14:37:15 +01:00
almera
240639137b Merge branch 'master' of https://github.com/gianca970224/strapi 2018-12-18 08:26:31 -05:00
almera
eb8b166afa Fix indent 2018-12-18 08:26:01 -05:00
Jim LAURIE
1196ef7a1d
Merge pull request #2501 from strapi/readme-middleware-views
Update readme middleware views
2018-12-18 14:15:20 +01:00
Jim LAURIE
e6bb1f0c40
Merge branch 'master' into readme-middleware-views 2018-12-18 14:15:11 +01:00
Jim LAURIE
1b440b332e
fix view(s) 2018-12-18 14:08:42 +01:00
Jim LAURIE
9d07608936
Merge pull request #2508 from strapi/git/userRepo
Add a place for users to link their project in Issue Template
2018-12-18 14:03:45 +01:00
gianca970226
b1dde140ac
Merge branch 'master' into master 2018-12-18 08:02:50 -05:00
almera
2523263d5a Fix indent 2018-12-18 07:58:06 -05:00
DMehaffy
7854c2bf65 Add a place for users to link their project 2018-12-18 02:52:57 -07:00
Nick Verwymeren
7ea6950968
added noted for fish shell users
Trying to carry out the steps here in fish shell will result in the symlinks being incorrectly interpreted by Strapi at run time. Added a message here to make sure fish shell users don't spend a bunch of time trying to debug their setup (as I did).
2018-12-17 15:47:59 -06:00
almera
974c748cf8 Change split for REGEX and return * when in array exist 2018-12-17 15:34:51 -05:00
almera
d31447ad93 Change split for REGEX and return * when in array exist 2018-12-17 15:13:38 -05:00
gianca970226
be585f6e17
Merge branch 'master' into master 2018-12-17 14:07:59 -05:00
Jim LAURIE
4060370868
Merge pull request #2442 from strapi/plugin-documentation
Plugin documentation
2018-12-17 18:00:57 +01:00
Jim LAURIE
d394fb42ac
Fix lint 2018-12-17 17:42:36 +01:00
Jim LAURIE
6ebd33818e
Merge branch 'master' into master 2018-12-17 16:36:50 +01:00
Jim LAURIE
f87ebea759
Merge branch 'master' into plugin-documentation 2018-12-17 16:22:03 +01:00
Jonathan Kempf
99e7d5af8e Merge branch 'master' of https://github.com/strapi/strapi into bugfix/plugin-documentation-readme 2018-12-17 08:28:58 -05:00
Jim LAURIE
cc3cfc4915 Update readme middleware views 2018-12-17 14:20:13 +01:00
Michael Barajas
012b0c5e0c Updated documentation for model indexing 2018-12-16 14:46:22 -05:00
Jim LAURIE
4466338701
Merge pull request #2493 from strapi/remove-snyk-travis
Remove snyk from Travis
2018-12-15 11:41:37 +01:00
Jim LAURIE
3a6adadc4c
Remove snyk from Travis 2018-12-15 11:39:47 +01:00
Jonathan Kempf
0c936d6970 Bugfix - Plugin Quick Start does not work as expected
If a user follows the directions in the plugin documentation quick start, several errors will show up, as documented in:

https://github.com/strapi/strapi/issues/1116
https://github.com/strapi/strapi/issues/1972

This updates the documentation so that a user new to the project will be able to have success. It follows the comments from https://github.com/strapi/strapi/issues/1972#issuecomment-422321650 & https://github.com/strapi/strapi/issues/1116#issuecomment-386710389 to re-write the docs to match expected behavior.
2018-12-14 15:38:37 -05:00
Jim LAURIE
d6fa0ebde9
Merge branch 'master' into fix-boom-duplicate-error 2018-12-14 17:37:00 +01:00
Jim LAURIE
2ce32670cd
Merge branch 'master' into fix/2437 2018-12-14 17:36:41 +01:00
Jim LAURIE
c4bc319e63
Merge branch 'master' into master 2018-12-14 17:18:34 +01:00