Jim Laurie
4fe7b6176e
Fix conflicts & lint
2018-05-16 12:07:02 +02:00
Aurelsicoko
02a2e087cc
Remove warning where clause
2018-05-09 15:11:55 +02:00
Jim LAURIE
c09f5138a2
Merge branch 'master' into eslint
2018-05-07 16:03:35 +02:00
soupette
68504fbe16
Add eslint to users-permissions backend
2018-04-30 18:26:56 +02:00
soupette
611dfb32eb
Merge branch 'master' of github.com:strapi/strapi into sql-xp
2018-04-26 10:26:09 +02:00
Jim LAURIE
d94be998a4
Fix prevGrantConfig equal undefined when config not exist in db
2018-04-25 14:12:24 +02:00
Jim Laurie
8d2a46cd0c
Fix conflict timestamp
2018-04-25 11:06:12 +02:00
Zhuang
d23ebfeaf0
merge the previous provider config
2018-04-24 22:18:21 +08:00
Jim Laurie
79ddc27cb1
U&P setup in bookshelf and handle oneToMany relation
2018-04-24 14:29:28 +02:00
Zhuang
e69dcc433b
reload grant value to db when add/delete provider
2018-04-21 12:29:00 +08:00
Jim LAURIE
ab238dca61
Remove space
2018-04-16 09:48:43 +02:00
cece95
32aefbe5be
fixed issue #923
2018-04-16 08:49:41 +02:00
Jim Laurie
489aefba06
Rename role registered to authenticated
2018-03-14 16:56:12 +01:00
Jim Laurie
9b7a216411
Add default role in advanced settings
2018-03-12 15:56:25 +01:00
Jim Laurie
957e7a08cb
Environment agnostic for users-permissions configs
2018-02-13 15:04:21 +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
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
cyril lopez
54a4f33371
Merge branch 'master' into fix/users-front
2018-01-26 17:37:01 +01:00
cyril lopez
6e23c90434
Fix css and wording
...
As seen in the demo I removed the test transform capitalize in the ListRow component.
Add width to the iconContainer so it s now perfectly aligned.
Add missing trad key and change wording for the toggle label
2018-01-26 17:31:52 +01:00
Jim Laurie
7f78cc9f84
Change data format email template
2018-01-26 10:18:36 +01:00
Aurelsicoko
1ac6a56ce0
Resolve conflicts
2018-01-25 15:26:25 +01:00
Aurelsicoko
fc21d5f30a
Resolve conflicts
2018-01-25 13:25:09 +01:00
Aurelsicoko
cf1cb7050b
Resolve conflicts and disallow to edit and remove default roles
2018-01-24 11:52:09 +01:00
cyril lopez
06ab6ba8cd
Add translations for twitter
2018-01-23 16:43:16 +01:00
cyril lopez
db23c22ee4
Update branch
...
Merge branch 'auth-provider/configs' of github.com:strapi/strapi into auth-provider/configs-front
2018-01-23 15:58:48 +01:00
Jim Laurie
9ddd7f12a8
Fix missing save conflict
2018-01-23 11:32:40 +01:00
Jim Laurie
a6e78f023b
Fix conflicts
2018-01-23 10:55:57 +01:00
Jim Laurie
6b418b1460
Fix PR feedback and add twitter provider
2018-01-23 09:30:25 +01:00
cyril lopez
630e06d7fa
Get providers
2018-01-19 15:14:51 +01:00
cyril lopez
11c5905d25
form to edit email templates
2018-01-19 13:34:55 +01:00
Jim Laurie
5e8259af73
Can disable a provider
2018-01-18 15:45:02 +01:00
Aurelsicoko
4aa28a196e
[WIP] Read and update roles & permissions using database
2018-01-17 18:50:12 +01:00
Jim Laurie
02a89fbb5b
Generate advanced configs
2018-01-15 15:01:21 +01:00
Jim Laurie
3a9cb9b453
Use email templte config reset password
2018-01-15 14:50:53 +01:00
Jim Laurie
24d5a5116f
Get email template
2018-01-15 11:59:10 +01:00
Jim Laurie
eb64d8fe7d
Create email template config file
2018-01-15 11:29:38 +01:00
Jim Laurie
82d85d781c
Fix grant file creation
2018-01-12 16:07:21 +01:00
Jim Laurie
6e44e2e274
Add provider connection
2018-01-12 15:20:13 +01:00
Jim Laurie
1a1b083436
Add logs if missing thing in user table
2018-01-04 16:36:56 +01:00
Jim Laurie
832617159d
Fix auto set config if doent exist
2017-12-12 15:13:27 +01:00
Jim Laurie
df25e9dd2a
Generate uuid for jwt encryption
2017-12-04 16:43:24 +01:00
Jim Laurie
a0af2cdd4c
Fix PR feedback
2017-11-20 14:35:24 +01:00
cyril lopez
a6cecb0e3e
Algo diff between objects
2017-11-17 16:36:57 +01:00
Jim Laurie
f539eb0e10
Add bootstrap function in plugins
2017-11-17 11:17:20 +01:00