yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 09:56:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,931 Commits 119 Branches 507 Tags
Commit Graph

25 Commits

Author SHA1 Message Date
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