Daniel Kvistgaard
|
96345d9f38
|
Merge remote-tracking branch 'upstream/master' into bugfix/cloudinary-delete-resource-type
|
2019-09-10 16:04:02 +02:00 |
|
Alexandre BODIN
|
20f42752aa
|
Merge pull request #3934 from strapi/fix/permissions-deletion
Fix permission deletion on start + default transaction for create and update query
|
2019-09-10 16:02:39 +02:00 |
|
Alexandre Bodin
|
522014cf3d
|
Allow multiple origins to be provided to the cors middleware, array or coma separated
|
2019-09-10 15:46:07 +02:00 |
|
Alexandre Bodin
|
c23c2583ab
|
Make sure the relation update is done in a transaction with simple default create and update
|
2019-09-10 14:47:18 +02:00 |
|
Alexandre Bodin
|
5a4b24a636
|
Fix permission deletion deleting only on role permission on controller delete
|
2019-09-10 14:47:18 +02:00 |
|
Alexandre BODIN
|
5bf43302a3
|
Merge pull request #3944 from strapi/fix/image-upload-mongo
Use kind when provided on morph relation
|
2019-09-10 14:45:31 +02:00 |
|
soupette
|
61a22c3a9b
|
Fixes #3677
|
2019-09-10 12:33:21 +02:00 |
|
soupette
|
55ea54608d
|
Merge branch 'master' of github.com:strapi/strapi into front/auth-views
|
2019-09-10 12:19:54 +02:00 |
|
soupette
|
869cde8f19
|
Fix rerender issue in the admin
|
2019-09-10 12:14:07 +02:00 |
|
Alexandre Bodin
|
25bf0e4ca8
|
Use kind when provided on morph relation
|
2019-09-10 11:05:57 +02:00 |
|
soupette
|
c5fd30e314
|
Fix WYSIWYG preview
|
2019-09-10 10:39:57 +02:00 |
|
soupette
|
1e26065d95
|
Clean code and fix tests
|
2019-09-10 10:37:02 +02:00 |
|
赵兵
|
d02642e0e3
|
Merge branch 'patch-1' of https://github.com/binggg/strapi into patch-1
|
2019-09-10 16:27:03 +08:00 |
|
赵兵
|
04523d9637
|
Fix package.json wrong update
|
2019-09-10 16:26:59 +08:00 |
|
Alexandre BODIN
|
0c3bba055b
|
Merge branch 'master' into patch-1
|
2019-09-10 10:22:41 +02:00 |
|
赵兵
|
a462fab945
|
Merge remote-tracking branch 'upstream/master' into patch-1
|
2019-09-10 16:14:38 +08:00 |
|
Alexandre BODIN
|
c0794549a5
|
Merge pull request #3930 from websocket98765/patch-1
Fix comma in JSON example
|
2019-09-10 10:08:17 +02:00 |
|
Alexandre BODIN
|
d560fa9e89
|
Merge branch 'master' into patch-1
|
2019-09-10 10:08:04 +02:00 |
|
Alexandre BODIN
|
5b3e1c719a
|
Merge pull request #3932 from tsheils/patch-1
Update migration-guide-beta.15-to-beta.16.md
|
2019-09-10 10:07:11 +02:00 |
|
Alexandre BODIN
|
7b7f2a4bfa
|
Merge branch 'master' into patch-1
|
2019-09-10 10:06:57 +02:00 |
|
soupette
|
b7b8e368a2
|
Fixes #3942
|
2019-09-10 09:06:26 +02:00 |
|
Peter Zhao
|
b3a6ad4f23
|
Add zh-Hans translations of new feature
|
2019-09-10 14:29:03 +08:00 |
|
Alexandre BODIN
|
c0b085e5f4
|
Merge branch 'master' into patch-1
|
2019-09-10 00:33:07 +02:00 |
|
Alexandre BODIN
|
435a0679d7
|
Merge pull request #3938 from websocket98765/websocket98765-patch-enjson-fix
Fix typo in en.json
|
2019-09-10 00:32:30 +02:00 |
|
websocket98765
|
71b2993f33
|
Fix typo in en.json
Fixs `Make you sure you understand` to `Make sure you understand`.
|
2019-09-09 22:29:02 +00:00 |
|
sheva
|
4d20d657db
|
Adding custom travis configuration for utf-8
|
2019-09-09 23:30:07 +02:00 |
|
sheva
|
dade405e0c
|
Removing utf8mb4
|
2019-09-09 23:01:50 +02:00 |
|
sheva
|
2462958aff
|
Updating bookshelf after merge v.3.0.0-beta.16
|
2019-09-09 22:16:01 +02:00 |
|
sheva
|
23b4b91fe3
|
Merge branch 'master' into fix/3874-bookshelf-unicode-fix
# Conflicts:
# packages/strapi/lib/core-api/queries/bookshelf.js
|
2019-09-09 21:29:53 +02:00 |
|
Tim Sheils
|
08d4797754
|
Update migration-guide-beta.15-to-beta.16.md
minor grammatical/readibility changes
|
2019-09-09 14:12:34 -04:00 |
|
websocket98765
|
dbf977184d
|
Fix comma in JSON example
|
2019-09-09 17:46:32 +00:00 |
|
davidkartuzinski
|
464ad872a5
|
standardized punctuation for steps, and replaced two images
|
2019-09-09 19:15:18 +02:00 |
|
soupette
|
b3bc4a0941
|
Remove willSecure and didGetSecured data hooks
|
2019-09-09 18:44:41 +02:00 |
|
Alexandre BODIN
|
eec3acfa63
|
Merge pull request #3923 from strapi/front/qa
Content manager update field infos display on editview
|
2019-09-09 17:47:43 +02:00 |
|
Alexandre BODIN
|
32d3df8fbb
|
Merge branch 'master' into front/qa
|
2019-09-09 17:46:59 +02:00 |
|
davidkartuzinski
|
4a87d83887
|
Fix conflict
|
2019-09-09 17:42:39 +02:00 |
|
soupette
|
76560a1c9c
|
Merge branch 'master' of github.com:strapi/strapi into front/auth-views
|
2019-09-09 17:29:47 +02:00 |
|
Virginie Ky
|
01045a5a1b
|
content manager update field infos on editview UI fix
|
2019-09-09 17:23:56 +02:00 |
|
soupette
|
8485657342
|
Move global data to the app container and update plugins
|
2019-09-09 17:12:01 +02:00 |
|
Virginie Ky
|
a60f1d1ba0
|
qa fixes
|
2019-09-09 16:56:46 +02:00 |
|
Alexandre BODIN
|
67478ffdd7
|
Merge branch 'master' into eslint-update
|
2019-09-09 16:51:51 +02:00 |
|
Abdón Rodríguez Davila
|
d4b72a958c
|
Merge branch 'master' into eslint-update
# Conflicts:
# yarn.lock
|
2019-09-09 16:45:56 +02:00 |
|
soupette
|
22bf28431f
|
Use global props instead of admin s ones
|
2019-09-09 16:45:25 +02:00 |
|
Alexandre BODIN
|
7fe97b3e54
|
Merge pull request #3892 from shabab477/bugfix/cli-creating-extra-model-folder
Fix issue with duplicate model folder getting created when generating model with api option
|
2019-09-09 16:45:22 +02:00 |
|
Alexandre BODIN
|
1a9f4e8e59
|
Merge branch 'master' into bugfix/cli-creating-extra-model-folder
|
2019-09-09 16:45:15 +02:00 |
|
Alexandre BODIN
|
d3cf6fd613
|
Merge pull request #3855 from abdonrd/koa-update
Update koa dependencies
|
2019-09-09 16:41:45 +02:00 |
|
davidkartuzinski
|
ace4c2439a
|
Returns on PR fixed
|
2019-09-09 16:27:42 +02:00 |
|
soupette
|
e1b0f07655
|
Global single request
|
2019-09-09 16:06:54 +02:00 |
|
Abdón Rodríguez Davila
|
315399527a
|
Fix missed lint error
|
2019-09-09 15:32:02 +02:00 |
|
Abdón Rodríguez Davila
|
118691808b
|
Update ESLint to v6.3
|
2019-09-09 15:28:59 +02:00 |
|