yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 00:09:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,029 Commits 125 Branches 497 Tags
Commit Graph

9029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
b89c7c056d Move modal to helper plugin 2019-09-11 17:13:45 +02:00
soupette
bf73d73f8e Move Buttonmodal from ctb to helper plugin 2019-09-11 16:38:42 +02:00
soupette
4f1b2973fc Design lang page 2019-09-11 16:06:24 +02:00
soupette
9614a7afe7 Common left menu styled for stm and ctb 2019-09-11 11:32:28 +02:00
soupette
4141ec03a8 Migrate plugin to styled compo 2019-09-11 11:19:30 +02:00
soupette
19a4ce038c Merge branch 'styled-components/upload' of github.com:strapi/strapi into styled-components/email 2019-09-11 11:17:53 +02:00
soupette
91d33163d2 Merge branch 'master' of github.com:strapi/strapi into styled-components/upload 2019-09-11 11:17:24 +02:00
soupette
f08acf88f1 Merge branch 'master' of github.com:strapi/strapi into styled-components/upload 2019-09-11 11:02:57 +02:00
soupette
ce2575151e Migrate plugin to styled compo 2019-09-11 11:00:40 +02:00
Alexandre BODIN
dc02ba67e3
Merge pull request #3950 from strapi/chore/update-documentation-plugin-groups 
Chore/update documentation plugin groups
 2019-09-11 10:54:58 +02:00
Alexandre BODIN
8299cff8aa
Merge branch 'master' into chore/update-documentation-plugin-groups 2019-09-11 10:54:51 +02:00
Alexandre BODIN
ae4bfb8233
Merge pull request #3924 from davidkartuzinski/docs/quickstart 
Update Strapi Quickstart
 2019-09-11 10:42:19 +02:00
Alexandre BODIN
230a7145af
Merge branch 'master' into docs/quickstart 2019-09-11 10:41:15 +02:00
davidkartuzinski
3ec29bfa83 fixed some returns 2019-09-11 10:34:16 +02:00
davidkartuzinski
fa60a78bf1 Added new video of Quick Start 2019-09-11 10:19:48 +02:00
soupette
ff184ec200 Merge branch 'master' of github.com:strapi/strapi into styled-components/upload 2019-09-11 10:19:22 +02:00
Alexandre BODIN
b3e7d27b62
Merge branch 'master' into chore/update-documentation-plugin-groups 2019-09-11 10:11:18 +02:00
cyril lopez
60a1e435b7
Merge pull request #3929 from strapi/front/auth-views 
Move authentication in strapi-admin
 2019-09-10 23:19:18 +02:00
soupette
a8dae57806 Merge branch 'master' of github.com:strapi/strapi into front/auth-views 2019-09-10 17:52:20 +02:00
soupette
535467be3c Fix PR feedback 2019-09-10 17:51:26 +02:00
soupette
93941e3d11 Delete useless container 2019-09-10 17:32:46 +02:00
Alexandre Bodin
32b8e4174b Fix json type and add groups 2019-09-10 16:54:50 +02:00
Alexandre Bodin
e07d83a89b Add richtext 2019-09-10 16:54:50 +02:00
soupette
0289a7a3d3 Start removing sass in upload components 2019-09-10 16:34:43 +02:00
Alexandre Bodin
7d51b8625d v3.0.0-beta.16.1 v3.0.0-beta.16.1 2019-09-10 16:33:22 +02:00
Alexandre BODIN
a56ed83ed3
Merge pull request #3896 from binggg/patch-1 
Add missing zh-Hans translations
 2019-09-10 16:31:49 +02:00
Alexandre BODIN
86ee6a5170
Merge branch 'master' into patch-1 2019-09-10 16:31:42 +02:00
Alexandre BODIN
0964555be7
Merge pull request #3949 from strapi/fix/core-multi-origin 
Allow multiple origins to be provided to the cors middleware
 2019-09-10 16:27:14 +02:00
Alexandre BODIN
f2b354feb7
Merge branch 'master' into fix/core-multi-origin 2019-09-10 16:27:06 +02:00
Alexandre BODIN
20f42752aa
Merge pull request #3934 from strapi/fix/permissions-deletion 
Fix permission deletion on start + default transaction for create and update query
 2019-09-10 16:02:39 +02:00
Alexandre Bodin
522014cf3d Allow multiple origins to be provided to the cors middleware, array or coma separated 2019-09-10 15:46:07 +02:00
Alexandre Bodin
c23c2583ab Make sure the relation update is done in a transaction with simple default create and update 2019-09-10 14:47:18 +02:00
Alexandre Bodin
5a4b24a636 Fix permission deletion deleting only on role permission on controller delete 2019-09-10 14:47:18 +02:00
Alexandre BODIN
5bf43302a3
Merge pull request #3944 from strapi/fix/image-upload-mongo 
Use kind when provided on morph relation
 2019-09-10 14:45:31 +02:00
soupette
61a22c3a9b Fixes #3677 2019-09-10 12:33:21 +02:00
soupette
55ea54608d Merge branch 'master' of github.com:strapi/strapi into front/auth-views 2019-09-10 12:19:54 +02:00
soupette
869cde8f19 Fix rerender issue in the admin 2019-09-10 12:14:07 +02:00
Alexandre Bodin
25bf0e4ca8 Use kind when provided on morph relation 2019-09-10 11:05:57 +02:00
soupette
c5fd30e314 Fix WYSIWYG preview 2019-09-10 10:39:57 +02:00
soupette
1e26065d95 Clean code and fix tests 2019-09-10 10:37:02 +02:00
赵兵
d02642e0e3 Merge branch 'patch-1' of https://github.com/binggg/strapi into patch-1 2019-09-10 16:27:03 +08:00
赵兵
04523d9637 Fix package.json wrong update 2019-09-10 16:26:59 +08:00
Alexandre BODIN
0c3bba055b
Merge branch 'master' into patch-1 2019-09-10 10:22:41 +02:00
赵兵
a462fab945 Merge remote-tracking branch 'upstream/master' into patch-1 2019-09-10 16:14:38 +08:00
Alexandre BODIN
c0794549a5
Merge pull request #3930 from websocket98765/patch-1 
Fix comma in JSON example
 2019-09-10 10:08:17 +02:00
Alexandre BODIN
d560fa9e89
Merge branch 'master' into patch-1 2019-09-10 10:08:04 +02:00
Alexandre BODIN
5b3e1c719a
Merge pull request #3932 from tsheils/patch-1 
Update migration-guide-beta.15-to-beta.16.md
 2019-09-10 10:07:11 +02:00
Alexandre BODIN
7b7f2a4bfa
Merge branch 'master' into patch-1 2019-09-10 10:06:57 +02:00
soupette
b7b8e368a2 Fixes #3942 2019-09-10 09:06:26 +02:00
Peter Zhao
b3a6ad4f23
Add zh-Hans translations of new feature 2019-09-10 14:29:03 +08:00