yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-03 13:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,873 Commits 118 Branches 492 Tags
Commit Graph

9873 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
3c031a4fd5 Remove useless dep 2019-10-08 16:48:51 +02:00
soupette
da2d136de5 Update webpack config 2019-10-08 16:32:07 +02:00
Jim LAURIE
c2dc6ec0a8 Fix links 2019-10-08 15:23:46 +02:00
cyril lopez
b6a4b3019e
Merge branch 'develop' into front/remove-sass-admin 2019-10-08 15:12:03 +02:00
cyril lopez
abdfd245a6
Merge pull request #4171 from strapi/styled-component/ctb 
Remove node-sass from users permissions plugin
 2019-10-08 15:11:40 +02:00
Alon Bukai
40d3d78b0d Fix spelling acces -> access (#4211) 2019-10-08 14:12:20 +02:00
soupette
a288198306 Merge branch 'styled-component/ctb' of github.com:strapi/strapi into styled-component/ctb 2019-10-08 12:34:48 +02:00
virginieky
5eaa8d9208
Merge branch 'develop' into front/remove-sass-admin 2019-10-08 12:33:27 +02:00
Virginie Ky
5f6278f1ba update buffet and some style ui fixes 2019-10-08 12:32:48 +02:00
Virginie Ky
edc61d3522 Fix conflicts 2019-10-08 12:27:04 +02:00
Virginie Ky
0c23fe8bae Content manager UI 2019-10-08 11:51:10 +02:00
Virginie Ky
82e45e382e Content manager Filters UI 2019-10-08 11:33:52 +02:00
soupette
e4f9f808e4 Update modals 2019-10-08 11:23:35 +02:00
Virginie Ky
b60ae59170 Content type builder Models List UI 2019-10-08 11:09:49 +02:00
Alexandre Bodin
6306b157b0 Fix mutation resolver name selecter 2019-10-08 11:03:28 +02:00
Virginie Ky
953f5b8ba3 upload plugin UI 2019-10-08 10:53:01 +02:00
Virginie Ky
22b8ab0bff Users permissions search list overflow 2019-10-08 10:38:08 +02:00
Virginie Ky
ee65a6a05a users permissions plugins responsive UI 2019-10-08 10:21:27 +02:00
Karthikeyan Palaniswamy
2ffd152b01 Change english to German values 2019-10-08 10:15:46 +02:00
Karthikeyan Palaniswamy
c05c758809 Add all the missing keys and its value to de.json. 2019-10-08 10:15:46 +02:00
Karthikeyan Palaniswamy
df51eafbbe Delete Auth & Permission key from de.json because it is not listed in en.json. 2019-10-08 10:15:46 +02:00
Karthikeyan Palaniswamy
d7f4ff7c47 Use 2 spaces for a tab 2019-10-08 10:15:46 +02:00
Karthikeyan Palaniswamy
e1a05e4436 Remove space before :(colon) 2019-10-08 10:15:46 +02:00
Karthikeyan Palaniswamy
3f57e8a7d3 Add missing translations for German language 2019-10-08 10:15:46 +02:00
Alexandre Bodin
b43fba4a79 Console log error before capture in sentry to get the detailed logs 2019-10-08 10:14:43 +02:00
Virginie Ky
6cae06b63c Users permissions edit page responsive ip 2019-10-08 09:50:15 +02:00
soupette
36de339b04 Update config 2019-10-08 09:44:55 +02:00
soupette
b214765287 Merge branch 'develop' of github.com:strapi/strapi into styled-component/ctb 2019-10-08 09:39:10 +02:00
cyril lopez
c227b72002
Merge pull request #3967 from strapi/stm/update 
Deprecate settings manager
 2019-10-08 09:38:33 +02:00
soupette
75abb17f0f Fix conflicts 2019-10-08 09:17:47 +02:00
Karthikeyan Palaniswamy
3466b7cbe7 Change english to German values 2019-10-08 00:11:21 +02:00
Alexandre BODIN
ab365482c4
Merge pull request #4176 from strapi/documentation-update 
Documentation update content / structure
 2019-10-07 18:15:27 +02:00
Jim LAURIE
c4ddb168cd Merge branch 'master' of github.com:strapi/strapi into documentation-update 2019-10-07 18:00:38 +02:00
Alexandre BODIN
6b5f744685
Merge pull request #4204 from strapi/doc-update/email-plugin 
Move the email doc in plugin section
 2019-10-07 17:58:29 +02:00
Jim LAURIE
d176efd2c1 Move the email doc in plugin section 2019-10-07 17:53:33 +02:00
Jim LAURIE
3ec97b048d Fix upload link in guide 2019-10-07 17:19:19 +02:00
Alexandre BODIN
6d3c42be70
Merge pull request #4203 from strapi/doc-update/graphql-plugin 
Move GraphQL doc in plugins section and update examples to match Food…
 2019-10-07 17:15:28 +02:00
Jim LAURIE
f02d4dfcb0 Move graphql doc in plugins section and update examples to match FoodAdvisor 2019-10-07 17:03:45 +02:00
Alexandre BODIN
9bfcad2a54
Merge pull request #4202 from strapi/doc-update/upload-plugin 
Move the upload doc in plugin section and add available endpoints
 2019-10-07 16:05:59 +02:00
Jim LAURIE
0f5549da12 Move the upload doc in plugin section and add available endpoints 2019-10-07 16:02:15 +02:00
Jim LAURIE
58bffca46c
Merge pull request #4201 from strapi/fix/graphql-group-relations 
Create a dataloader for every model
 2019-10-07 15:42:01 +02:00
Virginie Ky
42257b3af4 Merge branch 'styled-component/ctb' of github.com:strapi/strapi into styled-component/ctb 2019-10-07 13:54:31 +02:00
Alexandre BODIN
5af4740502
Merge branch 'master' into fix/graphql-group-relations 2019-10-07 13:51:24 +02:00
Alexandre Bodin
0b21fd4e7f Create a dataloader for every model 2019-10-07 13:47:47 +02:00
Virginie Ky
d4bc0c1683 Users permissions edit view policies fix 2019-10-07 13:42:39 +02:00
Alexandre BODIN
610d2003e7
Merge pull request #4200 from strapi/fix/graphql-queries-context 
Pass graphql full context to custom queries
 2019-10-07 10:52:25 +02:00
Alexandre BODIN
5e4c2bd394
Merge branch 'master' into fix/graphql-queries-context 2019-10-07 10:46:54 +02:00
Alexandre BODIN
74b66f8598
Merge pull request #4187 from strapi/releases/3.0.0-beta.17 
Multiple PRs for beta.17
 2019-10-07 10:25:28 +02:00
Alexandre BODIN
7c16991f14
Merge branch 'master' into releases/3.0.0-beta.17 2019-10-07 10:23:04 +02:00
Alexandre BODIN
a2112a0f5c
Merge branch 'master' into fix/graphql-queries-context 2019-10-07 10:22:45 +02:00