yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 07:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,444 Commits 138 Branches 514 Tags
Commit Graph

8444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Alexandre BODIN
e5e877f419
Merge pull request #3627 from strapi/chore/global-hook-queries 
Global hook queries
 2019-07-18 14:40:18 +02:00
Alexandre Bodin
fb93f9f593 Fix typos 2019-07-18 14:39:41 +02:00
Alexandre Bodin
7dba5d6254 Fix sequence being dropped when sqlite recreates a table 2019-07-17 15:46:02 +02:00
Alexandre Bodin
5a21e2f87f Fix updateRole 2019-07-17 14:28:36 +02:00
Alexandre Bodin
ef9ce7d4fa simplify permission duplicate removal 2019-07-17 13:50:07 +02:00
Alexandre Bodin
74402021b7 group is not required by default 2019-07-17 13:41:02 +02:00
Virginie Ky
822b4f840f create group unit test 2019-07-17 11:54:30 +02:00
Derrick Mehaffy
22344f1540
testing out upgrading bookshelf and knex to latest 2019-07-17 01:38:16 -07:00
Virginie Ky
aa81ebf21e fix lint 2019-07-17 10:29:15 +02:00
Alexandre Bodin
87d9d85c08 Handle empty permissions in role update 2019-07-17 10:15:22 +02:00
Alexandre Bodin
c020f0a6cd mongoose working version 2019-07-17 00:03:38 +02:00
Alexandre Bodin
2befa1cf48 Use primaryKey on delete queries 2019-07-16 23:27:34 +02:00
Alexandre Bodin
8332ed0526 Add deleteMany to mongoose 2019-07-16 23:13:05 +02:00
Alexandre Bodin
09dcea27f1 refactor mongoose queries to match api 2019-07-16 21:24:09 +02:00
Alexandre Bodin
7e60e4fccf fix model settings in example group 2019-07-16 21:03:21 +02:00
Alexandre Bodin
928c7f4776 fix create/update role 2019-07-16 20:52:31 +02:00
Alexandre Bodin
56c59c5ae1 Implement deleteMany in query.delete 2019-07-16 20:11:34 +02:00
Alexandre BODIN
a390c6288c
Merge pull request #3625 from strapi/fix/missing-connector-strapi-new 
Fix missing connector in generated database.json files
 2019-07-16 19:38:56 +02:00
Virginie Ky
4007579579 LeftMenu and GroupPage update after save 2019-07-16 19:24:14 +02:00
Alexandre Bodin
7acd885e9f Fix missing connector in generated database.json files 2019-07-16 19:21:00 +02:00
Virginie Ky
1e2f6ba05c Save new group 2019-07-16 19:02:44 +02:00
Jim LAURIE
1c78b764f7
Merge pull request #3613 from strapi/fix/google-auth 
Fix Google auth
 2019-07-16 18:23:08 +02:00
Alexandre Bodin
93bf13a77c Implement delete many content-manager with new queries 2019-07-16 18:05:24 +02:00
Alexandre BODIN
f187945ee8
Merge branch 'master' into fix/google-auth 2019-07-16 17:40:33 +02:00
Alexandre Bodin
9612ff0f14 remove schema.graphql 2019-07-16 17:25:56 +02:00