6761 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Salem	c613d997b1	Rename ar.json to sa.json	2018-06-17 16:03:12 +03:00
Salem	fb43b7c052	Rename ar.json to sa.json	2018-06-17 16:02:54 +03:00
Salem	83500176b6	Rename ar.json to sa.json	2018-06-17 16:02:20 +03:00
Salem	5e12ead6f0	Rename ar.json to sa.json	2018-06-17 16:01:48 +03:00
Jim LAURIE	e8d435989c	Merge branch 'master' into master	2018-06-17 14:16:33 +02:00
Jim LAURIE	12706a8955	Fix Array type mongoose fix #1169	2018-06-17 13:24:13 +02:00
Salem	7b4af48154	Create ar.json	2018-06-17 13:22:10 +03:00
Jim LAURIE	1651a31ab1	Merge pull request #1402 from maturano/patch-1 ... Fix `CONTRIBUTING.md` path	2018-06-16 14:55:57 +02:00
Alberto Maturano	e686da1a01	Fix CONTRIBUTING.md path	2018-06-15 17:14:07 -05:00
Jim LAURIE	cd7eb3fd79	Merge pull request #1400 from strapi/doc/providers ... Add examples in the "Authentication with providers" section	2018-06-15 19:54:18 +02:00
Jim LAURIE	4747d96134	Merge branch 'master' into doc/providers	2018-06-15 19:39:07 +02:00
Jim LAURIE	d226194166	Merge pull request #1397 from strapi/fix-admin-start ... Fix admin start	2018-06-15 19:36:58 +02:00
soupette	7ffb90621a	Handle JSON errors	2018-06-15 16:48:29 +02:00
Aurelsicoko	1ef5ba2804	Add examples in the Authentication with providers section	2018-06-15 15:38:09 +02:00
Aurelsicoko	e543ae28a1	Uncomment tests and clean code	2018-06-15 14:03:55 +02:00
Aurelsicoko	75b39b0a4e	Resolve conflicts	2018-06-15 13:51:19 +02:00
Aurelsicoko	76200871e6	Add tests for oneWay relationship	2018-06-15 13:38:34 +02:00
Jim Laurie	192c2ff1a9	Fix admin start fix #1371	2018-06-15 11:59:26 +02:00
Aurelsicoko	945667dffe	Fix oneToMany relationships	2018-06-15 10:48:17 +02:00
Jim LAURIE	fff92ca318	Merge pull request #1391 from oad-earth/master ... Update polish language	2018-06-14 22:57:29 +02:00
Jim LAURIE	cf88b902dd	Merge branch 'master' into master	2018-06-14 22:36:44 +02:00
Dominik Opyd	f2abc2aa48	polish language | strapi-plugin-settings-manager	2018-06-14 19:25:52 +02:00
Dominik Opyd	07bfbb2b3a	polish language | strapi-plugin-users-permissions	2018-06-14 19:19:28 +02:00
Dominik Opyd	34e125f504	polish language | strapi-plugin-content-type-builder	2018-06-14 19:04:49 +02:00
Dominik Opyd	734ecc1cfc	polish language | strapi-plugin-content-manager	2018-06-14 18:58:05 +02:00
Dominik Opyd	522280c3ec	polish language | strapi-admin	2018-06-14 18:52:10 +02:00
Dominik Opyd	bb0d4cbda8	polish language | strapi-plugin-upload	2018-06-14 18:32:23 +02:00
Aurelsicoko	94200636da	Refetch related data before attach new entry on manyToMany relationship	2018-06-14 18:27:44 +02:00
Jim Laurie	1c3e6a4664	Update comment on reset password	2018-06-14 17:20:45 +02:00
Jim Laurie	ad815eae20	Fix reset password SQL fix #1351	2018-06-14 17:15:49 +02:00
soupette	cf6a2bdd25	merge	2018-06-14 16:49:39 +02:00
Jim LAURIE	50ce0b20ea	Merge pull request #1357 from DaanDD/master ... Use type ID for primary key instead of String in GraphQL schemas	2018-06-14 16:25:49 +02:00
soupette	b749d8312b	Remove loadable import of wys	2018-06-14 16:21:25 +02:00
soupette	4346b761a9	Add loader to mkt and plugin page	2018-06-14 16:17:44 +02:00
Jim LAURIE	4a2452a55b	Merge branch 'master' into master	2018-06-14 16:06:11 +02:00
Dominik Opyd	7186cd6e49	polish language | upgrade	2018-06-14 15:59:24 +02:00
soupette	d3914fdf84	Global loader editpage when editing	2018-06-14 15:30:54 +02:00
Jim LAURIE	563e7c8ac1	Merge pull request #1384 from johannpinson/patch-6 ... Fix enumeration detection for GraphQL	2018-06-14 14:40:43 +02:00
Jim LAURIE	45529b8e5a	Merge branch 'master' into patch-6	2018-06-14 14:29:14 +02:00
Jim LAURIE	8a2a35522f	Merge pull request #1255 from AustinBratcher/master ... Added support in email plugin for Mailgun and Sendgrid	2018-06-14 14:18:10 +02:00
Jim LAURIE	9bdc302d28	Merge branch 'master' into master	2018-06-14 12:34:05 +02:00
soupette	dfe1ff26bb	Add loaders to users-permissions HP	2018-06-14 12:33:57 +02:00
Jim Laurie	1363a11c19	Fix setup build	2018-06-14 12:29:43 +02:00
Jim LAURIE	5f69fc7980	Merge pull request #1378 from johanbaath/fix-wysiwyg-autofocus-bug ... Don't update the state of the form if WYSIWYG content has not changed	2018-06-14 11:47:54 +02:00
soupette	458116998f	Fix reducer with advanced settings	2018-06-14 11:41:43 +02:00
soupette	dee1ecd23f	Change users-permissions hp reducer	2018-06-14 11:35:40 +02:00
Jim LAURIE	1f45043aa1	Merge branch 'master' into fix-wysiwyg-autofocus-bug	2018-06-14 11:34:25 +02:00
Jim LAURIE	5d2d8f947c	Merge pull request #1379 from strapi/update-contrib-guide ... Update contributing guide	2018-06-14 11:33:27 +02:00
Jim LAURIE	7b558b15cf	Merge branch 'master' into update-contrib-guide	2018-06-14 11:31:58 +02:00
Jim Laurie	db7ee98637	Update PR feedback	2018-06-14 09:55:31 +02:00