yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-01 05:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,041 Commits 106 Branches 487 Tags
Commit Graph

693 Commits

Author SHA1 Message Date
cyril lopez
c838b90e21 Add serverRestart to users-permissions 2018-01-15 11:07:40 +01:00
cyril lopez
977a79eaff Fix up plugin required props error 2018-01-12 17:50:18 +01:00
Jim Laurie
82d85d781c Fix grant file creation 2018-01-12 16:07:21 +01:00
Jim Laurie
1eb7b12934 Omit grant.json config file 2018-01-12 16:04:01 +01:00
Jim Laurie
6e44e2e274 Add provider connection 2018-01-12 15:20:13 +01:00
cyril lopez
5d470d890d Update branch 
Merge branch 'master' of https://github.com/strapi/strapi into verify/user-jwtToken
 2018-01-11 17:28:08 +01:00
cyril lopez
310f7b4b68 Rename setHasUserPlugin function 2018-01-11 17:26:46 +01:00
cyril lopez
1a07c2caad Enable /user/me route for guest users 2018-01-11 17:13:09 +01:00
cyril lopez
2af14f24c5 Throw error when trying to get /user/me with no headers 2018-01-11 16:24:16 +01:00
cyril lopez
c9a07da1e8 Check user token validity when receiving a 401 && set jwt expiration date 2018-01-11 15:59:00 +01:00
Jim LAURIE
09e7f0fc67
Merge branch 'master' into user-schema-logs 2018-01-11 15:01:47 +01:00
Jim Laurie
f545f373aa Fix PR feedback 2018-01-11 15:00:34 +01:00
Jim Laurie
054df448a9 Merge branch 'user-schema-logs' of github.com:strapi/strapi into user-schema-logs 2018-01-11 13:44:25 +01:00
Luca Perret
7cf77a9d57 fix(plugin-users-permissions): Config layout - 
Duplicate key email
 2018-01-11 00:23:28 +01:00
Luca Perret
5035170424 feat(plugin-users-permissions): add /user/me to fetch authenticated user model 2018-01-10 20:29:34 +01:00
Luca Perret
d877440862 typo(plugin-users-permissions): useless curly brace 2018-01-10 20:28:05 +01:00
Aurelsicoko
b0fc115cd7 Use i18n when there is no description available for a plugin 2018-01-10 16:55:12 +01:00
Jim LAURIE
502b101598
Fix PR feedback 2018-01-10 13:39:42 +01:00
Aurélien GEORGET
88e4c25b75
Merge branch 'master' into user-schema-logs 2018-01-10 12:02:07 +01:00
Jim Laurie
ff46faf306 Execute controller action out of authorization try 2018-01-09 13:53:52 +01:00
Jim LAURIE
3a4ca8ea49
Merge branch 'master' into enhancement/one-way 2018-01-09 11:00:34 +01:00
cyril lopez
fd41a77e11 Fix EditRole page InputSearch label 2018-01-08 14:15:27 +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
Aurelsicoko
c9d47b1fed Retrieve plugins' icons URL from API and name Redux store 2018-01-05 16:19:53 +01:00
Jim Laurie
cc4973b65b 3.0.0-alpha.7.3 2018-01-05 12:10:41 +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
cyril lopez
a976284786 Add required fields to user model 2017-12-18 13:31:33 +01:00
Aurelsicoko
c6a1dcf5cd Only uppercase first letter of labels 2017-12-18 11:57:09 +01:00
Aurelsicoko
92c891e341 Improve error when association fail and handle configurable key in models 2017-12-16 18:26:04 +01:00
Aurelsicoko
6d8b81ecbd Resolve conflicts 2017-12-16 17:08:58 +01:00
Aurelsicoko
6ac1bca417 Update algorithm to correctly add, edit and delete relationships between models and plugins' models 2017-12-16 17:03:34 +01:00
Aurelsicoko
0230184619 Apply same algorithm to clearRelation method 2017-12-15 18:04:56 +01:00
Jim Laurie
5b6127876d 3.0.0-alpha.7.2 2017-12-15 15:04:31 +01:00
Jim Laurie
4cb88af247 Fix PR feedback 2017-12-15 14:22:11 +01:00
cyril lopez
b260ebd9d7 Display model source in ctb homepage and ctb left menu 2017-12-15 13:58:53 +01:00
cyril lopez
aa02d5408a Improve login errors 2017-12-15 13:24:08 +01:00
Jim Laurie
b5c813e5f8 Can not set role 0 to someone user API 2017-12-15 10:49:01 +01:00
Jim Laurie
f12927d2ce Delete role collapse chevron if no API 2017-12-14 17:06:26 +01:00
Jim Laurie
78c2b252cd Fix find users 2017-12-14 16:29:13 +01:00
Jim Laurie
22a7e91036 Fix get user info link in search list 2017-12-14 16:15:32 +01:00
Jim Laurie
2715f2693f Check if token user still exist 2017-12-14 16:12:39 +01:00
Jim Laurie
c7ef225238 Replace id to _id for fetch user mongoose 2017-12-14 15:14:53 +01:00
Aurelsicoko
4bdfddaca8 Clean relation model user 2017-12-14 14:13:06 +01:00
Jim Laurie
1ab6ae71d8 3.0.0-alpha.7.1 2017-12-14 10:27:08 +01:00
cyril lopez
b541e6cc4f Fix conflict 2017-12-13 16:47:35 +01:00
Aurelsicoko
859e2985c8 Fix many-to-many association with Bookshelf 2017-12-13 16:28:50 +01:00
cyril lopez
c6d74d58f0 Add plugins models to ctb and fix navigation 2017-12-13 15:22:16 +01:00