2318 Commits

Author	SHA1	Message	Date
Jim Laurie	957e7a08cb	Environment agnostic for users-permissions configs	2018-02-13 15:04:21 +01:00
Jim LAURIE	4ab9907bd7	Merge branch 'master' into configs-databases	2018-02-13 11:10:05 +01:00
Luca Perret	3eb09a54d5	use tmp path for temporal connectivity check	2018-02-12 19:14:36 +01:00
Luca Perret	9f6a57245b	allowing docker volume on node_modules	2018-02-12 19:08:37 +01:00
Jim Laurie	b74dd97bec	Fix get null config bookshelf	2018-02-12 15:16:23 +01:00
Jim Laurie	f155736012	Fix mask for admin routes	2018-02-12 14:38:54 +01:00
Jim Laurie	7607d20310	Fix PR feedback	2018-02-12 14:10:20 +01:00
Jim Laurie	5bf1e51422	Fix conflicts	2018-02-12 13:25:43 +01:00
Jim LAURIE	36f9f27d0c	Merge branch 'master' into design/icons	2018-02-09 18:19:21 +01:00
Aurelsicoko	21893dc8e6	Optimize SVG icons	2018-02-09 17:22:18 +01:00
Aurelsicoko	7c2317cba2	Update plugins list icon	2018-02-09 17:17:48 +01:00
Aurelsicoko	60821dca69	Update naming and default links icon	2018-02-09 17:16:30 +01:00
Aurelsicoko	36d650effa	Update marketplace icon style	2018-02-09 17:09:35 +01:00
Aurelsicoko	b2d85c0b8e	Update icon container style	2018-02-09 17:07:10 +01:00
Jim LAURIE	08d74e1515	Merge branch 'master' into fix/boot	2018-02-09 17:02:18 +01:00
Aurelsicoko	5cbfc6f050	Update logo	2018-02-09 17:01:04 +01:00
Jim LAURIE	6cbff0007c	Merge branch 'master' into enhancement/mask	2018-02-09 16:48:30 +01:00
Aurelsicoko	46a64b449f	Update default hook timeout to 3000 milliseconds	2018-02-09 16:36:23 +01:00
Jim LAURIE	09ee225029	Merge branch 'master' into fix-fetch-error-mongoose	2018-02-09 16:33:48 +01:00
Jim LAURIE	d1736a9732	Merge branch 'master' into jwt-info-auth	2018-02-09 15:57:58 +01:00
Jim LAURIE	0cb9f05f9c	Merge branch 'master' into fix-db-args	2018-02-09 13:00:48 +01:00
Jim LAURIE	82b8361229	Merge branch 'master' into add/inputs-to-ctb	2018-02-09 12:18:11 +01:00
Jim LAURIE	8510e5852f	Merge branch 'master' into master	2018-02-09 11:23:13 +01:00
Aurelsicoko	5f19c8b3b3	Apply PR feedback	2018-02-09 10:46:37 +01:00
Aurelsicoko	4521854340	Enable mask middleware if there is a private key set to true	2018-02-08 15:27:24 +01:00
Jim Laurie	945af6e750	Hide password database cli ... close #598	2018-02-08 15:27:15 +01:00
Aurelsicoko	2cb0e2c3d5	Hide resetPasswordToken from response	2018-02-08 14:59:39 +01:00
Aurelsicoko	cbd47828d8	Handle mask for nested objects (associations)	2018-02-08 14:58:19 +01:00
Jim Laurie	3c82641aa0	Fix fetch error mongoose ... Verify if _id params has mongoose ObjectId format	2018-02-08 14:58:05 +01:00
Jim Laurie	05804c391a	Update user info in JWT ... Just set user id in auth jwt fix #528	2018-02-08 14:37:54 +01:00
Jim Laurie	b1bcc13952	Fix strapi new without db args ... Stop project creation if one of db argument is missing Better detection for using db arguments	2018-02-08 11:53:45 +01:00
Luca Perret	22f12ec0dc	fix(cli): database name init	2018-02-08 00:50:16 +01:00
Luca Perret	3855523557	fix(cli): db connector init with args	2018-02-07 20:37:33 +01:00
cyril lopez	f8b8faefcf	Use the new input library in content type builder	2018-02-07 18:32:03 +01:00
Jim LAURIE	e963ee1414	Merge branch 'master' into enhancement/database-uri	2018-02-07 17:57:14 +01:00
Jim LAURIE	d3cc220d3b	Merge branch 'master' into add/inputs-to-users	2018-02-07 15:28:30 +01:00
Pierre BURGY	b67c5e34a8	Merge branch 'master' into enhancement/database-uri	2018-02-07 15:00:37 +01:00
Pierre Burgy	7f6e5ba5a8	3.0.0-alpha.9.3	2018-02-07 14:22:27 +01:00
Pierre Burgy	5bdf0a731d	Use PORT env variable in production	2018-02-07 12:07:35 +01:00
cyril lopez	c6ca956c45	Merge branch 'master' of github.com:strapi/strapi into add/inputs-to-users	2018-02-07 11:52:54 +01:00
Jim LAURIE	03985f4d80	Merge branch 'master' into fix/payload	2018-02-07 11:48:20 +01:00
cyril lopez	7db50ab6e1	Created inputsdValidations utils ... Refacto input s validation logic. Fix input s initial value bug when the input is required	2018-02-07 11:46:29 +01:00
Jim LAURIE	7359cc2463	Merge branch 'master' into feat/cli-args-db-auth	2018-02-07 11:33:27 +01:00
cyril lopez	1e935ccddd	Merge branch 'master' of github.com:strapi/strapi into add/inputs-to-users	2018-02-07 11:11:39 +01:00
Jim LAURIE	ab8f271eda	Merge branch 'master' into fix/mariadb	2018-02-07 11:08:40 +01:00
Pierre Burgy	49a3b92aef	Update admin url index.html	2018-02-07 09:14:30 +01:00
Pierre Burgy	fe87be7793	Add database uri configuration #602	2018-02-07 00:19:05 +01:00
Luca Perret	8eaf478f4b	Merge branch 'feat/cli-args-db-auth' of github.com:lucaperret/strapi into feat/cli-args-db-auth	2018-02-06 19:51:48 +01:00
Luca Perret	1a44fd6410	replace dbtype by dbclient	2018-02-06 19:34:23 +01:00
Luca	ed9e176a90	Merge branch 'master' into feat/cli-args-db-auth	2018-02-06 19:32:17 +01:00