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

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
236d2a62ed
Merge branch 'master' into language-ko_kr 2018-07-10 10:44:25 +02:00
DMehaffy
01ca0434d9
Merge branch 'master' into Update_Docs_DM 2018-07-10 00:53:13 -07:00
DMehaffy
2abf6d46c5 Update Admin build Docs 2018-07-10 00:50:59 -07:00
Jim LAURIE
f5175bee36
Merge pull request #1337 from DanielRuf/chore/cache-dependencies 
Clear cache dependencies on Travis tests
 2018-07-10 09:49:41 +02:00
Jim LAURIE
51b32625cf
Merge branch 'master' into chore/cache-dependencies 2018-07-10 09:39:17 +02:00
Taihoon Kim
414453e02e fixed typos in Korean language 2018-07-10 14:13:13 +09:00
Jim LAURIE
f11b6da405
Merge pull request #1517 from strapi/improve-sql-table 
Improve SQL table creation/update performance
 2018-07-09 19:44:05 +02:00
Jim LAURIE
27a118522e
Merge branch 'master' into improve-sql-table 2018-07-09 19:29:17 +02:00
Jim LAURIE
30fed8ab78
Merge pull request #1530 from strapi/fix-1518 
Fixes Image Preview in InputFile
 2018-07-09 18:05:16 +02:00
Jim LAURIE
404c7474e2
Merge branch 'master' into fix-1518 2018-07-09 15:09:57 +02:00
Jim LAURIE
5cba57f91d
Merge pull request #1531 from strapi/fix-1387 
Fixes oneWay relation
 2018-07-09 15:08:11 +02:00
Jim LAURIE
13170a7678
Merge branch 'master' into fix-1387 2018-07-09 14:36:50 +02:00
cyril lopez
f8b6edb23f Fix display with onWay relation 2018-07-09 14:04:20 +02:00
David Thomas
c1d8b5e6ba Add "useNewUrlParser" Mongo driver connection option 
Fixes #1532
 2018-07-08 12:52:16 -04:00
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