9424 Commits

Author SHA1 Message Date
Fred Rivett
54fbe9cf0f Fix wording of welcome text
The wording here is important as it's one of the first things the user
sees of the Strapi project having set it up, and it didn't quite make
sense (though everyone will understand what's meant to be said).

Tweaking this will improve the initial user experience of Strapi.
2019-06-17 10:58:46 +01:00
Alexandre BODIN
01ec660ad0
Merge branch 'master' into fixes-#3136 2019-06-16 19:44:50 +02:00
Alexandre BODIN
2537401ed9
Merge pull request #3464 from strapi/dmehaffy/readmeUpdate
Update NPM Badge on Readme to Beta
2019-06-16 19:38:50 +02:00
Alexandre BODIN
58c2791b22
Merge branch 'master' into dmehaffy/readmeUpdate 2019-06-16 19:38:07 +02:00
Alexandre BODIN
22cc82f175
Merge pull request #3469 from ta7sudan/fix/null-pointer-crash
Fix crash caused by strapi-plugin-users-permissions
2019-06-16 19:36:42 +02:00
ta7sudan
7b3737c90c fix(strapi-plugin-users-permissions): fix when connecting to marketplace error cause app crash 2019-06-17 00:02:27 +08:00
Johnny Shields
fb2f2c423b
Update Japanese translations 2019-06-16 21:55:41 +09:00
Alexandre Bodin
c5dc672cc7 Only use keys from settings.json to create documentation files, fix array concat only for routes in extensions 2019-06-16 14:44:24 +02:00
Alexandre Bodin
8144e7b5bd Allow different envrionment names 2019-06-16 14:43:59 +02:00
Alexandre BODIN
8bc172d535
Merge pull request #3080 from Bishop/patch-1
Mailgun: possibility to configure api host
2019-06-16 14:41:06 +02:00
Alexandre Bodin
3a93607612 Merge branch 'Bishop-patch-1' 2019-06-16 14:38:47 +02:00
Alexandr
4abb423b0c Possibility to configure api host
Mailgun has two api endpoints: api.eu.mailgun.net and api.mailgun.net (default). We should have possibility to configure it.
2019-06-16 14:38:40 +02:00
Derrick Mehaffy
5baa505a9f Update NPM Badge on Readme to Beta 2019-06-15 05:58:45 -07:00
Raúl Julián López Caña
780febce3e Spanish Translations 2019-06-15 02:48:48 +02:00
Alexandre BODIN
5dd0cadafe
Merge pull request #3438 from mdibaiee/fix/bookshelf-delete-query
Fix strapi.query.delete passing invalid property to  bookshelf
2019-06-15 00:14:54 +02:00
Alexandre BODIN
fdf6defa02
Merge branch 'master' into fix/bookshelf-delete-query 2019-06-15 00:14:47 +02:00
Alexandre BODIN
fb5361a562
Merge pull request #3371 from bromso/patch-2
Update description and keyword of the package strapi
2019-06-15 00:11:42 +02:00
Alexandre BODIN
a587f43795
Update package.json 2019-06-15 00:04:25 +02:00
Alexandre BODIN
2b5606a6e8
Merge branch 'master' into patch-2 2019-06-15 00:00:44 +02:00
Alexandre BODIN
4fcec911c9
Update package.json 2019-06-14 23:59:02 +02:00
Alexandre BODIN
8bcefe06f2
Merge branch 'master' into fix/bookshelf-delete-query 2019-06-14 23:56:38 +02:00
Alexandre BODIN
2b4cb0757b
Merge pull request #3439 from dkarski/patch-1
Fix curl request example in documentation
2019-06-14 23:54:54 +02:00
Alexandre BODIN
e6d6ec2c2b
Merge branch 'master' into patch-1 2019-06-14 23:54:44 +02:00
Alexandre BODIN
45743db5fd
Merge branch 'master' into fix/bookshelf-delete-query 2019-06-14 23:46:21 +02:00
Alexandre BODIN
f673f78681
Merge pull request #3444 from patnym/fix/doc_error
Improve example in the documentation
2019-06-14 23:43:43 +02:00
Alexandre BODIN
e29dc8ce75
Merge branch 'master' into fix/doc_error 2019-06-14 23:43:08 +02:00
Alexandre BODIN
0fc7b72c42
Merge pull request #3453 from strapi/tech/require-bootstrap-file-first
Requiring bootstrap.js before config loading
2019-06-14 23:40:12 +02:00
Alexandre BODIN
497f109b35
Merge branch 'master' into tech/require-bootstrap-file-first 2019-06-14 23:39:29 +02:00
Alexandre BODIN
b2790e68fc
Merge pull request #3450 from davidkarlsson0/master
Improve CLI documentation
2019-06-14 23:25:31 +02:00
Alexandre BODIN
682e635174
Merge branch 'master' into master 2019-06-14 23:25:18 +02:00
Alexandre BODIN
654884f957
Merge pull request #3458 from dsvgit/patch-1
Fix typo in documentation
2019-06-14 23:20:50 +02:00
Sergey Dedkov
6da1253863
Update service.md
youc an -> you can
2019-06-14 23:28:08 +03:00
davidkartuzinski
0b0dce1375 Added Tabs for the O/S section and fixed a typo 2019-06-14 18:59:52 +02:00
davidkartuzinski
5f02286fa8 Modified all Quick Start tutorial and replaced all images for Beta - in tutorial 2019-06-14 18:53:32 +02:00
Alexandre Bodin
2d676c0b60 Require bootstrap.js so people can setup global modules like dotenv 2019-06-14 18:13:25 +02:00
Alexandre BODIN
4f642c9c80
Merge pull request #3443 from strapi/fix/documentation-settings
Fix documentation load settings
2019-06-14 14:53:17 +02:00
davidkartuzinski
97c0cab131 Revised Quick Start Video and Revisions to Quick Start Guide 2019-06-14 14:47:18 +02:00
David Karlsson
0a820059f8 (docs) CLI description
Minor editorial changes.
2019-06-14 13:42:11 +02:00
Patrik Nyman
c550d2f606
Doc fixed an error in model concepts 2019-06-13 21:33:39 +02:00
Virginie Ky
ecd2356ea5 resolve conflict 2019-06-13 18:25:24 +02:00
Virginie Ky
b595f64d3a Groups data formatting utils 2019-06-13 18:24:03 +02:00
Virginie Ky
86dac6a2ab Groups data formatting utils 2019-06-13 18:23:24 +02:00
soupette
28c9339ace Finish Homepage 2019-06-13 18:20:51 +02:00
Alexandre BODIN
9eafb79b35
Merge branch 'master' into fix/documentation-settings 2019-06-13 17:45:59 +02:00
Alexandre Bodin
4ec50ca3fc v3.0.0-beta.5 v3.0.0-beta.5 2019-06-13 17:19:33 +02:00
Alexandre BODIN
cc283a506a
Merge pull request #3442 from strapi/tech/strapi-new-no-build
Remove strapi build on new
2019-06-13 17:14:18 +02:00
Jim LAURIE
2b092ada12 Fix load settings 2019-06-13 17:12:49 +02:00
Alexandre Bodin
583daa40cb Remove unnecessary log 2019-06-13 16:55:21 +02:00
Alexandre Bodin
04032d8a9e Fix unused config param 2019-06-13 16:47:42 +02:00
Virginie Ky
2a46430ac5 Init ViewContainer 2019-06-13 16:10:19 +02:00