471 Commits

Author	SHA1	Message	Date
Jim Laurie	957e7a08cb	Environment agnostic for users-permissions configs	2018-02-13 15:04:21 +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
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
Aurelsicoko	2cb0e2c3d5	Hide resetPasswordToken from response	2018-02-08 14:59:39 +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	e963ee1414	Merge branch 'master' into enhancement/database-uri	2018-02-07 17:57:14 +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
cyril lopez	ff560d2cd8	Merge branch 'master' into disabled-autocomplete	2018-02-06 18:53:19 +01:00
cyril lopez	fc8781363e	Merge branch 'master' of github.com:strapi/strapi into add/inputs-to-users	2018-02-06 18:45:47 +01:00
cyril lopez	5a4bc75c91	Implement new lib input in EditPage container ... Use Label component in InputSearchContainer. Add new Inputselect in Policies component	2018-02-06 18:42:42 +01:00
cyril lopez	5b27933d66	Add new input lib to EditPage container	2018-02-06 18:14:30 +01:00
Aurelsicoko	2f8169c792	Hide specific model fields from response	2018-02-06 18:09:04 +01:00
cyril lopez	9740ab3869	Rename custome InputCheckbox ... I ran into an issue with webpack which chould get the appropriate file beacsue of conflicting between components from the strapi-helper-plugin and components from the plugin itself. Had to rename this file in order to solve the bug	2018-02-06 18:01:44 +01:00
cyril lopez	5002dd43ab	Rename custome InputCheckbox ... I ran into an issue with webpack which chould get the appropriate file beacsue of conflicting between components from the strapi-helper-plugin and components from the plugin itself. Had to rename this file in order to solve the bug	2018-02-06 17:59:06 +01:00
cyril lopez	8a2d5cf8e6	Fix label succes email sent	2018-02-06 17:47:50 +01:00
Jim LAURIE	c7a1ab0b5d	Merge branch 'master' into fix/role	2018-02-06 17:38:25 +01:00
cyril lopez	da41adeacf	Use new input lib in AuthPage container	2018-02-06 17:32:15 +01:00
cyril lopez	4c933e1c0b	Remove autoComplete on password field	2018-02-06 16:27:43 +01:00
Aurelsicoko	a07663afe4	Populate type field when creating a role #553	2018-02-06 14:43:26 +01:00
Jim LAURIE	f7f8fde845	Merge branch 'master' into add-new-lib-input-to-users-homepage	2018-02-06 14:27:00 +01:00
Jim Laurie	244b280919	New format store constructor ... strapi.store(source).get(params) strapi.store(source).set({params, value}) Co-authored-by: Aurelsicoko <aurelsicoko@gmail.com>	2018-02-06 13:10:43 +01:00
cyril lopez	c9281f0c38	Add new input lib in PopUpForm compon in users plugin	2018-02-05 17:41:49 +01:00
cyril lopez	cc4166e683	Add new input in users-permissions plugin Advanced settings	2018-02-05 17:24:15 +01:00
Jim LAURIE	dcb2839260	Merge branch 'master' into fix-update-user	2018-02-05 17:09:26 +01:00
Jim Laurie	1f3efc6416	3.0.0-alpha.9.2	2018-02-05 16:36:33 +01:00
Jim LAURIE	5fece61ed9	Fix set params id	2018-02-05 12:41:10 +01:00
Jørgensen	7580fe16f3	Merge branch 'master' into master	2018-02-04 12:09:57 +01:00
Jim Laurie	0c2b54532e	Disable health route hit on config update	2018-02-02 18:08:49 +01:00
M1chaelTran	1d24e2b873	close #552	2018-02-03 00:30:01 +11:00
Jim Laurie	a8c59f999a	Fix user update via API and content-type-builder	2018-02-02 12:59:34 +01:00
Jørgensen	dffa0b03e3	Merge branch 'master' into master	2018-02-02 08:04:42 +01:00
Jim Laurie	29af75cc51	Use database config for users-permissions plugin ... Delete advanced, grant and email json files Update setter to update data	2018-02-01 18:12:38 +01:00
Jim Laurie	f9a818e49c	3.0.0-alpha.9.1	2018-02-01 11:08:15 +01:00
Jim LAURIE	80d327da8d	Merge branch 'master' into 3.0.0-alpha.9	2018-01-31 08:10:32 +01:00
Jim LAURIE	1dd08597cd	Merge branch 'master' into fix-providers-restrictions	2018-01-31 07:51:24 +01:00
Kristian Frølund	28cd762009	Rephrased error-text	2018-01-29 19:30:56 +01:00
Kristian Frølund	280109c034	Moved user validation logic from JWT service to permissions policy	2018-01-29 19:26:28 +01:00
Jim Laurie	8825f2fe2c	3.0.0-alpha.9	2018-01-29 17:24:10 +01:00
Jim Laurie	c044b105fc	Fix block provider conditions	2018-01-29 17:12:49 +01:00
Jim Laurie	0164a76d4c	Fix disable register and provider login	2018-01-29 13:12:49 +01:00
Aurélien GEORGET	7f2fbc8453	Merge branch 'master' into master	2018-01-29 13:08:01 +01:00
Jim LAURIE	717287cec8	Merge branch 'master' into fix/users-front	2018-01-29 11:15:04 +01:00