yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-27 19:10:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 111 Branches 486 Tags
Commit Graph

176 Commits

Author SHA1 Message Date
Jim LAURIE
4bffe2749c
Remove error log 
We will work on a complete logs tag plan in the future.
 2019-01-11 10:55:21 +01:00
Paolo Ragone
b6fc268297 Fixed bug following recommendation 2019-01-11 22:52:28 +13:00
Paolo Ragone
b3ebf8e736 Merge remote-tracking branch 'origin/master' into patch-1 2019-01-11 22:50:19 +13:00
Jim LAURIE
e41948de3f Add setting for production environment 2019-01-09 14:19:39 +01:00
Paolo Ragone
947dd2b502 Added missing semicolon 2018-12-26 12:11:12 +13:00
Paolo Ragone
382722b74c
Fix provider query building bug 
Fixes #2536
Does so by fixing the parameters to the query call
 2018-12-26 11:10:35 +13:00
Abdón Rodríguez Davila
df162c1387 Avoid write actions.json if not development environment 2018-12-19 19:42:10 +01:00
Alberto Maturano
8fcbb1978f refactor: Fix misuse of map method 
`map` should create a new Array so a `return` is expected inside the
callback param. `forEach` is the corrent method to use for just iterate
over array elements.
 2018-11-15 15:51:23 -06:00
Sidharth Vinod
e3d4708aaa
Update username for Google Auth to fix #2285 2018-11-11 00:26:53 +05:30
Benjamin Devaublanc
507ab8b922 Fix error on fetch permissions 
Can't fetch permissions if we have an api that contain a service with no
controllers
 2018-10-05 13:07:56 +02:00
cyril lopez
d05f936ff5 Add plugin prefix to plugins routes. 
Fixes #1765
 2018-10-01 14:29:11 +02:00
Tarun Thakurani
d1427cb6c8 [#932] fixed Setting user with numeric password fails 2018-09-22 18:45:49 +05:30
Jim LAURIE
f27b2ae2f6
Merge branch 'master' into email-validation 2018-08-21 11:54:22 +02:00
Jim LAURIE
86828d731a
Merge branch 'master' into auth-microsoft 2018-08-09 16:59:00 +02:00
Jim LAURIE
eec423a2cd Add confirmation email 2018-08-08 17:57:02 +02:00
Jim LAURIE
70e9523ba8 Fix policy error 2018-08-06 16:59:14 +02:00
David Thomas
27c88e3a1a
Merge branch 'master' into auth-microsoft 2018-08-05 12:20:05 -04:00
Jim LAURIE
f559bcc82c
Merge branch 'master' into discordProvider 2018-07-31 16:18:04 +02:00
Jim LAURIE
bc3e756e6e Fix multi API controller 2018-07-30 10:10:43 +02:00
DMehaffy
b8adba1e23 Finish adding Discord to Providers.js 
Thanks to synth3tk for your help!

Note that with Discord the username is not unique so I combined the username and discriminator in order to store a unique "username"
 2018-07-29 17:43:45 -07:00
DMehaffy
a2aefab312 Merge remote-tracking branch 'strapi/master' into discordProvider 2018-07-29 12:30:41 -07:00
David Thomas
2b9fc1a8b9
Merge branch 'master' into auth-microsoft 2018-07-25 21:06:29 -04:00
Aurelsicoko
37b9c2ee4c Remove front-end dependency from marketplace.strapi.io 2018-07-24 19:37:27 +02:00
Aurélien GEORGET
06bcac7ee2
Disconnect projects from marketplace.strapi.io 2018-07-24 18:54:50 +02:00
DMehaffy
1b0579db22 Updating purest config 2018-07-24 07:04:25 -07:00
DMehaffy
4c64168cda Add base structure for discord 2018-07-23 05:07:17 -07:00
David Thomas
06b741f322 Add Microsoft auth provider 
Closes #1385
 2018-07-22 22:03:29 -04:00
Kati Frantz
f108494cd9 update connect function to check for duplicate email and not provider 2018-07-20 11:36:34 +01:00
Kati Frantz
d3ef2f8e3c fetch current actions from database 
use results for comparing if new actions have been added to controllers
 2018-07-05 09:57:12 +01:00
Jim Laurie
4d47d65c6d Fix default role provider and create user fix #1212 2018-06-12 19:19:10 +02:00
Jim LAURIE
5a77a67338
Merge branch 'master' into bulk-actions 2018-06-12 11:32:01 +02:00
soupette
ae51f39c62 Fix default role when login with custom providers 2018-06-11 16:08:43 +02:00
soupette
e7357e025c Handle delete many with models from users-permissions 2018-06-06 16:20:52 +02:00
Johan Baath
1cdb1dfc76 fix clean up of duplicate permissions 2018-05-23 14:25:32 +02:00
Jim LAURIE
0c6f86ce3e
Merge branch 'master' into eslint 2018-05-14 16:13:47 +02:00
Jim Laurie
8cd33563ae Harmonize model templates 2018-05-14 12:05:09 +02:00
cyril lopez
1f019c60c3
Merge branch 'master' into eslint 2018-05-14 11:50:32 +02:00
Aurelsicoko
13209fd3a5 Fixes #1134 2018-05-08 17:54:23 +02:00
Jim LAURIE
c09f5138a2
Merge branch 'master' into eslint 2018-05-07 16:03:35 +02:00
Jim LAURIE
d0b9233b17
Merge branch 'master' into fix/736 2018-05-07 15:27:41 +02:00
Aurelsicoko
451ad266fb Keep first set permissions & remove duplicate 2018-05-03 16:26:57 +02:00
Aurelsicoko
f62c5f52fc Remove duplicate permissions 2018-05-02 11:40:42 +02:00
soupette
68504fbe16 Add eslint to users-permissions backend 2018-04-30 18:26:56 +02:00
Aurelsicoko
dffbf3bbb3 Concat promise to return a single array 2018-04-27 15:48:52 +02:00
Jim Laurie
79ddc27cb1 U&P setup in bookshelf and handle oneToMany relation 2018-04-24 14:29:28 +02:00
Jim Laurie
8191c43ce5 Create tables is not exist instead of log queries 2018-04-23 16:09:01 +02:00
Aurelsicoko
7149cfa36e Avoid badRequest when an API hasn't routes 2018-04-23 14:39:27 +02:00
Aurelsicoko
61fb2dec45 Avoid random restart on permission update 2018-04-23 14:21:24 +02:00
Juampy
32095d08c5 Fix invalid timestamp default values for MySQL 5.7 2018-04-18 19:01:19 +02:00
Jim Laurie
489aefba06 Rename role registered to authenticated 2018-03-14 16:56:12 +01:00