yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-19 07:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,041 Commits 115 Branches 484 Tags
Commit Graph

147 Commits

Author SHA1 Message Date
Aurelsicoko
1ac6a56ce0 Resolve conflicts 2018-01-25 15:26:25 +01:00
Jim Laurie
7cddfd9340 Fix get twitter data 2018-01-25 15:04:42 +01:00
Aurelsicoko
a60e13799f Open route /connect 2018-01-25 14:36:12 +01:00
cyril lopez
c4dac29bf6 Fix conflict 2018-01-25 13:43:07 +01:00
Aurelsicoko
fc21d5f30a Resolve conflicts 2018-01-25 13:25:09 +01:00
Jim LAURIE
01bb4cd0e2
Remove last else condition 2018-01-25 12:26:09 +01:00
Jim Laurie
64d3149876 Fix PR feedback 2018-01-25 11:53:22 +01:00
Aurelsicoko
462b44a759 Fix PG queries 2018-01-25 11:19:53 +01:00
Jim Laurie
4eb81abe5f Use async/await provider service 2018-01-25 08:54:17 +01:00
Jim Laurie
a2d7ffce74 User service to template email 2018-01-25 08:38:46 +01:00
cyril lopez
2031b8c9d7 Set user role when registering with a provider 2018-01-24 17:31:22 +01:00
Aurelsicoko
cf1cb7050b Resolve conflicts and disallow to edit and remove default roles 2018-01-24 11:52:09 +01:00
Aurelsicoko
0a62003af6 Fix plugin load due to autoReload 2018-01-24 11:06:24 +01:00
Aurelsicoko
8f85d85349 Improve roles in database to work with Bookshelf 2018-01-23 18:54:17 +01:00
cyril lopez
9e5d0e991b Fix provider auth 2018-01-23 17:25:58 +01:00
Aurelsicoko
187f6cb748 Display logs for every missing tables or attributes & update delete/add role feature 2018-01-23 15:38:43 +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
Aurelsicoko
a06336cdbb Update permissions from UI in database 2018-01-22 18:19:44 +01:00
Aurelsicoko
9daf29be78 Be able to retrieve role data with populate 2018-01-19 17:57:10 +01:00
Jim Laurie
66617e31c8 Merge branch 'auth-provider/update-user-models' of github.com:strapi/strapi into auth-provider/configs 2018-01-18 09:08:27 +01:00
Jim Laurie
7442e01abb Fix conflict documentation 2018-01-18 08:32:44 +01:00
Aurelsicoko
4b9923b574 Fix typo 2018-01-17 19:00:36 +01:00
Aurelsicoko
d5390fd4aa Merge branch 'master' of github.com:strapi/strapi into update-roles-models 2018-01-17 18:52:51 +01:00
Aurelsicoko
4aa28a196e [WIP] Read and update roles & permissions using database 2018-01-17 18:50:12 +01:00
Jim Laurie
ef2be5c6ee Fix postgres and mysql logs user table creation 2018-01-17 14:32:38 +01:00
Jim Laurie
1bcae6c73e Add unique email restriction on provider and local register 2018-01-15 17:58:11 +01:00
Jim Laurie
072dc10137 Add registration restriction on provider and local register 2018-01-15 15:19:59 +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
1a07c2caad Enable /user/me route for guest users 2018-01-11 17:13:09 +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
Aurelsicoko
b0fc115cd7 Use i18n when there is no description available for a plugin 2018-01-10 16:55:12 +01:00
Aurelsicoko
c9d47b1fed Retrieve plugins' icons URL from API and name Redux store 2018-01-05 16:19:53 +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
Aurelsicoko
6d8b81ecbd Resolve conflicts 2017-12-16 17:08:58 +01:00
Aurelsicoko
628ad4add4 Fix strapi-bookshelf to work w/ associations w/ plugins & JWT condition 2017-12-12 16:14:38 +01:00
Jim Laurie
832617159d Fix auto set config if doent exist 2017-12-12 15:13:27 +01:00
Aurelsicoko
8db92c22fd Split Content-Manager logic into service & allow CRUD and associations w/ plugin's models w/ Mongoose 2017-12-11 18:23:15 +01:00
Jim Laurie
a5ef1aa0ca Fix user fetch service with id 2017-12-11 12:31:26 +01:00
Jim Laurie
5f4a5971d7 Last fix PR 2017-12-11 11:14:07 +01:00
cyril lopez
3da6faac05 Fix feedback PR 2017-12-08 14:40:42 +01:00
cyril lopez
4074846b5b Refacto service 2017-12-08 10:42:45 +01:00
cyril lopez
3ebd86b2e1 Update branch 
Merge branch 'user-permissions' of github.com:strapi/strapi into user-permissions
 2017-12-07 18:42:40 +01:00
cyril lopez
f471a98f90 Fix manage user role bookshelf 2017-12-07 18:40:55 +01:00
cyril lopez
8d6cace469 Refacto InputSearch 2017-12-07 18:31:19 +01:00
Jim Laurie
729eea32c7 Merge branch 'user-permissions' of https://github.com/strapi/strapi into user-permissions 2017-12-07 18:31:16 +01:00