9273 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	c7b0409613	Merge pull request #2802 from fromjonathan/patch-1 ... Improved educational flow and language.	2019-03-02 13:57:05 +01:00
Jim LAURIE	aa50a35593	Merge branch 'master' into patch-1	2019-03-02 13:56:51 +01:00
Jim LAURIE	8acb7b2c45	Update role name	2019-03-02 13:56:26 +01:00
Jim LAURIE	0d731bf8cb	Merge pull request #2911 from strapi/fix/users-count-role-sql ... Fix user count per role on SQL database	2019-03-02 13:49:01 +01:00
Jim LAURIE	720bb53858	Merge branch 'master' into fix/users-count-role-sql	2019-03-02 13:48:53 +01:00
Jim LAURIE	4286987d90	Merge pull request #2906 from strapi/add/npmLock ... Forcefully disable package-lock generation	2019-03-02 13:48:34 +01:00
Jim LAURIE	898c9c2aca	Merge branch 'master' into add/npmLock	2019-03-02 13:48:26 +01:00
Jim LAURIE	dac168cedb	Manage email and upload providers from an npm organisation	2019-03-01 17:09:19 +01:00
Jim LAURIE	d110a942eb	Remove token from register route if confirm email is required	2019-03-01 16:28:44 +01:00
Jim LAURIE	53e82cde6a	Fix bad token for confirmation link	2019-03-01 15:01:09 +01:00
Aurélien Georget	9090c8effd	Fix conflicts	2019-03-01 12:55:43 +01:00
Jim LAURIE	cca2ea98dc	Fix user count per role on SQL database	2019-03-01 10:52:52 +01:00
Jim LAURIE	b0c12a3912	Merge pull request #2907 from EpicUsaMan/patch-4 ... Fix for SQLite #2879	2019-03-01 10:29:59 +01:00
Jim LAURIE	81fb449f28	Merge branch 'master' into patch-4	2019-03-01 10:29:49 +01:00
EpicUsaMan	2c2e22d48c	Fix for UPPERCASE / camelCase names	2019-02-28 21:41:46 +02:00
Jim LAURIE	9ba21014eb	Merge pull request #2896 from strapi/fix/#2783 ... Fix update entry when empty date field	2019-02-28 18:59:12 +01:00
Jim LAURIE	68ea58d8c7	Merge branch 'master' into fix/#2783	2019-02-28 18:58:51 +01:00
EpicUsaMan	ae50cace6e	Fix for SQLite	2019-02-28 19:27:36 +02:00
EpicUsaMan	32361e2949	Fix for SQLite	2019-02-28 19:22:01 +02:00
DMehaffy	ed1d5f05ce	Forcefully disable package-lock generation	2019-02-28 09:54:50 -07:00
Jim LAURIE	93cc29fe51	Merge pull request #2883 from strapi/onboarding-videos ... Getting started videos	2019-02-28 17:41:22 +01:00
Jim LAURIE	d5c4f1c055	Merge branch 'master' into onboarding-videos	2019-02-28 17:41:14 +01:00
Jim LAURIE	017df84bab	Merge pull request #2650 from hashinteractive/mailgun-attachment ... Added attachment property to mailgun msg object	2019-02-28 16:34:24 +01:00
Jim LAURIE	bec6534a07	Merge branch 'master' into mailgun-attachment	2019-02-28 16:34:17 +01:00
Abdón Rodríguez Davila	0735f113cc	Update packages/strapi-plugin-content-manager/admin/src/containers/EditPage/saga.js ... Co-Authored-By: soupette <cyril.lpz@gmail.com>	2019-02-28 16:19:57 +01:00
Ky	974f723d1b	PR template merge	2019-02-28 15:08:35 +01:00
Aurélien Georget	03d212d10f	Fix conflicts	2019-02-28 14:44:01 +01:00
REDDY PRASAD	5fa45859c9	💅 Implement 'step' feature for InputNumber component	2019-02-28 16:28:06 +05:30
hhhung	96bfc820c3	trigger beforeUpdate and afterUpdate hooks	2019-02-28 16:40:35 +08:00
soupette	2448bc63fe	Fix button delay	2019-02-27 17:51:41 +01:00
soupette	d3a4c2a6f3	Add new state to overlay blocker	2019-02-27 17:48:06 +01:00
Ky	cbb365afae	refacto before PR	2019-02-27 17:02:30 +01:00
virginieky	b4fd2f4b6f	Merge branch 'master' into onboarding-videos	2019-02-27 14:50:01 +01:00
Ky	b1a01c352d	some fixes before PR	2019-02-27 14:49:04 +01:00
Ky	a7b96daab0	FF & Safari fonts	2019-02-27 14:27:18 +01:00
Ky	da50cf098a	dirty comments removing	2019-02-27 11:58:46 +01:00
Ky	b7fb018f73	Open videos box on first co optim	2019-02-27 11:55:24 +01:00
soupette	4e385cbfd1	Fixes #2783	2019-02-27 09:35:21 +01:00
Ky	7ddb21c2f7	Trad	2019-02-26 18:22:07 +01:00
Ky	38b0d616bc	CSS tidy	2019-02-26 17:11:13 +01:00
Ky	03de112d09	Algo fixes on prod mode	2019-02-26 16:57:32 +01:00
Jim LAURIE	c101241611	Merge pull request #2890 from strapi/add/sqlitePRTemplate ... Add SQLite to PR Template	2019-02-26 11:46:37 +01:00
DMehaffy	b5b9611bf3	Add SQLite to PR Template	2019-02-26 03:31:11 -07:00
Ky	8c66abdd41	commit before merge	2019-02-26 10:55:30 +01:00
Ky	be68216df3	commit before merge	2019-02-26 10:51:35 +01:00
Abdón Rodríguez Davila	ff8e5ee8e8	Merge branch 'master' into patch-1	2019-02-26 10:38:04 +01:00
Ky	484622e85b	get videos sage algo optim for prod env	2019-02-26 10:28:47 +01:00
cyril lopez	95433180ca	Merge branch 'master' into onboarding-videos	2019-02-25 17:46:32 +01:00
Aurélien Georget	76efe64591	Add events in the settings-manager	2019-02-25 15:41:12 +01:00
virginieky	9a7bdb0247	Merge branch 'master' into onboarding-videos	2019-02-25 14:59:35 +01:00