yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-17 21:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,947 Commits 117 Branches 489 Tags
Commit Graph

8947 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
2d871abf6a Merge branch 'master' into develop 2019-07-23 11:20:57 +02:00
Derrick Mehaffy
2f44b7353b
PR Feedback for testing 2019-07-23 02:20:36 -07:00
Alexandre BODIN
99e87ed98c
Merge pull request #3599 from strapi/fix/packageUpdates 
Update koa-ip version
 2019-07-23 11:15:14 +02:00
Derrick Mehaffy
6cc3f1ff3b
clean yarn? 2019-07-23 01:54:21 -07:00
soupette
fab10fea20 Init edit layout 2019-07-23 10:42:22 +02:00
Derrick Mehaffy
6557c56d7b
Remove purest update 2019-07-22 22:43:54 -07:00
Derrick Mehaffy
7a34c39cd3
Update koa-ip and purest to latest versions 2019-07-22 22:42:19 -07:00
Alexandre BODIN
395da5f7e7
Merge pull request #3639 from strapi/feature/groups 
Add group feature backend
 2019-07-22 21:54:33 +02:00
Alexandre BODIN
78e85b37c2
Merge pull request #3659 from aalasolutions/fix/3648 
Fix graphql amountLimit must be used when no limit is provided
 2019-07-22 21:48:53 +02:00
Alexandre Bodin
e53e8c13c4 Fix lint 2019-07-22 21:30:10 +02:00
Virginie Ky
a312d6da15 Relation modal ip 2019-07-22 18:32:25 +02:00
Alexandre Bodin
82fc041acd Fix typo 2019-07-22 18:17:22 +02:00
Alexandre Bodin
7d7a5f3223 Merge branch 'develop' into feature/groups 2019-07-22 18:16:38 +02:00
Alexandre Bodin
db0656e6a3 Fix missing dates in mongoose allAttributes 2019-07-22 18:16:16 +02:00
davidkartuzinski
cdcd29b348 fixed comments requested 2019-07-22 17:40:35 +02:00
soupette
af84bb5116 Fix conflicts 2019-07-22 17:10:23 +02:00
Aamir Mahmood
1f0a2e3f81 removed extra comments 2019-07-22 14:45:09 +05:00
Aamir Mahmood
fa1da631a1 fixes #3648 if no limit set get it from aomuntLimit 2019-07-22 14:44:17 +05:00
Virginie Ky
32314ee20b pull changes and select UI 2019-07-22 11:42:37 +02:00
Virginie Ky
947d21d547 select UI 2019-07-22 11:41:27 +02:00
cyril lopez
b113152c27
Merge pull request #3620 from strapi/front/repeatable-field-create 
CTB - Groups and repeatables - Attributes - Create
 2019-07-22 10:33:57 +02:00
soupette
3ee3cf151b Fix lint 2019-07-19 17:42:47 +02:00
soupette
b86a5c0691 Fix lint 2019-07-19 17:38:16 +02:00
virginieky
411aa211d5
Merge branch 'develop' into front/repeatable-field-create 2019-07-19 13:39:52 +02:00
David Kartuzinski
7981dd9a23
fixed typo 2019-07-19 11:24:21 +02:00
Derrick Mehaffy
8bcc6d5d37
Fix graphql me route when using bookshelf databases 2019-07-19 02:14:46 -07:00
soupette
cef035a3ca Add trads 2019-07-19 09:40:14 +02:00
soupette
25f4747909 Fix group keys on edit 2019-07-19 09:20:41 +02:00
Alexandre Bodin
fe2ad07df1 Delete exports schema.graphql 2019-07-18 20:04:34 +02:00
Alexandre BODIN
867c7ab35c
Merge pull request #3641 from strapi/feature/graphql-groups 
Feature graphql groups
 2019-07-18 19:39:27 +02:00
Alexandre Bodin
3e20bd3a28 Allow types and groups without attributes 2019-07-18 19:37:33 +02:00
Alexandre Bodin
f2a5bd9464 Remove unwanted attribute 2019-07-18 19:37:32 +02:00
Alexandre Bodin
06a1b023c3 Clean up code 2019-07-18 19:37:32 +02:00
Alexandre Bodin
136056ce2f Handle mutation with group ids to avoid recreating the groups every time 2019-07-18 19:37:31 +02:00
Alexandre Bodin
103b8c3964 Add group resolvers for nested relations 2019-07-18 19:37:30 +02:00
Alexandre Bodin
07cca4139c Add group inputs 2019-07-18 19:37:30 +02:00
Alexandre Bodin
fbfe41e1d1 Create group type 2019-07-18 19:37:29 +02:00
Alexandre Bodin
a62f73fe5f Merge branch 'develop' into feature/groups 2019-07-18 19:37:09 +02:00
Alexandre Bodin
da5d02fb7c Merge branch 'master' into develop 2019-07-18 19:28:52 +02:00
Alexandre BODIN
117656c05f
Merge pull request #3621 from strapi/fix/hookUpdates 
Updating bookshelf and knex packages
 2019-07-18 19:23:27 +02:00
David Kartuzinski
923402f1c3
Merge branch 'master' into mongo-docs-upgrade 2019-07-18 17:59:02 +02:00
davidkartuzinski
29ccc79a68 further simplified the docs to use mongodb atlas 2019-07-18 17:54:34 +02:00
Alexandre BODIN
ce5267502a
Merge pull request #3638 from strapi/chore/test-no-dep-installs 
Use generateNew directly and disable dep install for tests
 2019-07-18 17:45:02 +02:00
Alexandre Bodin
254e6b9c38 Use appName to name the test app package.json 2019-07-18 17:21:53 +02:00
Alexandre Bodin
91d1ca6763 parse argv if --db params used 2019-07-18 16:56:49 +02:00
soupette
95c5ee8d4c Add formvalidations with yup 2019-07-18 16:53:12 +02:00
Virginie Ky
9fc54cd8f9 Edit attributes Unit tests 2019-07-18 16:34:27 +02:00
Alexandre Bodin
574b24b5b4 Use generateNew directly and disable dep install 2019-07-18 16:33:18 +02:00
Alexandre Bodin
7e11acac32 Fix bugs mongo 2019-07-18 15:49:24 +02:00
Virginie Ky
8a2122cd13 Edit attribute 2019-07-18 15:23:06 +02:00