yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-23 09:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,445 Commits 111 Branches 484 Tags
Commit Graph

662 Commits

Author SHA1 Message Date
Aurelsicoko
c111aaba13 Fixes #1247 2018-05-24 17:20:32 +02:00
Jim LAURIE
74d3987a11
Merge branch 'master' into add-styled-component 2018-05-18 11:07:32 +02:00
Jim Laurie
31c0d7457a 3.0.0-alpha.12.2 2018-05-17 16:54:27 +02:00
Jim Laurie
4fe7b6176e Fix conflicts & lint 2018-05-16 12:07:02 +02:00
soupette
51f5adc56a Add styled-components 2018-05-15 14:07:18 +02:00
Jim LAURIE
0c6f86ce3e
Merge branch 'master' into eslint 2018-05-14 16:13:47 +02:00
soupette
17e9340276 Fixes #870 2018-05-14 14:17:51 +02:00
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
2df4cb3311 Remove npm run lint test in all packages 2018-05-07 09:29:35 +02:00
soupette
2580e49c4d Lint strapi-helper-plugin 2018-05-04 18:02:35 +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
4f498cea06 Add eslint to ctb backend 2018-04-30 17:27:46 +02:00
soupette
85cf6dfb91 Rename eslint folder 2018-04-30 16:56:45 +02:00
soupette
ba6011beda Fix popuprelation bug 2018-04-30 15:30:49 +02: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
cyril lopez
941726ba0c
Merge branch 'master' into fix-978 2018-04-27 09:27:51 +02:00
soupette
58e16b8d4c Fixes #978 2018-04-26 15:10:30 +02:00
Jim LAURIE
70cd38080e
Merge branch 'master' into fix-1041 2018-04-26 14:47:24 +02:00
soupette
5c49e76610 Fix PR feedback 2018-04-26 14:07:31 +02:00
soupette
d17f49c2e5 Fixes #1041 
I commented the DatetimeStyles import in the InputDate because it was messing with webpack.
Since the new config it is not doing it anymore.
 2018-04-26 13:44:26 +02:00
soupette
9e876370e0 Add comments 2018-04-25 17:27:09 +02:00
soupette
fb35bc75e0 Fix monorepo setup 2018-04-25 14:59:28 +02:00
soupette
0a9f81765e Add new commands to fix npm run setup inside a project 2018-04-25 14:33:38 +02:00
soupette
8db7e1ef30 Merge branch 'master' of github.com:strapi/strapi into improve-webpack-config 2018-04-24 13:41:37 +02:00
soupette
7f353bb94a Configurate extract-text-webpack-plugin 2018-04-23 18:25:12 +02:00
soupette
9b9aadcabd Remove sourceMap 2018-04-23 16:41:48 +02:00
soupette
fffb5ab023 Change webpack loaders 2018-04-23 12:34:11 +02:00
Jim Laurie
ebd144fddb 3.0.0-alpha.12 2018-04-18 12:03:16 +02:00
soupette
0f2ebfa997 Allow plugins without admin && fix babel polyfill error 2018-04-16 16:19:28 +02:00
Jim LAURIE
06555cf4d4
Merge branch 'master' into allow-new-input 2018-04-13 15:44:06 +02:00
soupette
d9291ae394 Allow to pass custom input type and components to the lib 2018-04-13 09:57:17 +02:00
cyril lopez
936bdf7949
Merge branch 'master' into fix-setup 2018-04-12 17:30:50 +02:00
soupette
3176f02a25 Fixes #858 2018-04-12 17:28:13 +02:00
Aurelsicoko
815f896ba8 Remove logs and clean code 2018-04-12 14:42:31 +02:00
soupette
37c976d495 WYSIWYG is ready 2018-04-12 09:49:29 +02:00
soupette
57e34cf994 Allow to add <a><img /><a> 2018-04-11 22:39:30 +02:00
soupette
54fc51592b Need to identify add ul bug 2018-04-11 22:13:43 +02:00
soupette
cdc92607d6 Handle img links!!!!!!!! 2018-04-11 19:36:08 +02:00
Aurelsicoko
534a1099ac Update CSS WYSIWYG 2018-04-11 15:08:20 +02:00
soupette
d31d82ab1f Fix conflicts 2018-04-11 12:45:21 +02:00
soupette
9c0cde3489 Add comments 2018-04-11 12:40:29 +02:00
soupette
81109f558e Fix conflict 2018-04-10 11:18:04 +02:00
soupette
58908c9ad3 Fix height 2018-04-10 11:17:37 +02:00
soupette
b8456dc779 Add usefull comment 2018-04-10 10:16:37 +02:00
soupette
0010e27442 Fix wysiwyg height 2018-04-10 10:13:16 +02:00
soupette
68c3c290b0 Add prettier 2018-04-09 16:47:31 +02:00