33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Aurélien GEORGET	dedc5db56b	Merge pull request #434 from strapi/enhancement/middlewares ... Update middleware dependencies and remove unnecessary convert	2018-01-11 10:39:00 +01:00
Aurélien GEORGET	d38b2bb03d	Merge branch 'master' into enhancement/middlewares	2018-01-11 10:24:17 +01:00
Aurelsicoko	5eea65b4cc	Merge branch 'fix/deploy' of github.com:strapi/strapi into fix/deploy	2018-01-11 10:13:14 +01:00
Aurelsicoko	4826689ef8	Add comma	2018-01-11 10:12:27 +01:00
Luca Perret	7cf77a9d57	fix(plugin-users-permissions): Config layout - ... Duplicate key email	2018-01-11 00:23:28 +01:00
Luca Perret	5035170424	feat(plugin-users-permissions): add /user/me to fetch authenticated user model	2018-01-10 20:29:34 +01:00
Luca Perret	d877440862	typo(plugin-users-permissions): useless curly brace	2018-01-10 20:28:05 +01:00
cyril lopez	05fe3e16c7	Fix paths	2018-01-10 18:48:35 +01:00
Aurélien GEORGET	bcb7a68dde	Merge branch 'master' into fix/deploy	2018-01-10 18:27:52 +01:00
Aurélien GEORGET	07447c2879	Merge pull request #421 from strapi/install-plugins ... Install plugin from the administration panel	2018-01-10 18:27:35 +01:00
Aurelsicoko	b8b9d75d58	Merge branch 'master' of github.com:strapi/strapi into install-plugins	2018-01-10 18:14:16 +01:00
Jim Laurie	4e1fe20531	Merge branch 'database-setup' of github.com:strapi/strapi into database-setup	2018-01-10 18:10:20 +01:00
Jim Laurie	df5b9f3dab	Change wording	2018-01-10 18:08:43 +01:00
Jim LAURIE	35cb6e6194	Merge branch 'master' into database-setup	2018-01-10 17:42:31 +01:00
Aurélien GEORGET	d55133cf57	Merge branch 'master' into fix/deploy	2018-01-10 17:38:55 +01:00
Jim LAURIE	b0d3b392c1	Merge pull request #433 from strapi/improve/doc-plugin ... Improve/doc plugin	2018-01-10 17:29:35 +01:00
Aurélien GEORGET	43296d72aa	Merge branch 'master' into improve/doc-plugin	2018-01-10 17:09:12 +01:00
Aurelsicoko	b0fc115cd7	Use i18n when there is no description available for a plugin	2018-01-10 16:55:12 +01:00
Jim Laurie	b17d1a29b2	Fix symlink to strapi module for strapi-bookshelf	2018-01-10 16:52:32 +01:00
Aurélien GEORGET	8d68215f4e	Merge branch 'master' into fix/deploy	2018-01-10 15:49:47 +01:00
Aurelsicoko	69ef0fa871	Fix CI	2018-01-10 15:38:28 +01:00
Jim Laurie	e1fb02ab53	Test connection in connector node module	2018-01-10 15:31:54 +01:00
Jim Laurie	9ace21f210	Fix connection functions	2018-01-10 15:05:02 +01:00
Jim Laurie	bf7daaf99a	Reorder promises	2018-01-10 14:45:32 +01:00
Jim LAURIE	bcb6587f93	Merge pull request #430 from strapi/fix/ctb-no-model-api ... Fix/ctb no model api	2018-01-10 14:11:08 +01:00
Aurélien GEORGET	79b2635019	Merge branch 'master' into fix/ctb-no-model-api	2018-01-10 13:58:20 +01:00
Jim LAURIE	7ea9fdf6f4	Merge pull request #428 from strapi/fix/language-api ... Authorize config files name as API fix #417	2018-01-10 13:55:15 +01:00
Jim LAURIE	502b101598	Fix PR feedback	2018-01-10 13:39:42 +01:00
cyril lopez	6d71241275	Update branch ... Merge branch 'improve/doc-plugin' of https://github.com/strapi/strapi into improve/doc-plugin	2018-01-10 13:36:38 +01:00
cyril lopez	7a1249f890	Fix typo	2018-01-10 13:36:24 +01:00
Aurélien GEORGET	1d8bd57006	Merge branch 'master' into fix/language-api	2018-01-10 13:34:33 +01:00
Aurélien GEORGET	7c2ab6eea5	Merge branch 'master' into fix/ctb-no-model-api	2018-01-10 13:29:26 +01:00
Aurélien GEORGET	f1d755c7fc	Update quick-start.md	2018-01-10 13:14:45 +01:00
Aurélien GEORGET	f5512c8e4b	Merge branch 'master' into improve/doc-plugin	2018-01-10 13:10:04 +01:00
Aurélien GEORGET	88e4c25b75	Merge branch 'master' into user-schema-logs	2018-01-10 12:02:07 +01:00
Aurélien GEORGET	61e497ba25	Merge pull request #408 from dakuenjery/master ... Use Decimal for mongo and mongoose	2018-01-10 12:00:58 +01:00
Aurélien GEORGET	f4b5c77822	Merge branch 'master' into enhancement/middlewares	2018-01-10 11:58:01 +01:00
cyril lopez	ed198423d6	Delete plugins doc folder	2018-01-10 11:46:53 +01:00
cyril lopez	95cb588750	Fix doc links	2018-01-10 11:45:01 +01:00
cyril lopez	47cec0ea84	Created new plugin development doc	2018-01-10 11:32:24 +01:00
Aurelsicoko	143bfd3a7c	Merge branch 'master' of github.com:strapi/strapi into fix/deploy	2018-01-09 19:36:41 +01:00
Aurelsicoko	3b54802ae9	Remove logs	2018-01-09 19:36:35 +01:00
Aurelsicoko	440b44ed27	Update documentation and improve plugins.json generation logic	2018-01-09 18:39:50 +01:00
Aurelsicoko	ce61844427	Use relative URL instead of absolute to load plugin and set administration origin	2018-01-09 17:09:54 +01:00
Jim Laurie	f5a5fac5f1	Fix CTB get model to plugins	2018-01-09 14:25:47 +01:00
Jim Laurie	ff46faf306	Execute controller action out of authorization try	2018-01-09 13:53:52 +01:00
Jim Laurie	6a59946f71	Fix CTB if one API has no model file	2018-01-09 13:42:19 +01:00
Николай	d120161831	Merge branch 'master' into master	2018-01-09 14:58:01 +03:00
Aurelsicoko	0b3e8f7ae5	Use relative paths	2018-01-09 12:02:00 +01:00
Jim LAURIE	281048b7aa	Merge pull request #422 from strapi/fix/yarn ... Fix/yarn	2018-01-09 11:28:16 +01:00