yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-26 09:42:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 121 Branches 490 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
86d6ba62ac
Merge pull request #2380 from strapi/issue/2327 
Fix users CRUD mutations
 2019-01-22 13:52:22 +01:00
Jim LAURIE
f90255bb75
Merge branch 'master' into issue/2327 2019-01-22 13:52:13 +01:00
Aurélien Georget
4f2928339a Reset loaders instead of clearing cache 2019-01-22 13:47:44 +01:00
soupette
9b6440e952 Improve date formatting 2019-01-22 12:28:55 +01:00
Jim LAURIE
927d0182c3
Merge pull request #2669 from strapi/fix-update-user 
Fix update user email
 2019-01-22 12:17:28 +01:00
Jim LAURIE
e0670fb540
Merge branch 'master' into fix-update-user 2019-01-22 12:17:22 +01:00
Jim LAURIE
d2b8382324
Merge pull request #2661 from Sayegh7/master 
Add uploads folder to generated gitignore
 2019-01-22 12:17:00 +01:00
Aurélien Georget
2b37315f07 Fix where on relational fields 2019-01-22 12:16:46 +01:00
Jim LAURIE
b4968697a0 Fix update user email 2019-01-22 11:41:49 +01:00
Ahmed El Sayegh
6b74e2cc24
Merge branch 'master' into master 2019-01-22 12:36:37 +02:00
Jim LAURIE
6478e1f2b3
Merge pull request #2579 from pragone/lint_improvement 
Added comment to improve linting of generated service files
 2019-01-22 11:33:26 +01:00
Jim LAURIE
b5a150851b
Merge branch 'master' into lint_improvement 2019-01-22 11:33:15 +01:00
Ahmed El Sayegh
df7be9bf73 Merge branch 'master' of https://github.com/Sayegh7/strapi 2019-01-22 12:32:25 +02:00
Ahmed El Sayegh
54f70da366 Add gitkeep template and target 2019-01-22 12:31:49 +02:00
Ahmed El Sayegh
984654c725
Merge branch 'master' into master 2019-01-22 12:20:16 +02:00
Ahmed El Sayegh
bb585f4df2 Add gitkeep to public/uploads folder 2019-01-22 12:19:42 +02:00
Jim LAURIE
4360e5c60a
Merge pull request #2638 from maksugr/patch-2 
Fix confusion between request and axios
 2019-01-22 11:17:50 +01:00
Jim LAURIE
b3673baf24
Merge branch 'master' into patch-2 2019-01-22 11:17:43 +01:00
Jim LAURIE
3cc829b9e4
Merge pull request #2636 from abdonrd/patch-2 
Avoid write files if production mode
 2019-01-22 10:43:30 +01:00
Jim LAURIE
040d6ec4f2
Merge branch 'master' into patch-2 2019-01-22 10:42:07 +01:00
DMehaffy
b38fc464fe Modify bitint limit to javascript maximum 2019-01-21 08:37:35 -07:00
DMehaffy
53f3550464 fix int and bigint types in bookshelf 2019-01-21 08:00:13 -07:00
soupette
c1e2964a1a Fix remove selected item 2019-01-21 15:53:40 +01:00
DMehaffy
d656077399 add a few more bigint 2019-01-21 05:11:48 -07:00
DMehaffy
f2870bc8fc Add bigint 2019-01-21 04:35:11 -07:00
Paolo Ragone
c3a50506eb
Merge branch 'master' into lint_improvement 2019-01-21 22:24:57 +13:00
Paolo Ragone
09530e11cd
Merge branch 'master' into update_knex 2019-01-21 22:24:41 +13:00
Ahmed El Sayegh
632814caa4 Add public/uploads folder to generated gitignore 2019-01-21 01:12:05 +02:00
soupette
4a160b04fd Fixes #1960 2019-01-20 14:21:38 +01:00
soupette
7e79864259 Split content-manager setting view into tabs. 
Allow to change the textarea type so the wysiwyg can be displayed without having to set it back in the content type builder.
Fixes #2307
 2019-01-20 12:52:08 +01:00
Jim LAURIE
80d13dff9c
Merge pull request #2655 from strapi/funnel 
Add listeners to events
 2019-01-18 18:58:11 +01:00
Aurélien Georget
f534340ca2 Add listeners to events 2019-01-18 16:08:15 +01:00
Divyansh Batham
c9e48860b1
Update controllers.md (Grammatical Mistake) 
"... the server will *called* the index action..." => "... the server will **call** the index action..."
 2019-01-18 03:04:42 +05:30
tthenne
ebef2ec0f0 added attachment option to mailgun msg object in order to send attachments 2019-01-17 10:55:29 -06:00
soupette
925438d7b5 Fixes #2541 2019-01-17 17:18:54 +01:00
Paolo Ragone
239835f0ae Requested change 2019-01-17 22:24:09 +13:00
Paolo Ragone
c72e4bd1e5
Merge branch 'master' into update_knex 2019-01-17 22:19:15 +13:00
Paolo Ragone
d39031605c
Merge branch 'master' into lint_improvement 2019-01-17 22:18:33 +13:00
Roman Ponomarev
c9145ae690
Update webhooks.md 2019-01-16 19:28:18 +03:00
Aurélien Georget
176aa52df0 Avoid duplicate loaders 2019-01-16 17:26:15 +01:00
Abdón Rodríguez Davila
b337a82748 Update graphql dependency to v14.1.0 2019-01-16 15:41:14 +01:00
Abdón Rodríguez Davila
37c942915e
Avoid write files if production mode 2019-01-16 14:58:50 +01:00
Aurélien Georget
c8a0e51729 Fix where constraint in GraphQL query 2019-01-16 12:24:29 +01:00
Jim LAURIE
94c2f0e999
Merge pull request #2634 from strapi/3.0.0-alpha.19 
3.0.0 alpha.19
 2019-01-16 11:53:49 +01:00
Jim LAURIE
c3c24ca7ad 3.0.0-alpha.19 v3.0.0-alpha.19 2019-01-16 11:49:16 +01:00
Jim LAURIE
72d0f771ed Add migration guide alpha.19 2019-01-16 11:48:21 +01:00
Jim LAURIE
f83c0f760f
Merge pull request #2632 from projik/master 
Incorrect params variable name in user update
 2019-01-16 10:53:16 +01:00
David Baxter
c01124388d
Incorrect params variable name in user update 2019-01-16 14:39:24 +11:00
Jim LAURIE
0f33ace567
Merge pull request #2589 from denisinvader/admin-russian-locale-fixes 
Update RU translations
 2019-01-15 20:29:30 +01:00
Jim LAURIE
712e997c54
Merge branch 'master' into admin-russian-locale-fixes 2019-01-15 20:29:21 +01:00