33691 Commits

Author SHA1 Message Date
Virginie Ky
a9ed507ec1 Merge branch 'master' of github.com:strapi/strapi into develop 2020-01-28 17:58:18 +01:00
Virginie Ky
39bf80a6dc Popup warning UI
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-28 17:54:01 +01:00
Virginie Ky
dd96bc90fa Snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-28 16:07:01 +01:00
Alexandre BODIN
64747e8a1e
Merge branch 'master' into fix/graphql-multi-query-issues 2020-01-28 13:48:47 +01:00
Alexandre Bodin
6c738dd7c9 Clone response too to avoid inconsistencies in muti query responses
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-27 23:12:15 +01:00
Virginie Ky
b25daf2163 Snapshots with globalcontext and translation
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-27 18:32:57 +01:00
Alexandre BODIN
b37b62b6bc
Merge pull request #5098 from strapi/fix/5092
Fix cron reference documentation
2020-01-27 16:50:24 +01:00
Alexandre BODIN
a8fbccafdf
Merge branch 'master' into fix/5092 2020-01-27 16:50:11 +01:00
Alexandre BODIN
9383be5e2c
Merge pull request #5102 from Atinux/patch-1
[Docs] Fix typo in webhooks
2020-01-27 16:50:00 +01:00
Alexandre BODIN
3f85987631
Merge branch 'master' into fix/5092 2020-01-27 16:48:52 +01:00
Sébastien Chopin
6a85969adb [Docs] Fix typo in webhooks
Signed-off-by: Sébastien Chopin <seb@nuxtjs.com>
2020-01-27 16:17:28 +01:00
Alexandre BODIN
3c59a05154
Merge pull request #5100 from strapi/fix/main-field-exclude-id
Fix main field set to id on mongo
2020-01-27 12:14:16 +01:00
Alexandre BODIN
bd86969270
Merge pull request #5085 from strapi/chore/eslint
Cleanup eslint configs
2020-01-27 11:07:12 +01:00
Alexandre Bodin
4f5a0e7679 Cleanup eslint configs
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-27 10:49:57 +01:00
cyril lopez
d96603e488
Merge branch 'master' into fix/5038 2020-01-27 10:17:56 +01:00
Alexandre BODIN
c4898aa803
Merge pull request #5062 from batuhankok/strapi-tr
Turkish translations updated
2020-01-27 10:11:28 +01:00
soupette
b318f77050 Fix PR feedback
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-27 09:55:40 +01:00
Alexandre Bodin
d0c26fef67 Fix main field set to id on mongo
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-27 09:53:19 +01:00
soupette
1af0941392 Merge branch 'fix/5038' of github.com:strapi/strapi into fix/5038 2020-01-27 09:44:26 +01:00
soupette
0b81207d74 Merge branch 'master' of github.com:strapi/strapi into fix/5038 2020-01-27 09:43:49 +01:00
Derrick Mehaffy
1edd2f9442 Fix cron reference documentation
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>

Based on the Cron-Style listed in `node-schedule`: https://www.npmjs.com/package/node-schedule#cron-style-scheduling
2020-01-27 00:56:09 -07:00
Ky
5a3d8b8dec Editview snapshot test
Signed-off-by: Ky <virginie.ky@gmail.com>
2020-01-27 00:00:31 +01:00
Gambhiro
6649473210 link 2020-01-25 07:21:25 +00:00
Gambhiro
fd1e553645 edit 2020-01-25 07:20:30 +00:00
Gambhiro
2e9e8b8089 deploy to google app engine 2020-01-24 19:44:34 +00:00
Batuhan Kök
3329fba10d
Merge branch 'master' into strapi-tr 2020-01-24 13:17:15 +03:00
virginieky
688f9fc535
Merge branch 'develop' into front/ui-improvements 2020-01-24 11:00:40 +01:00
cyril lopez
e643cc0443
Merge pull request #5068 from strapi/front/notifications
Notifications UI fix
2020-01-24 10:58:24 +01:00
cyril lopez
226adbff33
Merge branch 'master' into fix/5038 2020-01-24 10:56:59 +01:00
cyril lopez
aa17c3cc5a
Merge pull request #5060 from strapi/front/users-permissions
Leftmenu static links
2020-01-24 10:55:15 +01:00
soupette
6dfde6b1f4 Fix PR feedback
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-24 10:47:22 +01:00
soupette
5ba0f5b88a Merge branch 'master' of github.com:strapi/strapi into doc/plugin-development 2020-01-24 10:46:20 +01:00
cyril lopez
7828986b44
Merge pull request #5073 from strapi/chore/improve-ctm-dom-perf
Fixes #5054
2020-01-24 10:44:41 +01:00
cyril lopez
723ba1baa3
Merge branch 'master' into chore/improve-ctm-dom-perf 2020-01-24 10:12:03 +01:00
cyril lopez
93060bf3be
Merge pull request #5076 from strapi/core/admin-change-load-plugin
Change the way we load plugins in the admin
2020-01-24 10:11:48 +01:00
Batuhan Kök
574b618fea
Merge branch 'master' into strapi-tr 2020-01-24 08:24:45 +03:00
Jim LAURIE
6dc5617fff
Merge pull request #5035 from DaiAoki/chore/fix-docs-tutorial
Typo fix quick-start-tutorial.md document
2020-01-24 00:06:49 +01:00
Jim LAURIE
904eadc8fa
Merge branch 'master' into chore/fix-docs-tutorial 2020-01-24 00:06:37 +01:00
Jim LAURIE
b730fd11db
Merge pull request #5043 from aplr/patch-1
Fix production.html
2020-01-23 23:59:36 +01:00
Jim LAURIE
8beb92f8c9
Merge branch 'master' into patch-1 2020-01-23 23:58:31 +01:00
Alexandre Bodin
e8f5d46d06 Create realted_col for self referencing many ways
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-23 23:34:28 +01:00
soupette
96e092b300 Change the way we load plugins
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-23 16:46:50 +01:00
soupette
2f9eeee0c2 Update buffet
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-23 15:56:38 +01:00
soupette
af4bee9b8e Fixes #5054
Signed-off-by: soupette <>
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-01-23 15:44:47 +01:00
virginieky
87b62706f9
Merge branch 'master' into webhooks/tests 2020-01-23 15:17:37 +01:00
Virginie Ky
4666339f88 apply review
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-23 15:03:46 +01:00
Virginie Ky
1e65ccffdc border
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-23 09:43:57 +01:00
Virginie Ky
002ef5f99e notifications UI fix
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
2020-01-23 09:36:25 +01:00
Batuhan Kök
96bd2c8d41
Merge branch 'master' into strapi-tr 2020-01-23 11:05:03 +03:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00