yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 16:59:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 115 Branches 488 Tags
Commit Graph

942 Commits

Author SHA1 Message Date
Jim LAURIE
c09f5138a2
Merge branch 'master' into eslint 2018-05-07 16:03:35 +02:00
Jim Laurie
8f5443db17 3.0.0-alpha.12.1.3 2018-05-07 10:46:43 +02:00
soupette
e9f68a3bc9 Lint in strapi-bookshelf 2018-05-04 17:29:44 +02:00
soupette
6633b14ef3 Add lint to strapi 2018-05-04 17:02:27 +02:00
Abdón Rodríguez Davila
0fbf3cae79 Ignore .editorconfig & .gitattributes in npm plugins & admin 2018-05-04 16:47:07 +02:00
soupette
f9f78745ca Change test logic 2018-05-04 15:38:42 +02:00
soupette
74de4da177 Change test 2018-05-04 11:55:34 +02:00
soupette
601143b4d5 Remove eslint dependencie in all packages 2018-05-04 11:08:41 +02:00
soupette
2a30a20e7e Important! fix monorepo setup build command 2018-05-03 17:39:24 +02:00
Jim Laurie
c491c61a97 3.0.0-alpha.12.2 2018-05-03 14:15:21 +02:00
soupette
30528f40ec Add eslint to strapi-admin backend 2018-05-02 11:01:27 +02:00
Jim LAURIE
a3d9454ee0
Merge branch 'master' into fix-ctb 2018-05-01 11:29:31 +02:00
Zhuang
7634ff5602 add simplify chineses translation for plugins 2018-04-30 22:09:53 +08:00
soupette
ba6011beda Fix popuprelation bug 2018-04-30 15:30:49 +02:00
Zhuang
97531cc3d2 Merge branch 'master' of https://github.com/strapi/strapi into add_simply_chinese_translation 2018-04-30 16:56:19 +08:00
soupette
0ca85934ac Add strapi-lint to ctm plugin and modify monorepo setups script to install it. 
Now the strapi-lint is installed in both the ctm and the helper-plugin. It will be installed in all plugins later.

Important the updated eslint configuration requires to modify a lot of files....
 2018-04-27 16:25:23 +02:00
Jim LAURIE
1850d5539b
Merge branch 'master' into improve-webpack-config 2018-04-26 14:20:10 +02:00
soupette
d2b6667666 Fix menu footer css 2018-04-26 11:27:37 +02:00
soupette
42c64091e2 Fixes 770 2018-04-26 11:24:47 +02:00
soupette
9e876370e0 Add comments 2018-04-25 17:27:09 +02:00
soupette
b7fffb0ce7 Fixes #958 2018-04-25 16:34:20 +02:00
soupette
0a9f81765e Add new commands to fix npm run setup inside a project 2018-04-25 14:33:38 +02:00
Herbert Lin
a717faa817 Merge branch 'master' of https://github.com/XcrossD/strapi 2018-04-24 18:00:52 +08:00
Herbert Lin
0db8f05e8b Temp fix for LeftMenuFooter style. 2018-04-24 17:59:30 +08:00
Jim LAURIE
f2cb6d7af8
Merge branch 'master' into master 2018-04-24 11:29:39 +02:00
Jim LAURIE
36393b9594
Merge branch 'master' into reduce-setup-monorepo 2018-04-23 12:32:01 +02:00
XcrossD
43357bf49b
Update LeftMenuFooter style 2018-04-23 11:20:14 +08:00
Zhuang
77c6506ff1 add Simple Chinese translation 2018-04-22 22:00:10 +08:00
Abdón Rodríguez Davila
147725f689 Fix exec command in uninstall plugin 2018-04-19 15:49:16 +02:00
Abdón Rodríguez Davila
686a278406
Fix exec command when the path has spaces 
Fixes #962
 2018-04-19 13:10:34 +02:00
soupette
21e45890db Fixes #964 2018-04-18 14:25:56 +02:00
Jim Laurie
ebd144fddb 3.0.0-alpha.12 2018-04-18 12:03:16 +02:00
cyril lopez
77bc3975c4
Merge branch 'master' into reduce-setup-monorepo 2018-04-18 11:54:36 +02:00
soupette
f419f9383c Fix setup time info 2018-04-18 11:51:16 +02:00
Aurelsicoko
5320c417a5 Remove price 2018-04-18 11:43:55 +02:00
Aurelsicoko
53bedf277b Fix version number in left menu 2018-04-17 16:05:10 +02:00
Aurelsicoko
79e3b56a1e Remove unnecessary admin and add GraphQL logo 2018-04-17 15:24:17 +02:00
cyril lopez
f0eca93f93
Merge branch 'master' into reduce-setup-monorepo 2018-04-17 12:04:55 +02:00
soupette
fcc374c3fd Fix conflicts 2018-04-17 11:50:52 +02:00
soupette
58dd77acb9 Allow async build 2018-04-17 11:43:47 +02:00
Aurelsicoko
aa6fdb2c93 Resolve conflicts 2018-04-17 11:12:41 +02:00
Aurelsicoko
d96192025b Add link on blog articles 2018-04-17 11:10:23 +02:00
soupette
d620053799 Add username to welcome block 2018-04-16 18:57:08 +02:00
soupette
f13ace8599 Add latest articles to HomePage 2018-04-16 18:13:36 +02:00
Jim Laurie
3da6115fac Add upload provider documentation 2018-04-16 14:17:21 +02:00
Administrator
d030dc06ba Russian language pack update. Admin translations fixes + Content manager translations added. 2018-04-15 13:30:31 +03:00
Administrator
8941d8683d russian language 2018-04-14 23:54:21 +03:00
Jim LAURIE
4a8ab72a55
Merge branch 'master' into fix/welcome-dashboard 2018-04-13 16:36:03 +02:00
Jim LAURIE
42d3009638
Merge branch 'master' into fix/upload-cout 2018-04-13 16:13:21 +02:00
Aurélien GEORGET
8da3c8c66f
Change link 2018-04-13 16:08:37 +02:00