1099 Commits

Author SHA1 Message Date
Jim Laurie
38fc1aade7 Fix input relation 2018-05-06 20:34:33 +02:00
Abdón Rodríguez Davila
0fbf3cae79 Ignore .editorconfig & .gitattributes in npm plugins & admin 2018-05-04 16:47:07 +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
Jim Laurie
c491c61a97 3.0.0-alpha.12.2 2018-05-03 14:15:21 +02:00
Aurelsicoko
c67e2ef6d4 Avoid to loose relationship when editing from the many side 2018-05-03 12:08:35 +02:00
Aurelsicoko
e9202c7a24 Fix loosing of morph relations on update in CM with Bookshelf 2018-05-02 17:52:23 +02:00
Aurelsicoko
2fe530e334 Merge branch 'master' of github.com:strapi/strapi into upload/bookshelf 2018-05-02 17:08:07 +02:00
Aurelsicoko
e3fc6ad30b Remove the return to avoid the loop break 2018-05-02 17:07:03 +02:00
Jim LAURIE
e6a14367f3
Merge branch 'master' into fix-cm-entry-relations 2018-05-02 17:04:41 +02:00
Aurelsicoko
ce3d52d73e Fix single upload with Bookshelf 2018-05-02 16:15:36 +02:00
Jim Laurie
3ea2c8a775 Fix entry create relations 2018-05-02 15:39:12 +02:00
Jim LAURIE
a3d9454ee0
Merge branch 'master' into fix-ctb 2018-05-01 11:29:31 +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
8a4412d6d6 Add eslint to ctm backend folders 2018-04-30 16:32:48 +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
soupette
62246d185f Fix conflicts 2018-04-30 14:04:08 +02:00
Jim LAURIE
9cc62373f0
Merge branch 'master' into sql-xp 2018-04-27 16:29: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
Jim Laurie
d986cb4cc8 Fix relation table creation 2018-04-27 14:53:09 +02:00
Jim Laurie
a6c0616dfc Handle update type 2018-04-27 13:47:09 +02:00
Jim LAURIE
1850d5539b
Merge branch 'master' into improve-webpack-config 2018-04-26 14:20:10 +02:00
Jim Laurie
273f22c70d Fix entry value 2018-04-26 14:10:17 +02:00
Jim Laurie
1ee8d9b30a Fix PR feedback - handle type float 2018-04-26 13:47:40 +02:00
soupette
611dfb32eb Merge branch 'master' of github.com:strapi/strapi into sql-xp 2018-04-26 10:26:09 +02:00
soupette
b7fffb0ce7 Fixes #958 2018-04-25 16:34:20 +02:00
Jim Laurie
dcf020662c Fix manyToMany content manager 2018-04-25 15:40:49 +02:00
Aurelsicoko
265fb1bdd9 Fix beforeCreate lifecycle 2018-04-25 12:23:53 +02:00
Jim Laurie
8d2a46cd0c Fix conflict timestamp 2018-04-25 11:06:12 +02:00
Jim Laurie
ad32122a27 Create many to many table 2018-04-24 17:48:15 +02:00
Jim LAURIE
8139325672
Merge branch 'master' into mongoose/decimal 2018-04-24 15:40:18 +02:00
Aurelsicoko
edf0f97678 Improve Decimal128 and Float support with MongoDB 2018-04-24 15:24:42 +02:00
Jim LAURIE
65d49d0da2
Merge branch 'master' into fix-763 2018-04-24 12:09:58 +02:00
soupette
6b3e3d472f Improve errors notifications 2018-04-24 11:45:09 +02:00
soupette
b713648d4c Fixes #763 2018-04-24 10:13:09 +02:00
Jim LAURIE
045a942e23
Merge branch 'master' into issues/924 2018-04-23 16:13:59 +02:00
Jim LAURIE
a77adb5b6a
Merge branch 'master' into fix-search-select 2018-04-23 13:36:01 +02:00
Aurelsicoko
99f2b34549 Fix loose of file relation & select latest associated file 2018-04-23 12:59:53 +02:00
Jim LAURIE
36393b9594
Merge branch 'master' into reduce-setup-monorepo 2018-04-23 12:32:01 +02:00
soupette
85836ee5be Remove useless requestUrlSuffix 2018-04-23 11:36:21 +02:00
soupette
2817ad6a33 Fixes #979 2018-04-20 10:49:05 +02:00
soupette
44d3519130 remove relations 2018-04-19 17:23:23 +02:00
soupette
5a9e9ef53b Fixes #959 2018-04-19 17:19:56 +02:00
soupette
02dac8e579 Undo ctm service modifications 2018-04-19 15:52:51 +02:00
soupette
81383f3562 Fixes #959 2018-04-19 15:45:35 +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