2692 Commits

Author	SHA1	Message	Date
Jim Laurie	8390106f59	3.0.0-alpha.11.2	2018-03-27 17:59:16 +02:00
Jim Laurie	bc39200cce	Limit ssl options to mongoDB connection	2018-03-27 17:02:23 +02:00
Jim Laurie	5d03c350e4	Clean user model	2018-03-27 16:44:25 +02:00
Jim LAURIE	ae71c340fe	Merge branch 'master' into fix-left-menu-link-container-scroll	2018-03-27 13:29:07 +02:00
thomas-j-moffett	17440b2dd1	Fixes #826	2018-03-27 01:39:02 -07:00
cyril lopez	37eedd5747	Fix pagination	2018-03-27 10:27:50 +02:00
cyril lopez	b1e39929de	Fixes #850	2018-03-27 10:13:13 +02:00
Evan Owens	7e75679094	Merge branch 'master' into master	2018-03-23 13:45:52 -04:00
nurikabe	f701b3e53a	Japanese "welcome" locale file	2018-03-23 13:43:18 -04:00
Jim LAURIE	c59616cbd2	Merge branch 'master' into staging	2018-03-23 17:22:29 +01:00
Jim LAURIE	7f1f07742d	Merge branch 'master' into master	2018-03-23 17:06:18 +01:00
Jim LAURIE	49784fb72c	Merge branch 'master' into disable-ga-option	2018-03-23 15:11:31 +01:00
cyril lopez	19648b1a13	Allow to disable GA	2018-03-23 12:44:17 +01:00
cyril lopez	7553172cf0	Fixes #828	2018-03-22 12:57:21 +01:00
Abdón Rodríguez Davila	92503f8ad4	Update staging environment config similar as production	2018-03-20 21:46:02 +01:00
Abdón Rodríguez Davila	5c365f46a0	Rename test environment config to staging	2018-03-20 21:45:11 +01:00
Abdón Rodríguez Davila	f50b1670ec	Update production environment config	2018-03-20 21:43:59 +01:00
Evan Owens	ab84809495	Fix version command	2018-03-20 11:53:45 -04:00
Jim LAURIE	a1372e84df	Merge branch 'master' into design/logout	2018-03-20 11:49:02 +01:00
Jim LAURIE	717e86ba29	Delete comment	2018-03-20 11:48:50 +01:00
Aurélien GEORGET	17ef1682b1	Update index.js	2018-03-19 19:12:54 +01:00
Aurélien GEORGET	ca6077f9c9	Update styles.scss	2018-03-19 19:12:07 +01:00
Jim LAURIE	2f182732dc	Merge branch 'master' into fix/update-email	2018-03-19 18:21:19 +01:00
Jim LAURIE	46bcadaae5	Fix PR feedback	2018-03-19 18:00:04 +01:00
Jim LAURIE	792b909b85	Merge branch 'master' into ga-admin	2018-03-19 17:48:31 +01:00
Jim Laurie	9017c0d1d0	Add ga in admin to improve Strapi	2018-03-19 17:45:33 +01:00
Aurélien GEORGET	11c68bebf2	Update User.js	2018-03-19 17:31:04 +01:00
Aurélien GEORGET	c7fdd84340	Update styles.scss	2018-03-19 14:07:02 +01:00
cyril lopez	c6b24f046b	Prevent the ctb from breaking if a user tries to edit an attribute that it cannot currently handle	2018-03-19 12:49:25 +01:00
Jim LAURIE	2ba257ce1c	Merge branch 'master' into patch-1	2018-03-19 12:08:05 +01:00
Jim LAURIE	3d2f611af2	Merge branch 'master' into array	2018-03-19 10:15:14 +01:00
Abdón Rodríguez Davila	1e7682eddd	Fix spaces path issues on databases	2018-03-18 13:29:49 +01:00
Abdón Rodríguez Davila	1dd36a5eb6	Fix spaces path issues on npm run build --plugins	2018-03-18 13:11:11 +01:00
Abdón Rodríguez Davila	3cd5cff861	Add Array type	2018-03-17 16:43:25 +00:00
Abdón Rodríguez Davila	a186ac3d3b	Sort types alphabetically	2018-03-17 16:42:28 +00:00
Jim LAURIE	ee968ad2d0	Merge branch 'master' into fix/mask	2018-03-16 16:10:33 +01:00
Johann Pinson	9d6d2c0b9f	Update model.template for mongoose	2018-03-16 16:01:27 +01:00
Johann Pinson	49536526f8	Update model.template for bookshelf	2018-03-16 16:00:14 +01:00
Aurelsicoko	7148eafd2a	Improve request	2018-03-16 12:20:58 +01:00
Aurelsicoko	7760ae54cc	Improve errors handling	2018-03-16 11:42:17 +01:00
Jim LAURIE	a97e96c240	Merge branch 'master' into fix/mask	2018-03-15 16:21:05 +01:00
Aurelsicoko	684a70c665	Fix dominant true when updating relationship	2018-03-15 12:56:21 +01:00
Jim LAURIE	e0501b5adf	Merge branch 'master' into fix-users	2018-03-15 12:02:25 +01:00
Jim Laurie	54af44901b	Remove useless clone object	2018-03-15 12:01:10 +01:00
Jim Laurie	2f4635bf4c	Fix PR feedback	2018-03-15 11:51:40 +01:00
Jim LAURIE	19fdb4d279	Merge branch 'master' into role-registered	2018-03-14 17:13:57 +01:00
Jim Laurie	489aefba06	Rename role registered to authenticated	2018-03-14 16:56:12 +01:00
Jim LAURIE	31ee1583b4	Merge branch 'master' into enhance/register	2018-03-14 16:12:23 +01:00
Aurelsicoko	94dc9305b1	Update URL	2018-03-14 16:08:33 +01:00
Aurelsicoko	d59025de06	Replace usage URLs	2018-03-14 15:58:12 +01:00