29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
davidkartuzinski	f6214a7369	added Algolia to config.js for docs	2019-07-02 10:20:21 +02:00
Alexandre BODIN	08e229997c	Merge branch 'master' into master	2019-07-02 09:37:27 +02:00
Alexandre Bodin	899144f717	Merge branch 'master' into develop	2019-07-02 08:45:15 +02:00
soupette	d6409eb6fc	Update trads for the leftmenu	2019-07-02 08:15:29 +02:00
Alexandre BODIN	4e228af529	Merge branch 'master' into fix-removal-of-double-quotes	2019-07-02 00:00:17 +02:00
Virginie Ky	0c970973c5	PR review UI	2019-07-01 19:15:41 +02:00
Virginie Ky	cce49dc4b8	PR review	2019-07-01 19:14:57 +02:00
Virginie Ky	30b9eb0650	lint	2019-07-01 15:09:27 +02:00
Virginie Ky	13daa02967	GroupPage clean	2019-07-01 14:44:52 +02:00
Virginie Ky	9138f5529f	ViewContainer clean	2019-07-01 12:28:31 +02:00
Alexandre BODIN	a6bc907f5d	Merge pull request #3519 from strapi/fix/lodash-dependency ... Fix lodash depedency for email providers	2019-07-01 10:46:42 +02:00
Alexandre BODIN	3bedc377be	Merge branch 'master' into fix/lodash-dependency	2019-07-01 10:43:43 +02:00
Alexandre BODIN	457e8a6306	Merge pull request #3541 from strapi/fix/koa-grant-new-release-breaking ... Fix grant-koa breaking with strapi on grant-koa v4.6.0	2019-06-29 15:05:10 +02:00
Alexandre BODIN	5230efe52f	Merge branch 'master' into fix/koa-grant-new-release-breaking	2019-06-29 15:04:51 +02:00
Brjig	0c6ca74542	Merge branch 'master' into master	2019-06-27 22:14:27 -04:00
Berdj Abrahamian	65e9db6b7c	Bad formatting from IDE	2019-06-27 22:06:21 -04:00
Berdj Abrahamian	8d0ea7c81a	Admin Sidebar not scrolling on firefox ... #3081	2019-06-27 21:58:37 -04:00
Alexandre Bodin	0112a9726a	v3.0.0-beta.8 v3.0.0-beta.8	2019-06-27 19:40:33 +02:00
Alexandre BODIN	d4acfa9f87	Merge branch 'master' into master	2019-06-27 19:37:04 +02:00
Alexandre BODIN	054bd41158	Merge branch 'master' into fix/koa-grant-new-release-breaking	2019-06-27 18:26:41 +02:00
Alexandre BODIN	6d76651138	Merge pull request #3540 from strapi/fix/admin-plaintext-pwd ... Fix admin pwd persisted in plaintext on edit	2019-06-27 18:25:54 +02:00
Alexandre Bodin	44a382149f	Fix grant-koa breaking with strapi on grant-koa v4.6.0	2019-06-27 18:24:04 +02:00
Alexandre BODIN	350b450fd0	Merge branch 'master' into fix/admin-plaintext-pwd	2019-06-27 18:03:14 +02:00
Alexandre Bodin	73667dec7c	Fix admin pwd persisted in plaintext on edit	2019-06-27 17:46:52 +02:00
Jim LAURIE	74de9c9597	Fix lodash depedency for email providers	2019-06-24 16:11:24 +02:00
Virginie Ky	07dd4af7f9	clean GroupPage	2019-06-24 14:39:46 +02:00
Virginie Ky	1c950bd20b	lint fixes	2019-06-24 14:20:03 +02:00
Virginie Ky	92a4a877fd	GroupPage unit tests	2019-06-24 12:23:47 +02:00
Alexandre BODIN	6159fd0d56	Merge pull request #3511 from strapi/lauriejim-patch-1 ... Update Slack badge URL	2019-06-23 20:37:06 +02:00
Jim LAURIE	796d311bd5	Update Slack badge URL	2019-06-22 12:04:17 +02:00
David Kartuzinski	5b45ff72cc	Removed unnecessary sentence	2019-06-21 18:37:53 +02:00
Virginie Ky	8bd089b821	GroupPage ViewContainer and models clean	2019-06-21 17:06:49 +02:00
Alexandre BODIN	03be97a363	Merge pull request #3478 from acupajoe/fix/cta/delete-all-or-selected-text ... Change CTA label to delete selected entries	2019-06-21 15:40:34 +02:00
Alexandre BODIN	73c9dadbe2	Merge branch 'master' into fix/cta/delete-all-or-selected-text	2019-06-21 15:40:27 +02:00
Alexandre BODIN	033dfda6c7	Merge pull request #3140 from Achder/fixes-#3136 ... Add the option for a different Amazon SES domain	2019-06-21 14:58:44 +02:00
Alexandre BODIN	92ac6680f0	Merge branch 'master' into fixes-#3136	2019-06-21 14:57:40 +02:00
Alexandre BODIN	9d557fd714	Merge branch 'master' into master	2019-06-21 14:49:10 +02:00
Alexandre Bodin	eee69452ea	v3.0.0-beta.7 v3.0.0-beta.7	2019-06-21 14:34:56 +02:00
Alexandre BODIN	ae5277cd08	Merge pull request #3503 from strapi/chore/ignore-docs-getstarted ... Clear exemple strapi-plugin-documentation and add it to gitignore	2019-06-21 14:26:51 +02:00
Alexandre BODIN	2d58f2523e	Merge branch 'master' into chore/ignore-docs-getstarted	2019-06-21 14:26:22 +02:00
Alexandre Bodin	60ed10d1a3	Clean exemplae documentation and add it to gitignore	2019-06-21 14:16:45 +02:00
Alexandre BODIN	5a8b52abac	Merge pull request #3461 from rjlopezdev/master ... Update ES translations	2019-06-21 14:16:11 +02:00
Alexandre BODIN	3609e0a53d	Merge branch 'master' into master	2019-06-21 14:16:03 +02:00
Alexandre BODIN	245cb4ab16	Merge pull request #3468 from johnnyshields/patch-1 ... Update JA translation	2019-06-21 14:15:48 +02:00
Alexandre BODIN	78cb7fe496	Merge branch 'master' into patch-1	2019-06-21 14:14:47 +02:00
Alexandre BODIN	2e8cb52110	Merge pull request #3501 from nicky-lenaers/fix/dutch-translations ... Update NL translations	2019-06-21 14:13:52 +02:00
Alexandre BODIN	19b4c23265	Merge branch 'master' into fix/dutch-translations	2019-06-21 14:12:42 +02:00
Alexandre BODIN	176d06295b	Merge branch 'master' into master	2019-06-21 12:09:30 +02:00
Alexandre BODIN	56fb21a235	Merge pull request #3466 from strapi/chore/use-koa-joi-router ... Replace koa-router-joi (strapi fork) by original and maintained	2019-06-21 12:08:42 +02:00
Nicky Lenaers	34a93940ff	fix: update dutch translations for user flyout menu	2019-06-21 11:45:39 +02:00