yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 09:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,943 Commits 115 Branches 488 Tags
Commit Graph

3943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurelsicoko
8bd9f62541 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-05 11:32:23 +01:00
cyril lopez
20dd39127b Update InputFile design and change associated translations 2018-03-05 11:09:32 +01:00
Aurelsicoko
cf08bf43e5 Update plugin menu name 2018-03-05 11:07:37 +01:00
Minh Tri Nguyen
a18ba8805e Add authSource & ssl options to MongoDB connector fix 2018-03-04 23:02:29 +08:00
Jim LAURIE
eab59ad395
Merge pull request #725 from rockmandash/Fix-some-Chinese-Translation 
add some chinese translation fix
 2018-03-03 13:10:04 +01:00
Aurelsicoko
a9f4a43ac9 Enhance cleanData utils to handle Mongo ObjectId 2018-03-02 23:31:30 +01:00
Aurelsicoko
933254f1d1 Replace null by empty array on single file field 2018-03-02 17:00:00 +01:00
Aurelsicoko
2bdf226490 Add/remove one file in Content Manager for Bookshelf 2018-03-02 16:31:32 +01:00
Aurelsicoko
5f0618f94c Add icon plugin upload 2018-03-02 15:08:42 +01:00
Aurelsicoko
63d1d31490 Fix config upload AWS S3 2018-03-02 15:06:35 +01:00
Aurelsicoko
d7aa3eef7e Resolve conflicts 2018-03-02 14:21:51 +01:00
Aurelsicoko
1490e06003 Remove useless association login in create method for Mongoose 2018-03-02 12:32:35 +01:00
Aurelsicoko
61fee2c03e Set ctx.status when Boom method is called 2018-03-02 12:27:59 +01:00
Aurelsicoko
2d5f607052 Add/remove single file from Content Manager 2018-03-02 12:01:18 +01:00
Aurelsicoko
b896d96061 Fix one file upload input 2018-03-02 11:49:23 +01:00
Joseph Wang
a9ba025b24 add some chinese translation fix 2018-03-02 18:43:03 +08:00
cyril lopez
2f90e52e6a Fix translation typo 2018-03-02 09:28:53 +01:00
cyril lopez
094e2d6f66 Fix InputSearch transition css 2018-03-02 09:27:29 +01:00
cyril lopez
247d308e26 Fix ctm formvalidations 
This logic needs to be redone
Fix overflow on upload list
 2018-03-01 22:51:48 +01:00
cyril lopez
1b2f94938b Increase InputFileDetails fonts 2018-03-01 22:09:50 +01:00
cyril lopez
c22a1cc39c Check if the relation is manyToManyMorph in order to send the correct object when deleting a file 2018-03-01 22:03:23 +01:00
cyril lopez
51058d6e9b Send empty array when removing file 2018-03-01 18:34:29 +01:00
Aurelsicoko
e435b01953 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-03-01 17:40:24 +01:00
Aurelsicoko
234d913c1b Add/remove images file Content Manager for SQL databases 2018-03-01 17:39:31 +01:00
Jim Laurie
354a69c5f3 Hotfix strapi.log 2018-03-01 16:53:58 +01:00
Jim LAURIE
359c48e301
Merge pull request #719 from strapi/update-generators 
Add locales to plugin generators
 2018-03-01 16:21:04 +01:00
Jim LAURIE
952024373e
Merge branch 'master' into update-generators 2018-03-01 15:53:39 +01:00
Jim LAURIE
036c0d7584
Merge pull request #718 from strapi/improve-reactintl 
Take en default translation message if there are not present in the c…
 2018-03-01 15:52:09 +01:00
Jim LAURIE
0988841ee0
Merge branch 'master' into improve-reactintl 2018-03-01 15:24:38 +01:00
Jim LAURIE
d5ea6a5b64
Merge pull request #716 from strapi/upload-config-front 
Upload config front
 2018-03-01 15:24:23 +01:00
Jim LAURIE
520373d047
Merge branch 'master' into upload-config-front 2018-03-01 15:06:10 +01:00
Jim LAURIE
4ebcbcf409
Merge pull request #715 from strapi/add-media-ctb 
Add media ctb
 2018-03-01 15:05:48 +01:00
Jim LAURIE
a1ab33660b
Merge branch 'master' into add-media-ctb 2018-03-01 14:45:14 +01:00
Jim LAURIE
9b67868c8d
Merge pull request #708 from Froelund/patch-1 
Update logger.js
 2018-03-01 14:45:01 +01:00
Jim LAURIE
7e4effdb94
Merge branch 'master' into patch-1 2018-03-01 13:59:11 +01:00
cyril lopez
3d824bf6c5 Add locales to plugin generators 2018-03-01 13:51:10 +01:00
Jørgensen
2301f2c5e5
Update logging.md 2018-03-01 13:44:25 +01:00
Jim LAURIE
e0274cea50
Merge pull request #713 from rockmandash/Chinese-Translation 
Add Traditional Chinese Translation
 2018-03-01 13:44:07 +01:00
Kristian Frølund
d4e7a02e58 Merge branch 'master' into patch-1 2018-03-01 13:39:45 +01:00
Kristian Frølund
dc30ed4d90 Merge branch 'master' into patch-1 2018-03-01 13:38:57 +01:00
Kristian Frølund
72c830e24e Added logging documentation 2018-03-01 13:36:54 +01:00
cyril lopez
b7d2af3ba2 Take en default translation message if there are not present in the current locale 
This fix aims to improve and facilitate the upcoming new language pull requests.
It also remove the missing id error message in the console when developing on port 4000
 2018-03-01 13:12:22 +01:00
Jim LAURIE
9852794ee4
Merge branch 'master' into Chinese-Translation 2018-03-01 13:03:18 +01:00
Jim Laurie
bed6d144f9 Fix PR feedback 
More dynamic code
Fix typo
 2018-03-01 12:55:31 +01:00
Jim LAURIE
cf0b7dba22
Merge pull request #703 from strapi/alpha.10.3 
Alpha.10.3
 2018-03-01 11:54:47 +01:00
Jim LAURIE
d67d09ef90
Merge branch 'master' into alpha.10.3 2018-03-01 11:37:05 +01:00
cyril lopez
dd3e83596c Fix PR review 2018-03-01 11:34:55 +01:00
Joseph Wang
f35b2519ba language hot fix 2018-03-01 16:30:44 +08:00
Joseph Wang
a6bf74c622 finish adding traditional chinese translations 2018-03-01 11:50:33 +08:00
cyril lopez
8878b13e43 Merge branch 'feature/upload' of github.com:strapi/strapi into feature/upload 2018-02-28 18:50:48 +01:00