yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 17:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,877 Commits 115 Branches 488 Tags
Commit Graph

5877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Thomas
6143c3e1ca Skip number conversion on string fields 
Fixes #1524
 2018-07-08 09:50:48 -04:00
Jim LAURIE
09e8892190
Merge branch 'master' into yarn-install 2018-07-08 10:57:51 +02:00
Jim LAURIE
aab2f3e06c
Merge pull request #1528 from kishu/language-ko_kr 
Korean Language Support
 2018-07-08 10:54:39 +02:00
kishu
dea62861f0 update language list in admin panel to be scrollable 
Squashed commits:
[91c28113b] update language list in admin panel to be scrollable
 2018-07-08 15:31:45 +09:00
kishu
5edf9111cf fixed typos 2018-07-08 15:12:00 +09:00
Broc Gailit
c9800a6581
Merge branch 'master' into master 2018-07-06 14:01:39 -07:00
cyril lopez
3f6da374cb Fixes #1387 #1374 2018-07-06 14:39:18 +02:00
cyril lopez
d319d22f91 Fixes #1518 2018-07-06 14:15:59 +02:00
Taihoon Kim
14c2376216
Merge branch 'master' into language-ko_kr 2018-07-06 20:49:57 +09:00
cyril lopez
f1bc53aea3 Fix apply default settings to new apis 2018-07-06 13:21:50 +02:00
Jim LAURIE
b48dced09d
Merge pull request #1520 from strapi/api-search 
Add search in generated API
 2018-07-06 13:15:42 +02:00
cyril lopez
92b86bed81 Add comments 2018-07-06 12:40:16 +02:00
cyril lopez
6af99aebdc Fix css 2018-07-06 12:34:11 +02:00
Jim LAURIE
a4d3bbf25a
Merge branch 'master' into api-search 2018-07-06 11:52:35 +02:00
Taihoon Kim
5cfb9e9439 Korean Language Support 2018-07-06 15:34:20 +09:00
Wanfung Lee
30371a42bb
Workaround fix for react-select rerender bug 
https://github.com/JedWatson/react-select/issues/2277
 2018-07-05 23:31:32 -07:00
Wanfung Lee
10abf7a270
Workaround fix for react-select rerender bug 
https://github.com/JedWatson/react-select/issues/2277
 2018-07-05 23:30:42 -07:00
Wanfung Lee
feae421606
Bump react-select dependency 2018-07-05 23:28:39 -07:00
cyril lopez
b9b2e55d4b Merge branch 'master' of github.com:strapi/strapi into settings-ctm 2018-07-05 18:05:28 +02:00
cyril lopez
3bfbd6b5c4 Reset settingsPage props on unmount hook 2018-07-05 18:03:19 +02:00
cyril lopez
23a354092b PUT new settings 2018-07-05 17:57:30 +02:00
cyril lopez
56152f4462 Update schema in ctm bootstrap file to reflect the updated values 2018-07-05 17:09:34 +02:00
Jim LAURIE
d09b0b1550 API search bookshelf 2018-07-05 11:28:55 +02:00
Kati Frantz
3ea2c2023f update ctx.request.body to be ctx.request.body.providers, to ensure only permissions are saved to database with no extra keys 2018-07-05 09:57:42 +01:00
Kati Frantz
d3ef2f8e3c fetch current actions from database 
use results for comparing if new actions have been added to controllers
 2018-07-05 09:57:12 +01:00
Jim LAURIE
d44262e94b API search mongoose 2018-07-05 10:22:43 +02:00
Jim LAURIE
12ee30ae92
Merge pull request #1519 from hectorgrecco/patch-1 
Update pt-BR.json
 2018-07-05 09:11:45 +02:00
Hector Grecco
5182243268
Update pt-BR.json 2018-07-04 16:45:16 -03:00
Jim LAURIE
a09eead625 Add debug option in doc 2018-07-04 18:33:50 +02:00
Jim LAURIE
6203bdc200 Fix json store object 2018-07-04 18:08:42 +02:00
Jim LAURIE
d17def7a12 Add options to disable auto table/column creation 2018-07-04 17:23:04 +02:00
cyril lopez
2ee5558272 Prevent from displaying toggle search and sort on array || json attributes 2018-07-04 17:00:03 +02:00
cyril lopez
bc248b9f54 Design setting page 2018-07-04 16:49:15 +02:00
Jim LAURIE
bc7f210771 Improve SQL table creation/update performance 2018-07-04 16:20:44 +02:00
cyril lopez
4966c78f56 Handle edit label sort and search per attr 2018-07-03 19:36:01 +02:00
cyril lopez
3e42d86460 Merge branch 'master' of github.com:strapi/strapi into settings-ctm 2018-07-03 18:31:41 +02:00
cyril lopez
86824b536a Handle add attr 2018-07-03 18:30:34 +02:00
Jim LAURIE
5599f5f72c
Merge pull request #1495 from sekmet/language-pt_BR 
Brazilian Portuguese Language Support
 2018-07-03 18:05:22 +02:00
Jim LAURIE
ae58979892
Merge branch 'master' into language-pt_BR 2018-07-03 17:52:04 +02:00
Jim LAURIE
76fc0b894d
Merge pull request #1451 from strapi/review-logs 
Review Strapi logs new/start
 2018-07-03 17:51:41 +02:00
cyril lopez
c80acd859e Handle remove attr from list 2018-07-03 17:48:51 +02:00
Jim LAURIE
383538e44b
Merge branch 'master' into review-logs 2018-07-03 17:35:08 +02:00
Jim LAURIE
e08afef426
Merge pull request #1506 from strapi/fix-one-way 
Fix loose oneWay relation on update content type
 2018-07-03 17:34:28 +02:00
Jim LAURIE
c047c6f1f0
Merge branch 'master' into fix-one-way 2018-07-03 17:17:31 +02:00
Jim LAURIE
6276f33ed7 Clean comments 2018-07-03 17:15:33 +02:00
Jim LAURIE
f2f06cd966 Merge branch 'yarn-install' of github.com:strapi/strapi into yarn-install 2018-07-03 17:10:40 +02:00
Jim LAURIE
74adea6a40
Merge branch 'master' into yarn-install 2018-07-03 17:10:00 +02:00
Jim LAURIE
13013a40b4 Improve find npm global strapi performance 2018-07-03 16:43:08 +02:00
Johann Pinson
ffaa3fb92a fix(graphql): add time attribute type to DateTime scalar 2018-07-03 16:31:25 +02:00
Jim LAURIE
7ab5d0ed69
Merge pull request #1500 from brinley/patch-1 
Fixed incorrect import for utils/request
 2018-07-03 14:39:06 +02:00