33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	86fc0d29d6	Merge pull request #2239 from strapi/feature/2108_handle_redirect_after_password_reset ... Handle redirect after reset password	2018-11-08 11:59:24 +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	7e7b75f133	Merge pull request #2203 from jacargentina/master ... Fix Content Manager sends me to blank page	2018-11-08 11:28:31 +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
Jim LAURIE	5a36fb240f	Merge pull request #2159 from entwicklerfr/fix/multi-lines-in-content-type-description#1543 ... Fix multi lines in content type description	2018-11-08 10:40:19 +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	d377da29ca	Merge pull request #2229 from strapi/fix/2213 ... Fixes Content Types Not Appearing in Left Menu	2018-11-07 19:07:32 +01:00
Jim LAURIE	dd499dc1d3	Add master to run diff for lint	2018-11-07 18:04:24 +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	ded277158a	Merge pull request #2191 from maturanomx/feature/minorImprovements ... Improve code style and code quality	2018-11-05 17:28:04 +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	717ed616dc	Merge pull request #2240 from maturanomx/feature/upgradeEslint ... Upgrade `eslint` to version 4	2018-11-05 17:24:33 +01:00
Jim LAURIE	ed8efdd2a2	Merge branch 'master' into feature/upgradeEslint	2018-11-05 17:24:20 +01:00
Jim LAURIE	2fbb53ce69	Merge pull request #2226 from aissa-bouguern/patch-1 ... GraphQL many-to-many querying symmetry	2018-11-05 17:24:11 +01:00
Jim LAURIE	b739155fdd	Merge branch 'master' into patch-1	2018-11-05 17:22:59 +01:00
Jim LAURIE	39ac9ec95a	Merge pull request #2201 from greatwitenorth/patch-3 ... Fixes Cannot read property 'toJSON' of null	2018-11-05 17:21:04 +01:00
Jim LAURIE	6dbf5d62dc	Merge branch 'master' into patch-3	2018-11-05 17:20:56 +01:00
Jim LAURIE	4884b7372b	Merge pull request #2264 from dimitrinicolas/master ... Update FR translations	2018-11-05 17:16:08 +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
dimitrinicolas	f168da8acc	Fix responsive admin headers	2018-11-04 12:47:55 +01:00
dimitrinicolas	3d4d4c0525	Update FR translations	2018-11-04 12:28:04 +01:00
Leo	03803780bf	Fix a missing translation	2018-11-03 16:56:21 +08:00
Leo	d2be992a14	Fix strange translations	2018-11-03 16:14:53 +08:00
Leo	b160fdf79e	Translations final fix	2018-11-03 15:03:31 +08:00
Leo	6dc594217c	Translations for ZH completed	2018-11-03 14:30:22 +08:00
Leo	a9e5b083e9	Update Email translations	2018-11-03 01:14:07 +08:00
Leo	935928bdf3	Update Content Type Builder translations	2018-11-03 00:57:57 +08:00
Leo	7d5d6b5381	Update ZH translations ... Updated admin panels & content manager	2018-11-02 22:12:49 +08:00
aDeve	429973f814	code review : remove longline, and invers logic condition	2018-11-02 11:47:04 +01:00
Jim LAURIE	30370a1b0d	Merge pull request #2165 from greatwitenorth/patch-2 ... Allow the use of .graphql or .graphql.js	2018-11-01 17:39:57 +01:00
Jim LAURIE	e4b1d3c1d6	Merge branch 'master' into patch-2	2018-11-01 17:39:47 +01:00
Jim LAURIE	d6090099c8	Merge pull request #2243 from jacargentina/patch-1 ... Update models.md	2018-11-01 17:35:26 +01:00
Jim LAURIE	8c2a22f776	Merge pull request #2230 from maturanomx/testLinterInCI ... Introduce a linter error for testing CI	2018-11-01 17:20:12 +01:00
Jim LAURIE	6ed7f494ad	Merge branch 'master' into testLinterInCI	2018-11-01 17:19:56 +01:00
Jim LAURIE	d0585aef6c	Merge pull request #2224 from strapi/fix-alpha-requirement ... Remove @alpha from code	2018-11-01 17:12:24 +01:00
Jim LAURIE	358b23f07b	Merge branch 'master' into fix-alpha-requirement	2018-11-01 17:12:16 +01:00
Javier Castro	9158d58a64	Update models.md ... The Model options specified are only used on strapi-hook-bookshelf. State it clearly	2018-11-01 13:11:28 -03:00