yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 19:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,850 Commits 122 Branches 507 Tags
Commit Graph

1850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Laurie
5b575ffac5 Remove knex client dependencies 2017-09-29 15:43:56 +02:00
Jim Laurie
3f640d2f8d Fix description 2017-09-29 15:11:37 +02:00
Aurelsicoko
76290f2034 Use symlink instead of npm link to install development plugin 2017-09-29 14:56:29 +02:00
Jim Laurie
41718d31d1 Merge branch 'alpha.6' of https://github.com/strapi/strapi into improvement/configs 2017-09-29 14:45:00 +02:00
Aurelsicoko
85bf446979 Improve readibility of contributing guide 2017-09-29 14:33:41 +02:00
Aurelsicoko
e025ef3813 Resolve conflicts 2017-09-29 14:30:51 +02:00
Jim Laurie
042e66513e Fix require model utils 2017-09-29 14:26:28 +02:00
Aurelsicoko
d5c964f539 Add contributing guide 2017-09-29 14:20:17 +02:00
Jim Laurie
c97893a700 Merge branch 'alpha.6' of https://github.com/strapi/strapi into improvements/filters 2017-09-29 13:11:14 +02:00
Aurélien GEORGET
9a9a8499b1 Update README.md 2017-09-29 11:29:17 +02:00
Aurélien GEORGET
29f89e0101 Merge pull request #260 from strapi/plugin-requirement-hoc 
Plugin requirement hoc
 2017-09-29 11:19:50 +02:00
cyril lopez
a033d97e34 Change pluginRequirements file to requirements 2017-09-28 14:31:51 +02:00
cyril lopez
5a1fae533a Remove logs, and hange params name 2017-09-28 14:28:57 +02:00
cyril lopez
9b71c2be10 Fix conflict 2017-09-28 14:19:26 +02:00
cyril lopez
594c3832ac Export default in pluginRequirements and bootstrap files 2017-09-28 14:15:15 +02:00
cyril lopez
2a6dc8c821 Fix PR feedback 2017-09-28 14:00:22 +02:00
Jim Laurie
7bd5f1021e Fix conflicts 2017-09-28 13:18:36 +02:00
cyril lopez
2772219a44 fix conflict 2017-09-28 12:20:52 +02:00
Aurélien GEORGET
99d03e22e0 Merge pull request #259 from strapi/fix/admin 
Fix/admin
 2017-09-28 12:19:55 +02:00
cyril lopez
76ae6ee6dd Add bootstrap file to content-manager plugin 2017-09-28 12:16:24 +02:00
cyril lopez
6f2310e62d Add environment check to settings-manager pluginRequirement, add button to ProductionBlocker component 2017-09-28 11:41:58 +02:00
cyril lopez
06df5282ce Remove unknow props in content header button in content-type-builder plugin 2017-09-27 20:10:00 +02:00
cyril lopez
ac11c46858 Created Production blocker component 2017-09-27 19:25:14 +02:00
cyril lopez
8b73665923 Created autoReloadblocker component and add pluginRequirements file to content-type-builder-plugin 2017-09-27 19:15:03 +02:00
Pierre Burgy
ef53832334 Merge branch 'fix/admin' of https://github.com/strapi/strapi into fix/admin 2017-09-27 18:41:12 +02:00
Pierre Burgy
056503d382 Delete files folder 2017-09-27 18:40:37 +02:00
Aurelsicoko
a8f07f1d0a Merge branch 'fix/admin' of github.com:strapi/strapi into fix/admin 2017-09-27 17:56:19 +02:00
Aurelsicoko
1d6d91435e Create development project based on symlinks and update default configs 2017-09-27 17:55:51 +02:00
cyril lopez
937a1a9e3f Add pluginRequirements function to block plugin rendering 2017-09-27 17:54:18 +02:00
Pierre Burgy
1d887250f4 Merge branch 'fix/admin' of https://github.com/strapi/strapi into fix/admin 2017-09-27 17:23:04 +02:00
Pierre Burgy
a2608cd066 Throw error on generateMenu fail 2017-09-27 17:22:21 +02:00
Aurelsicoko
9951b44d02 Allow to start WebPack server without plugins 2017-09-27 17:18:43 +02:00
Pierre Burgy
a68f19447b Add cheerio dependency in strapi-admin 2017-09-27 17:15:01 +02:00
Pierre Burgy
15cf4c979f Add React imports in settings manager 2017-09-27 17:13:15 +02:00
Aurélien GEORGET
2304d66306 Merge pull request #254 from strapi/plugin/content-manager 
Plugin/content manager
 2017-09-27 16:12:18 +02:00
Pierre BURGY
a3b2476f39 Merge pull request #258 from strapi/fix/table-values 
Fix table values display
 2017-09-27 16:12:06 +02:00
Aurelsicoko
a941eccd34 Change alias path in development mode 2017-09-27 15:59:52 +02:00
Pierre Burgy
3ff690aba3 Fix table values display 2017-09-27 15:36:27 +02:00
Aurelsicoko
c222a874fd Resolve conflicts 2017-09-27 15:21:19 +02:00
Pierre BURGY
c1593002a9 Merge pull request #257 from strapi/fix/type-number 
Fix number type format issue in content manager
 2017-09-27 15:18:15 +02:00
Aurelsicoko
4a270ee348 Use DllPlugin to share dependencies accross builds 2017-09-27 15:09:46 +02:00
Pierre BURGY
8e3eb0d94f Merge pull request #256 from strapi/fix/select-translations 
Fix type number options translations
 2017-09-27 15:07:26 +02:00
Pierre Burgy
0a87ec4419 Fix number type format issue in content manager 2017-09-27 15:04:28 +02:00
Pierre Burgy
f0cb57f50d Fix type number options translations 2017-09-27 14:34:05 +02:00
Jim Laurie
c2d35be9b5 Fix conflicts 2017-09-27 13:56:10 +02:00
Jim Laurie
82d62f04f3 Disable security middlewares for admin/plugins 2017-09-27 13:42:34 +02:00
Aurélien GEORGET
cc0ecd8783 Merge pull request #255 from strapi/fix/plugin-nav 
Fix/plugin nav
 2017-09-27 12:15:19 +02:00
cyril lopez
63a7acae6e Clean svg 2017-09-26 18:14:48 +02:00
Aurelsicoko
16b5056200 Fix route health 2017-09-26 17:56:44 +02:00
cyril lopez
439513e7ce Change port config 2017-09-26 17:54:28 +02:00