yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 18:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 116 Branches 488 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurelsicoko
36d650effa Update marketplace icon style 2018-02-09 17:09:35 +01:00
Aurelsicoko
b2d85c0b8e Update icon container style 2018-02-09 17:07:10 +01:00
Jim LAURIE
08d74e1515
Merge branch 'master' into fix/boot 2018-02-09 17:02:18 +01:00
Jim LAURIE
2ecd3bf89c
Merge pull request #613 from strapi/enhancement/mask 
Enhancement/mask
 2018-02-09 17:02:02 +01:00
Aurelsicoko
5cbfc6f050 Update logo 2018-02-09 17:01:04 +01:00
Jim LAURIE
6cbff0007c
Merge branch 'master' into enhancement/mask 2018-02-09 16:48:30 +01:00
Jim LAURIE
832883a91b
Merge pull request #612 from strapi/fix-fetch-error-mongoose 
Fix fetch error mongoose
 2018-02-09 16:47:44 +01:00
Aurelsicoko
46a64b449f Update default hook timeout to 3000 milliseconds 2018-02-09 16:36:23 +01:00
Jim LAURIE
09ee225029
Merge branch 'master' into fix-fetch-error-mongoose 2018-02-09 16:33:48 +01:00
Jim LAURIE
4520eef567
Merge pull request #611 from strapi/jwt-info-auth 
Update user info in JWT
 2018-02-09 16:33:35 +01:00
Jim LAURIE
d1736a9732
Merge branch 'master' into jwt-info-auth 2018-02-09 15:57:58 +01:00
Jim LAURIE
21441e41d2
Merge pull request #610 from strapi/fix-db-args 
Fix strapi new without db args
 2018-02-09 15:57:45 +01:00
Jim LAURIE
0cb9f05f9c
Merge branch 'master' into fix-db-args 2018-02-09 13:00:48 +01:00
Jim LAURIE
a173859a45
Merge pull request #606 from strapi/add/inputs-to-ctb 
Use the new input library in content type builder
 2018-02-09 13:00:37 +01:00
Jim LAURIE
82b8361229
Merge branch 'master' into add/inputs-to-ctb 2018-02-09 12:18:11 +01:00
Jim LAURIE
f831be27e1
Merge pull request #593 from oad-earth/master 
Generating |  Model name
 2018-02-09 12:17:55 +01:00
Jim LAURIE
8510e5852f
Merge branch 'master' into master 2018-02-09 11:23:13 +01:00
Jim LAURIE
cc4dc6cd50
Merge pull request #614 from strapi/hide-password-database-cli 
Hide password database cli
 2018-02-09 11:13:38 +01:00
Aurelsicoko
200a40d758 Improve attributes example 2018-02-09 11:03:53 +01:00
Aurelsicoko
36501aeeb6 Write validations documentation 2018-02-09 11:02:00 +01:00
Aurelsicoko
5f19c8b3b3 Apply PR feedback 2018-02-09 10:46:37 +01:00
Aurelsicoko
824567de0d [WIP] Polymorphic assocations 2018-02-09 10:43:09 +01:00
Jim Laurie
0c296abdeb Fix filter documentation 2018-02-08 17:13:28 +01:00
cyril lopez
26a5d95850 Created ImgPreview and InputFile components 
Init only the structure
 2018-02-08 15:50:12 +01:00
Aurelsicoko
4521854340 Enable mask middleware if there is a private key set to true 2018-02-08 15:27:24 +01:00
Jim Laurie
945af6e750 Hide password database cli 
close #598
 2018-02-08 15:27:15 +01:00
Aurelsicoko
2cb0e2c3d5 Hide resetPasswordToken from response 2018-02-08 14:59:39 +01:00
Aurelsicoko
cbd47828d8 Handle mask for nested objects (associations) 2018-02-08 14:58:19 +01:00
Jim Laurie
3c82641aa0 Fix fetch error mongoose 
Verify if _id params has mongoose ObjectId format
 2018-02-08 14:58:05 +01:00
Jim Laurie
05804c391a Update user info in JWT 
Just set user id in auth jwt
fix #528
 2018-02-08 14:37:54 +01:00
cyril lopez
11b96a37d3 Rename upload folder 2018-02-08 14:13:29 +01:00
cyril lopez
c76bc81cce Merge branch 'fix-db-args' of github.com:strapi/strapi into plugin/img-upload-front 2018-02-08 14:07:26 +01:00
cyril lopez
325384220f Merge branch 'master' of github.com:strapi/strapi into plugin/img-upload 2018-02-08 12:06:17 +01:00
cyril lopez
b4abd78d9f Change upload plugin package 2018-02-08 12:03:18 +01:00
cyril lopez
ecd12c451a Init plugin upload 
Created the upload plugin and install it by default
 2018-02-08 12:01:06 +01:00
Jim Laurie
b1bcc13952 Fix strapi new without db args 
Stop project creation if one of db argument is missing
Better detection for using db arguments
 2018-02-08 11:53:45 +01:00
Jim LAURIE
b90239b100
Merge pull request #609 from lucaperret/master 
fix(cli): db connector init with args
 2018-02-08 11:46:42 +01:00
Luca Perret
22f12ec0dc fix(cli): database name init 2018-02-08 00:50:16 +01:00
Luca Perret
3855523557 fix(cli): db connector init with args 2018-02-07 20:37:33 +01:00
cyril lopez
f8b8faefcf Use the new input library in content type builder 2018-02-07 18:32:03 +01:00
Jim LAURIE
b5e8b0997f
Merge pull request #603 from strapi/enhancement/database-uri 
Add database uri configuration
 2018-02-07 18:17:01 +01:00
Jim LAURIE
e963ee1414
Merge branch 'master' into enhancement/database-uri 2018-02-07 17:57:14 +01:00
Jim LAURIE
b40c37ef87
Merge pull request #605 from strapi/add/inputs-to-users 
Add/inputs to users
 2018-02-07 17:56:56 +01:00
Jim LAURIE
d3cc220d3b
Merge branch 'master' into add/inputs-to-users 2018-02-07 15:28:30 +01:00
Pierre BURGY
b67c5e34a8
Merge branch 'master' into enhancement/database-uri 2018-02-07 15:00:37 +01:00
Pierre Burgy
7f6e5ba5a8 3.0.0-alpha.9.3 2018-02-07 14:22:27 +01:00
Pierre Burgy
5bdf0a731d Use PORT env variable in production 2018-02-07 12:07:35 +01:00
Jim LAURIE
c7f702204f
Merge pull request #594 from strapi/fix/payload 
Load gzip middleware before in the stack to work with Boom
 2018-02-07 12:02:38 +01:00
cyril lopez
c6ca956c45 Merge branch 'master' of github.com:strapi/strapi into add/inputs-to-users 2018-02-07 11:52:54 +01:00
Jim LAURIE
03985f4d80
Merge branch 'master' into fix/payload 2018-02-07 11:48:20 +01:00