4505 Commits

Author	SHA1	Message	Date
ByoungYong Kim	fa2c6f37aa	Merge branch 'master' into fix/reattempt-1851	2018-11-17 20:27:08 +01:00
Amir Reza Dalir	9e4d5abbff	Merge pull request #1 from dalirnet/develop ... Develop	2018-11-17 16:18:02 +03:30
Jim LAURIE	0164b854fd	Merge branch 'master' into master	2018-11-17 13:34:58 +01:00
Jim LAURIE	eb6d0aa06b	Merge branch 'master' into style/spanishTranslation	2018-11-16 11:36:06 +01:00
Jim LAURIE	11d192b9ad	Fix version conflicts	2018-11-16 10:25:51 +01:00
Amir Reza Dalir	5489dd6338	JSON format fix	2018-11-16 01:39:55 +03:30
Amir Reza Dalir	b15e54a0b0	Added flag of Iran	2018-11-16 01:24:15 +03:30
Amir Reza Dalir	599f525f13	Add fa language	2018-11-16 00:56:59 +03:30
Amir Reza Dalir	e9301725f1	Add FA translations ... add Persian(fa) translations	2018-11-16 00:51:31 +03:30
Alberto Maturano	86cbd0c1b3	refactor: Remove unused variable	2018-11-14 19:51:05 -06:00
Alberto Maturano	141a7dd58d	refactor: Corrects conditional management ... The original implementation throws and runtime error if the `host` is not defined making the conditional uselees. Using a try/catch block is the correct implementation of the original intention.	2018-11-14 18:28:05 -06:00
Alberto Maturano	90fba032d4	style: Improves spanish translation ... issue #1621	2018-11-13 16:02:25 -06:00
Amir Reza Dalir	4c92cfc4ee	update template for lifecycle callback ... add beforeFetchCollection & afterFetchCollection in template file for bookshelf models	2018-11-13 20:11:19 +03:30
Jim LAURIE	8fcf2ed8ae	3.0.0-alpha.14.5	2018-11-13 14:50:07 +01:00
Jim LAURIE	ce435184f9	Merge branch 'master' into fix/2253	2018-11-12 22:35:29 +01:00
Jim LAURIE	608fc3b4ab	Merge branch 'master' into master	2018-11-12 20:58:07 +01:00
Jim LAURIE	309543324b	Merge branch 'master' into enhancement/auto-open	2018-11-12 18:22:00 +01:00
Sidharth Vinod	e3d4708aaa	Update username for Google Auth to fix #2285	2018-11-11 00:26:53 +05:30
Jim LAURIE	08ababab42	Fix lint	2018-11-10 11:37:02 +01:00
Jim LAURIE	e99ee6ec5c	Merge branch 'master' into fix-graphql-many-to-many-relations	2018-11-10 10:30:04 +01:00
Jim LAURIE	dd85922c63	Merge branch 'master' into fix/manyToMany	2018-11-09 17:19:59 +01:00
soupette	69ae95726f	Prevent all bugs from strings	2018-11-09 14:36:17 +01:00
Jim LAURIE	41e217674b	Merge branch 'master' into fix/depreaction-warnings-admin	2018-11-09 14:24:22 +01:00
Jim LAURIE	5188d70d91	Merge branch 'master' into fix-graphql-many-to-many-relations	2018-11-09 12:07:52 +01:00
Jim LAURIE	63666a1ab2	Auto open admin first start	2018-11-08 21:07:33 +01:00
Jim LAURIE	61dd06c742	Merge branch 'master' into fix/1317	2018-11-08 18:37:45 +01:00
Jim LAURIE	03d3db014f	Merge branch 'master' into fix/manyToMany	2018-11-08 15:53:07 +01:00
Jim LAURIE	d677fa89ff	Merge branch 'master' into fix/#1787	2018-11-08 15:11:35 +01:00
Jim LAURIE	0179842873	Merge branch 'master' into feature/2108_handle_redirect_after_password_reset	2018-11-08 11:28:59 +01:00
Jim LAURIE	66a1e0c291	Merge branch 'master' into feature/2108_handle_redirect_after_password_reset	2018-11-08 11:28:44 +01:00
Jim LAURIE	5900e4f3c2	fix lint space	2018-11-08 11:18:51 +01:00
Jim LAURIE	f901f28252	Merge branch 'master' into master	2018-11-08 11:05:24 +01:00
aDeve	0674002553	code review : syntax	2018-11-07 19:29:37 +01:00
Jim LAURIE	c48d3d6c30	Merge branch 'master' into fix/multi-lines-in-content-type-description#1543	2018-11-07 19:08:07 +01:00
Jim LAURIE	163f7e6533	Fix lint	2018-11-07 16:19:31 +01:00
Javier Castro	1fce5221bb	Fix #2186: Content Manager sends me to blank page	2018-11-07 10:33:59 -03:00
Nick Verwymeren	87d41103a4	merged in master	2018-11-06 13:12:26 -06:00
Nick Verwymeren	7991f06294	Merge branch 'master' into fix-graphql-many-to-many-relations	2018-11-06 13:03:07 -06:00
Aurelsicoko	f5eda8df3c	Improve permissions policy to avoid security breach with GraphQL	2018-11-06 18:58:40 +01:00
cyril lopez	de89b3156f	Fix redux-sagas deprecation warnings	2018-11-06 09:56:27 +01:00
cyril lopez	93b190eada	Fixes #2253	2018-11-05 22:10:19 +01:00
Jim LAURIE	b8d8f7a297	Merge branch 'master' into fix/2213	2018-11-05 17:28:56 +01:00
Jim LAURIE	165a5a37e6	Merge branch 'master' into feature/minorImprovements	2018-11-05 17:27:17 +01:00
Jim LAURIE	9a77e1e313	Update single quote	2018-11-05 17:27:04 +01:00
Jim LAURIE	ed8efdd2a2	Merge branch 'master' into feature/upgradeEslint	2018-11-05 17:24:20 +01:00
Jim LAURIE	b739155fdd	Merge branch 'master' into patch-1	2018-11-05 17:22:59 +01:00
Jim LAURIE	6dbf5d62dc	Merge branch 'master' into patch-3	2018-11-05 17:20:56 +01:00
aDeve	d07edb0c5b	fix error : add _.get to prevent it	2018-11-05 13:34:45 +01:00
cyril lopez	377da271e4	Fix lint from master	2018-11-05 11:31:36 +01:00
cyril lopez	a20e827b38	Merge branch 'master' of github.com:strapi/strapi into fix/2213	2018-11-05 11:09:50 +01:00