33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	a6c0db7ce2	Merge branch 'master' into fix/yarn	2018-01-09 11:15:23 +01:00
Jim LAURIE	cffbc61dba	Merge pull request #426 from strapi/enhancement/one-way ... Fix #379 - Support one-way relationship	2018-01-09 11:15:10 +01:00
Jim LAURIE	3a4ca8ea49	Merge branch 'master' into enhancement/one-way	2018-01-09 11:00:34 +01:00
Jim LAURIE	6a4eeec561	Merge pull request #385 from strapi/improve/list-plugins ... Improve/list plugins	2018-01-09 11:00:09 +01:00
Jim LAURIE	54d0c7d275	Merge branch 'master' into improve/list-plugins	2018-01-09 10:46:32 +01:00
Николай	d1605a1923	Merge branch 'master' into master	2018-01-09 00:24:51 +03:00
cyril lopez	0ca0e6cb7e	Merge pull request #427 from strapi/fix/auth-bound-routes ... Fix EditRole page InputSearch label number display	2018-01-08 20:18:40 +01:00
Aurélien GEORGET	77e28eacb2	Merge branch 'master' into improve/list-plugins	2018-01-08 18:14:10 +01:00
Jim Laurie	62ee8defce	Authorize config files name as API fix #417	2018-01-08 16:41:32 +01:00
Aurelsicoko	6916134ee1	Update setup script to deploy and index.html rewrite	2018-01-08 16:34:41 +01:00
Nikolay	d2fae1dfdc	Mongoose updated to 5.0.0-rc1	2018-01-08 17:50:57 +03:00
cyril lopez	b012d95acd	Merge branch 'master' into fix/auth-bound-routes	2018-01-08 15:15:39 +01:00
Николай	d9af887dc9	Merge branch 'master' into master	2018-01-08 16:27:26 +03:00
Jim Laurie	fbd17f4205	Handle redis error connection	2018-01-08 14:23:20 +01:00
Aurelsicoko	ff25575cfd	Remove devFrontURL on production & use build configurations instead	2018-01-08 14:17:10 +01:00
cyril lopez	fd41a77e11	Fix EditRole page InputSearch label	2018-01-08 14:15:27 +01:00
Jim Laurie	fc4e9d89fa	Handle mongoose error connection	2018-01-08 13:51:17 +01:00
Aurélien GEORGET	d27c6d3481	Update README.md	2018-01-08 13:39:31 +01:00
Jim Laurie	5ace081557	Set default option on failed database connection	2018-01-08 12:24:51 +01:00
Aurélien GEORGET	8a1b95f2b5	Merge branch 'master' into enhancement/one-way	2018-01-08 12:12:01 +01:00
Aurelsicoko	10db375825	Fix #379 - Support one-way relationship	2018-01-08 12:10:48 +01:00
Jim Laurie	4b5cf41b83	Handle bookshekf error connection	2018-01-08 12:00:56 +01:00
Aurélien GEORGET	41c8adccdc	Merge pull request #424 from ArkhipovK/ssl-strapi-knex-option ... SSL option for strapi-knex connections.	2018-01-08 11:11:44 +01:00
alex	ee5a72af89	SSL option for strapi-knex connections was appended. This is necessary for ssl-only remote DB services e.g. heroku-postgres	2018-01-07 05:25:00 +06:00
Aurelsicoko	c4763d173f	Add exception for Yarn to copy/paste the .gitignore file in each plugin	2018-01-05 18:09:18 +01:00
Jim Laurie	23ee0b25bf	Install db dependencies on app creation	2018-01-05 17:40:56 +01:00
Aurelsicoko	565cfda087	Make exception for Yarn to find the package in the right folder	2018-01-05 17:17:58 +01:00
Aurelsicoko	822572c5d0	Update middleware dependencies and remove unnecessary convert	2018-01-05 16:58:14 +01:00
Aurelsicoko	c9d47b1fed	Retrieve plugins' icons URL from API and name Redux store	2018-01-05 16:19:53 +01:00
Jim Laurie	a892a6943d	Form to configure database connection	2018-01-05 15:17:59 +01:00
Jim LAURIE	7a7bd4d649	Merge pull request #419 from strapi/3.0.0-alpha.7.3 ... 3.0.0-alpha.7.3 v3.0.0-alpha.7.3	2018-01-05 12:25:43 +01:00
Jim Laurie	cc4973b65b	3.0.0-alpha.7.3	2018-01-05 12:10:41 +01:00
Aurélien GEORGET	1f8baa30d0	Merge pull request #418 from strapi/fix/css ... Reorder documentation guide and fix CSS	2018-01-05 12:04:38 +01:00
Aurelsicoko	86fa933f5e	Reorder documentation guide and fix CSS	2018-01-05 11:45:29 +01:00
Aurelsicoko	12d1357d36	Update behavior on plugin card and retrieve logo & description from API	2018-01-04 19:04:22 +01:00
Jim Laurie	e563131536	Fix variable name	2018-01-04 16:40:09 +01:00
Jim Laurie	1a1b083436	Add logs if missing thing in user table	2018-01-04 16:36:56 +01:00
Aurelsicoko	f6e3ab661e	Improve plugin installation	2018-01-04 16:03:34 +01:00
Jim LAURIE	4fec48fee1	Merge pull request #386 from strapi/relation/users ... Relation/users	2018-01-04 13:14:27 +01:00
Jim LAURIE	5235b9633f	Merge branch 'master' into relation/users	2018-01-04 12:31:54 +01:00
Jim LAURIE	d0c82b6e20	Merge pull request #414 from valkalon/patch-1 ... Update policies.md	2018-01-04 11:39:41 +01:00
Aurélien GEORGET	d595f4a895	Merge branch 'master' into master	2018-01-04 11:34:37 +01:00
Aurélien GEORGET	53a050cfc4	Merge branch 'master' into patch-1	2018-01-04 11:27:22 +01:00
Aurelsicoko	dafec67234	Merge branch 'master' of github.com:strapi/strapi into relation/users	2018-01-04 11:25:27 +01:00
Aurelsicoko	127690c6bb	Fix globalId on Mongoose and CT creation with plugin's model	2018-01-04 11:24:27 +01:00
Jim LAURIE	3542bd5837	Merge pull request #405 from strapi/fix/install-plugin ... Fix install plugin	2018-01-04 11:11:42 +01:00
Aurélien Vabre	af5741088b	Update policies.md ... corrected minor English typos	2017-12-31 15:29:38 +01:00
Nikolay	e48b10c98e	Use Decimal for mongo and mongoose ... Use Decimal128 mongo's type instead mongoose-double package. Mongodb will be store decimal values as NumberDecimal, not as string.	2017-12-23 22:50:10 +03:00
Jim Laurie	f52f149add	Fix install plugin	2017-12-22 17:36:27 +01:00
Jim LAURIE	7c3aaf691b	Hot fix package.json setup	2017-12-21 15:30:55 +01:00