307 Commits

Author	SHA1	Message	Date
Jason Lei	9861b9ad3f	Bringing files up to date with master, fixing the missing contributor code.	2018-09-17 15:50:13 +08:00
Jason Lei	a3bdd9b3fb	Merge branch 'master' into graphql/mutations-aggregations-decimals	2018-09-15 19:53:48 +08:00
soupette	7906e43129	Fix conflicts	2018-09-14 13:48:43 +02:00
Jim LAURIE	4d8ace2db7	3.0.0-alpha.14.1.1	2018-09-13 18:39:37 +02:00
Jim LAURIE	67112e92cd	Merge branch 'master' into graphql/mutations-aggregations-decimals	2018-09-13 15:00:02 +02:00
Jim LAURIE	f10335d717	3.0.0-alpha.14.1	2018-09-12 12:41:11 +02:00
uyouthe	2f2ad51804	Font-family declarations fixed	2018-09-10 20:59:33 +03:00
Jason Lei	3378403954	GraphQL Mutations, Aggregations, Decimals ... Merging Mutations and Aggregations. Fixed Mongoose Hook to use Decimals (2 decimal places) and Floats (20 decimal places).	2018-09-10 16:05:00 +08:00
soupette	fc2dcfb420	Merge branch 'master' of github.com:strapi/strapi into add-description-to-plugins-routes	2018-09-06 10:12:04 +02:00
soupette	bf46f84cc1	Add descriptions to upload routes	2018-09-06 10:10:20 +02:00
Jim LAURIE	b5a41534f2	Merge branch 'master' into master	2018-08-28 20:40:36 +02:00
Jim LAURIE	cecef7385f	3.0.0-alpha.14	2018-08-27 16:30:16 +02:00
Yilin Gan	2ede104be5	update s3 delete & upload controller	2018-08-23 11:43:05 -07:00
yummyelin	8fe1878c13	Merge branch 'master' into master	2018-08-23 10:41:13 -07:00
soupette	8003982b08	Fix conflicts	2018-08-22 14:17:09 +02:00
Jim LAURIE	07ca225eb0	Merge branch 'master' into master	2018-08-21 16:46:57 +02:00
Jim LAURIE	dcfc5b8c54	Merge branch 'master' into master	2018-08-21 16:16:03 +02:00
Daniel Ehrhardt	9fff06bad4	Fix #1761 GB MB	2018-08-20 22:11:50 +02:00
Jan Brachhold	2440a15eeb	Update DE translations - strapi-plugin-upload	2018-08-16 14:34:13 +02:00
Jakub Skořepa	4771cc9575	Revert previous changes and save hash to new field sha256	2018-08-09 19:46:23 +02:00
Jim LAURIE	b4d97fb9db	3.0.0-alpha.13.1	2018-08-09 13:39:34 +02:00
Jim LAURIE	90041a5fba	Merge branch 'master' into master	2018-08-06 09:43:14 +02:00
Jakub Skořepa	2ad3121494	Use actual hash instead of randomly generated string	2018-08-02 20:09:12 +02:00
Chris	78e8cb96ea	Added the Dutch (NL) language	2018-08-01 09:17:53 +02:00
Basile Bong	260a9bf69b	Add > FR translation keys	2018-07-31 19:26:51 +02:00
Jim LAURIE	a66c3d8eb0	Merge branch 'master' into translation/de	2018-07-31 13:42:51 +02:00
Jim LAURIE	3e956670a9	Merge branch 'master' into fix/1609	2018-07-29 14:25:49 +02:00
Basile Bong	f10064e06c	Change > DE translation keys > use familiar form	2018-07-27 17:05:44 +02:00
Basile Bong	f2963b4eab	Add > DE translation keys > strapi-plugin-upload	2018-07-26 16:42:02 +02:00
Jim LAURIE	a0c49e3340	Fix package conflicts	2018-07-26 16:19:28 +02:00
Jim LAURIE	09a2a4b73d	3.0.0-alpha.13.0.1	2018-07-26 16:12:17 +02:00
Jim LAURIE	927a900f5b	3.0.0-alpha.13	2018-07-25 17:31:16 +02:00
Aurelsicoko	37b9c2ee4c	Remove front-end dependency from marketplace.strapi.io	2018-07-24 19:37:27 +02:00
Jim LAURIE	fcebf4fc6e	Merge branch 'master' into language/es	2018-07-23 17:32:58 +02:00
Jim LAURIE	e7a8659f44	Merge branch 'master' into gitignore	2018-07-23 16:06:22 +02:00
Leon Kyneur	92b045f647	Include yarn.lock in packages .gitignore	2018-07-22 09:26:48 +08:00
Jim LAURIE	aba7de44ce	Fix delete uploaded file SQL fix #1459	2018-07-20 15:09:14 +02:00
yummyelin	36175b0237	Merge branch 'master' into master	2018-07-19 17:29:16 -07:00
Jim LAURIE	33c138cece	Merge branch 'master' into patch-7	2018-07-16 16:08:29 +02:00
Yilin Gan	1cf971950a	add file path for aws upload	2018-07-13 11:30:38 -07:00
soupette	3890bc1211	Fix conflict	2018-07-13 12:33:52 +02:00
Alexis Vassilopoulos	7e94324189	Spanish Translations	2018-07-12 19:32:34 +02:00
Jim LAURIE	fa94d12e4f	3.0.0-alpha.12.7.1	2018-07-10 18:10:42 +02:00
Jim LAURIE	a6d48caad9	3.0.0-alpha.12.7	2018-07-10 15:37:47 +02:00
Taihoon Kim	5cfb9e9439	Korean Language Support	2018-07-06 15:34:20 +09:00
cyril lopez	3e42d86460	Merge branch 'master' of github.com:strapi/strapi into settings-ctm	2018-07-03 18:31:41 +02:00
Johann Pinson	8a5e4c48ad	fix(upload): improve query find for bookshelf	2018-07-03 12:09:49 +02:00
Carlos Guimaraes	46765b442c	Brazilian Portuguese Language Support	2018-07-01 17:24:47 -03:00
cyril lopez	c0c99d443a	Fix conflicts and add pt.json translation files in usr-perm plugin	2018-06-28 12:54:39 +02:00
cyril lopez	799c6c3f0f	Remove webpack warnings and react-intl errors	2018-06-28 10:01:59 +02:00