33691 Commits

Author SHA1 Message Date
Alexandre Bodin
2311f7de3d Done 2019-06-11 17:53:01 +02:00
Alexandre Bodin
d9b396821d Fix primaryKey not found for custom resolvers 2019-06-11 15:01:46 +02:00
Alexandre BODIN
243f425fe9
Merge pull request #3422 from strapi/fix/graphql-amount-limiting
Fix amountLimit in graphql queries
2019-06-11 14:59:09 +02:00
Alexandre Bodin
3104204e20 Fix amountLimit in graphql queries 2019-06-11 13:56:24 +02:00
Virginie Ky
c4fc84fac9 ModelPage clean 2019-06-11 12:29:02 +02:00
soupette
0038505775 Fix leftmenui link active 2019-06-11 12:26:58 +02:00
Virginie Ky
6ae5ffdeb0 merge develop 2019-06-11 12:18:11 +02:00
Virginie Ky
e54aa64d4a delete old snapshot 2019-06-11 11:49:54 +02:00
Virginie Ky
761cf5eb1f Clean 2019-06-11 11:07:04 +02:00
Virginie Ky
8fc4e8d54e LeftMenu unit test 2019-06-10 18:22:20 +02:00
Virginie Ky
b961ef38b7 ModelPage Unit tests with context 2019-06-10 18:02:14 +02:00
Virginie Ky
7db8366492 CTB LeftMenu refont with groups 2019-06-10 17:38:10 +02:00
Alexandre BODIN
33cbe98b5f
Merge pull request #3401 from strapi/fix/sqlite-non-constant-default-timestamp
Fix wrong param name in getType bookshelf hook
2019-06-10 17:31:01 +02:00
Alexandre BODIN
d16c4ddffb
Merge branch 'master' into fix/sqlite-non-constant-default-timestamp 2019-06-10 17:08:22 +02:00
Alexandre BODIN
47e3f94d6c
Merge pull request #3407 from strapi/fix/ignore-marketplace-plugin-list-errors
Fix error not ignored getPlugins
2019-06-10 17:08:01 +02:00
Alexandre BODIN
dba2876080
Merge branch 'master' into fix/ignore-marketplace-plugin-list-errors 2019-06-10 16:22:06 +02:00
Alexandre BODIN
435a784973
Merge pull request #3414 from strapi/tech/link-helper
Init link helper to work on a project outside of the workspace
2019-06-10 14:20:21 +02:00
Alexandre BODIN
c62a6e9a83
Merge branch 'master' into tech/link-helper 2019-06-10 12:00:23 +02:00
Alexandre BODIN
429b6f54e9
Merge pull request #3379 from grom194/fix/russian_welcome_again
Fix: ru welcome.again text
2019-06-10 11:06:55 +02:00
Alexandre BODIN
2514f009fe
Merge branch 'master' into fix/russian_welcome_again 2019-06-10 09:13:15 +02:00
Alexandre Bodin
41b9a72e95 Init link helper to work on a project outside of the workspace 2019-06-08 18:51:16 +02:00
Alexandre Bodin
e9160867a6 Fix wrong param name in getType bookshelf hook 2019-06-08 18:51:07 +02:00
Alexandre Bodin
4a21a75d53 Fix error not ignored getPlugins 2019-06-08 18:50:54 +02:00
Alexandre BODIN
649df34583
Merge pull request #3404 from tonikarppi/patch-1
Documentation improvments
2019-06-08 16:39:41 +02:00
Toni Karppi
6653343212
Fix typo
Changed "every where" to "everywhere"
2019-06-08 01:16:38 +02:00
Alexandre BODIN
41d9b449e0
Merge pull request #3402 from MichaelDono/patch-1
Improved clarity in plugin-architecture.md
2019-06-07 21:08:38 +02:00
soupette
02e8ca86f9 Init design HomePage.
Created List related components in strapi-helper-plugin.
Update trads
2019-06-07 19:08:33 +02:00
Michael Dono
35567cef3a
Improved clarity in plugin-architecture.md
Improved language clarity in plugin-architecture.md
2019-06-07 17:44:36 +01:00
Alexandre Bodin
0414e9f25b v3.0.0-beta.3 v3.0.0-beta.3 2019-06-07 15:45:00 +02:00
Alexandre Bodin
2b3c8d6628 Fix permission policy mixing users jwt and admin jwt 2019-06-07 15:44:06 +02:00
soupette
c4033b7e39 Created fixtures and init groups for homepage and leftmenu 2019-06-07 14:19:20 +02:00
soupette
2af236a84a Remove doc plugin and related files 2019-06-07 12:53:04 +02:00
Jim LAURIE
633b6745de
Merge pull request #3395 from strapi/digital-ocean-deploy-updates
Digital ocean deployment UPDATES
2019-06-06 19:30:56 +02:00
davidkartuzinski
96b7deb72e further edits on alpha and beta versions of Digital Ocean deployment 2019-06-06 19:10:57 +02:00
davidkartuzinski
8dc859f1f7 [WIP]:Digital Ocean Deploy for ALPHA Version updates - fixed typos and edited to reflect best practices with database connection variables 2019-06-06 16:19:57 +02:00
Alexandre BODIN
6532189912
Merge pull request #3373 from strapi/amazon-docs
Amazon AWS Strapi Deployment Docs
2019-06-06 10:46:05 +02:00
Alexandre BODIN
b7e3b1d400
Merge branch 'master' into amazon-docs 2019-06-06 10:45:48 +02:00
Alexandre BODIN
3d8027bd2f
Merge pull request #3381 from strapi/migration-guide-review
Clarified and fixed instructions
2019-06-06 08:58:19 +02:00
davidkartuzinski
a49cca1c85 corrected some minor issues 2019-06-05 19:15:48 +02:00
davidkartuzinski
571b8626a0 minor fixes for differences between Alpha and Beta 2019-06-05 18:37:50 +02:00
David Kartuzinski
71e30f0005
migration 2019-06-05 15:43:15 +02:00
grom194
7e840e1b8b fix: ru welome.again text 2019-06-05 14:37:02 +03:00
davidkartuzinski
b6cfe6894b Updated beta version of amazon docs and several minor edits on alpha version 2019-06-05 12:36:11 +02:00
davidkartuzinski
e758955b7d clarified a few points, fixed bad PM2 script, corrected a few typos 2019-06-05 11:49:24 +02:00
davidkartuzinski
b917c6df73 Merge branch 'master' of github.com:strapi/strapi into amazon-docs 2019-06-05 10:31:54 +02:00
davidkartuzinski
2fac99e526 [WIP]: Amazon AWS Deployment Docs 2019-06-04 18:48:37 +02:00
Alexandre Bodin
7d63600e21 v3.0.0-beta.2 v3.0.0-beta.2 2019-06-04 17:03:17 +02:00
Jonas Broms
48e756bff6
Merge branch 'master' into patch-2 2019-06-04 18:01:56 +03:00
Alexandre BODIN
d012aa4e9c
Merge pull request #3372 from grom194/fix/destroy_delete_request
Remove graphql special condition for delete request
2019-06-04 17:00:45 +02:00
davidkartuzinski
5e181e76ae another middle update 2019-06-04 16:31:23 +02:00