8085 Commits

Author SHA1 Message Date
Oliver de Sousa
c3a989fcd3 Trimmed whitespace for AWS S3 credentials
If you input a name/key to a bucket with a trailing whitespace, it will
respect that trailing whitespace but will then fail to find the bucket.

To resolve this, added a util function to check if it's a string. If so
it will apply the `trim()` function to remove any unwanted whitespace,
else it will return `undefined`.
2019-07-04 09:56:38 +01:00
Alexandre BODIN
6159fd0d56
Merge pull request #3511 from strapi/lauriejim-patch-1
Update Slack badge URL
2019-06-23 20:37:06 +02:00
Jim LAURIE
796d311bd5
Update Slack badge URL 2019-06-22 12:04:17 +02:00
Alexandre BODIN
03be97a363
Merge pull request #3478 from acupajoe/fix/cta/delete-all-or-selected-text
Change CTA label to delete selected entries
2019-06-21 15:40:34 +02:00
Alexandre BODIN
73c9dadbe2
Merge branch 'master' into fix/cta/delete-all-or-selected-text 2019-06-21 15:40:27 +02:00
Alexandre BODIN
033dfda6c7
Merge pull request #3140 from Achder/fixes-#3136
Add the option for a different Amazon SES domain
2019-06-21 14:58:44 +02:00
Alexandre BODIN
92ac6680f0
Merge branch 'master' into fixes-#3136 2019-06-21 14:57:40 +02:00
Alexandre Bodin
eee69452ea v3.0.0-beta.7 v3.0.0-beta.7 2019-06-21 14:34:56 +02:00
Alexandre BODIN
ae5277cd08
Merge pull request #3503 from strapi/chore/ignore-docs-getstarted
Clear exemple strapi-plugin-documentation and add it to gitignore
2019-06-21 14:26:51 +02:00
Alexandre BODIN
2d58f2523e
Merge branch 'master' into chore/ignore-docs-getstarted 2019-06-21 14:26:22 +02:00
Alexandre Bodin
60ed10d1a3 Clean exemplae documentation and add it to gitignore 2019-06-21 14:16:45 +02:00
Alexandre BODIN
5a8b52abac
Merge pull request #3461 from rjlopezdev/master
Update ES translations
2019-06-21 14:16:11 +02:00
Alexandre BODIN
3609e0a53d
Merge branch 'master' into master 2019-06-21 14:16:03 +02:00
Alexandre BODIN
245cb4ab16
Merge pull request #3468 from johnnyshields/patch-1
Update JA translation
2019-06-21 14:15:48 +02:00
Alexandre BODIN
78cb7fe496
Merge branch 'master' into patch-1 2019-06-21 14:14:47 +02:00
Alexandre BODIN
2e8cb52110
Merge pull request #3501 from nicky-lenaers/fix/dutch-translations
Update NL translations
2019-06-21 14:13:52 +02:00
Alexandre BODIN
19b4c23265
Merge branch 'master' into fix/dutch-translations 2019-06-21 14:12:42 +02:00
Alexandre BODIN
176d06295b
Merge branch 'master' into master 2019-06-21 12:09:30 +02:00
Alexandre BODIN
56fb21a235
Merge pull request #3466 from strapi/chore/use-koa-joi-router
Replace koa-router-joi (strapi fork) by original and maintained
2019-06-21 12:08:42 +02:00
Nicky Lenaers
34a93940ff fix: update dutch translations for user flyout menu 2019-06-21 11:45:39 +02:00
Alexandre Bodin
04b4003bf2 chore: replace koa-router-joi (strapi fork) by original and maintained
koa-joi-router

Upgrade some dependencies
2019-06-20 18:28:53 +02:00
Alexandre BODIN
b1eccc05a7
Merge pull request #3488 from strapi/fix/ui-bugs
Fix admin UI bugs
2019-06-20 18:24:47 +02:00
Alexandre BODIN
7c2230bb09
Merge branch 'master' into master 2019-06-20 18:13:07 +02:00
cyril lopez
ecf0a0ae64
Merge branch 'master' into fix/ui-bugs 2019-06-20 08:50:39 +02:00
cyril lopez
b3359a69a4
Merge branch 'master' into fix/cta/delete-all-or-selected-text 2019-06-19 17:50:45 +02:00
Alexandre BODIN
d26ee36121
Merge pull request #3480 from strapi/fix/remove-user-_id-routes
Fix user routes using _id instead of id
2019-06-19 17:45:57 +02:00
Alexandre BODIN
af580f941d
Merge branch 'master' into fix/remove-user-_id-routes 2019-06-19 17:45:46 +02:00
Joseph Schultz
4965d27784 Add missing translations 2019-06-19 08:46:37 -05:00
soupette
b92eb09a42 Fix conflicts 2019-06-19 11:52:35 +02:00
soupette
37ed213b6d Fixes #3472 2019-06-19 11:51:44 +02:00
Alexandre BODIN
364d435e6e
Merge pull request #3485 from strapi/chore/missing-func-call
Call requireBootstrap on init
2019-06-19 09:09:34 +02:00
Alexandre Bodin
f9742ff366 Call the requireBootstrap on init 2019-06-19 08:45:10 +02:00
Alexandre Bodin
1daf9b587a Fix package.json in examples 2019-06-18 20:31:18 +02:00
Alexandre Bodin
754acd0280 Fix user routes using _id instead of id
- Add database.js and DB env to example app to test on different dbs
quickly
2019-06-18 18:33:53 +02:00
Joseph Schultz
fb004eb272 Fixes #3470
Caveats:
- Missing translations
- "Delete All" only counts for what is on the current page as opposed to total records in the database. I've seen this rendered both ways out in the wild
2019-06-18 08:01:16 -05:00
Alexandre Bodin
76d9fe8060 v3.0.0-beta.6 v3.0.0-beta.6 2019-06-18 14:54:45 +02:00
Alexandre BODIN
62dfd1f553
Merge pull request #3460 from strapi/fix/issue-3455
Only use keys from settings.json to create documentation files
2019-06-18 09:42:42 +02:00
Alexandre BODIN
74b26f9c0e
Merge branch 'master' into fix/issue-3455 2019-06-18 09:42:26 +02:00
Alexandre BODIN
f7c8e0a49a
Merge pull request #3452 from fredrivett/master
Fix wording of welcome text
2019-06-18 09:41:20 +02:00
Alexandre BODIN
3bbdeb5c87
Merge branch 'master' into master 2019-06-18 09:41:05 +02:00
Alexandre BODIN
512be7d155
Merge pull request #3459 from strapi/fix/allow-any-envrionment
Allow different envrionment names on config load
2019-06-18 09:40:02 +02:00
Alexandre BODIN
6015444f30
Merge branch 'master' into fix/allow-any-envrionment 2019-06-18 09:39:49 +02:00
Alexandre BODIN
9386f5e66a
Merge pull request #3435 from strapi/tech/init-gitlab-ci
Init gitlab ci trigger
2019-06-17 18:21:11 +02:00
Alexandre BODIN
06312643b0
Merge branch 'master' into tech/init-gitlab-ci 2019-06-17 18:21:02 +02:00
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