yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 04:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 116 Branches 489 Tags
Commit Graph

9273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
e44c32f822 Handle reorder 2019-07-23 14:58:08 +02:00
Alexandre Bodin
263ebb4480 Add missing check 2019-07-23 14:26:55 +02:00
Alexandre Bodin
48e45c5e01 Cleanup layout.js files 2019-07-23 13:45:08 +02:00
Alexandre Bodin
1dea89ca8f Support type wysiwyg instead of appearance param 2019-07-23 13:36:06 +02:00
Alexandre Bodin
3fdc149767 Fix count route order 2019-07-23 13:08:43 +02:00
Alexandre Bodin
1fa399cfd2 Add attributes tests 2019-07-23 12:45:54 +02:00
soupette
f12b8f8c87 Handle reorder full size elements 2019-07-23 12:43:32 +02:00
Jim LAURIE
9ba1c87e5a
Merge pull request #3624 from strapi/mongo-docs-upgrade 
MongoDB Atlas documentation update in database and deployment
 2019-07-23 12:29:44 +02:00
Jim LAURIE
a894acd004
Merge branch 'master' into mongo-docs-upgrade 2019-07-23 12:28:35 +02:00
Alexandre BODIN
e607ee067e
Merge pull request #3646 from strapi/fix/2867 
Fix graphql me query on sql databases
 2019-07-23 11:59:17 +02:00
Alexandre BODIN
2e9a604a34
Merge branch 'master' into fix/2867 2019-07-23 11:36:53 +02:00
Jim LAURIE
90f4865646
Merge branch 'master' into mongo-docs-upgrade 2019-07-23 11:24:07 +02:00
Alexandre Bodin
5f36278ec1 Clean up content manager configuration code and init tests 2019-07-23 11:21:17 +02:00
Alexandre Bodin
1e37ff5b47 Handle updating list sortable flag 2019-07-23 11:21:17 +02:00
Alexandre Bodin
e68f230baa Fix tests 2019-07-23 11:21:16 +02:00
Alexandre Bodin
128b26f1ee Fix general settings global udpdates 2019-07-23 11:21:16 +02:00
Alexandre Bodin
85762551aa Cleanup old code 2019-07-23 11:21:15 +02:00
Alexandre Bodin
e9ae95292e Update all models on general settings changes 2019-07-23 11:21:15 +02:00
Alexandre Bodin
6fbacc629d Add new missing attributes on server start 2019-07-23 11:21:14 +02:00
Alexandre Bodin
28bdf0ce27 Update settings, metadatas and layouts for groups and content-types on restart 2019-07-23 11:21:14 +02:00
Alexandre Bodin
87d59bad05 Init content-manager new bootstrap schema cleanup algorithm 2019-07-23 11:21:14 +02:00
Alexandre Bodin
47d6e8d73a Move general settings to specific controllers and services 2019-07-23 11:21:13 +02:00
Alexandre Bodin
e6a6c3ee02 Save a model configuration in one key only 2019-07-23 11:21:13 +02:00
Alexandre Bodin
ffc0a2ebd0 Add groups schemas 2019-07-23 11:21:12 +02:00
Alexandre Bodin
e7f384afc7 Init new content-manager-schema management 2019-07-23 11:21:12 +02:00
Alexandre Bodin
a74336d604 Init new content manager core schemas 2019-07-23 11:21:11 +02:00
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