yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-14 11:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 116 Branches 489 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
f55883a713
Merge pull request #464 from strapi/auth-provider/update-user-models 
Auth provider/update user models
 2018-01-23 10:58:27 +01:00
Jim Laurie
a6e78f023b Fix conflicts 2018-01-23 10:55:57 +01:00
Aurélien GEORGET
4debeb0797
Merge branch 'master' into master 2018-01-23 10:48:02 +01:00
Jim LAURIE
eb1d1645fd
Merge branch 'master' into auth-provider/update-user-models 2018-01-23 10:45:26 +01:00
Jim Laurie
33437439a6 Fix missing koa grant dep 2018-01-23 10:43:49 +01:00
Jim Laurie
6b418b1460 Fix PR feedback and add twitter provider 2018-01-23 09:30:25 +01:00
Luca
97da3ba12d
fix(mongoose): password require username 2018-01-23 07:26:57 +01:00
Luca
ec106bce41
fix(mongoose): allow to connect without password 2018-01-23 07:26:00 +01:00
Luca
d17a50dd87
fix(mongoose): allow to connect without password 2018-01-23 07:23:15 +01:00
Aurelsicoko
a06336cdbb Update permissions from UI in database 2018-01-22 18:19:44 +01:00
Jim LAURIE
974c709e04
Merge pull request #480 from strapi/add-repo-link 
Add repo location in plugins package
 2018-01-22 16:53:02 +01:00
Jim LAURIE
8a2b312c55
Update dependency version 2018-01-22 16:14:45 +01:00
Jim LAURIE
e6eff3b98e
Merge branch 'master' into add-repo-link 2018-01-22 16:04:37 +01:00
Brandon Cheng
a3700a93d5
Fix undefined rootAdminpath in admin dev mode 
It looks like rootAdminpath is used in the development webpack config
file (copied from one of the other webpack configs), but its definition
was omitted accidentally.

Fixes #415
 2018-01-22 08:53:15 -05:00
cyril lopez
1ffedf9726 Update branch 
Merge branch 'master' of github.com:strapi/strapi into auth-provider/configs-front
 2018-01-22 13:12:16 +01:00
cyril lopez
8ca48eec29 Remove useless render functions 2018-01-22 13:10:58 +01:00
cyril lopez
2b099e3a2f Handle form errors for email-templates 2018-01-22 12:25:50 +01:00
cyril lopez
46ecdd1e17 Handle formValidation for providers 2018-01-22 12:05:22 +01:00
Jim LAURIE
06f1b74d7a
Merge pull request #492 from ArkhipovK/master 
strapi new connection config fail fix #476 #485 issues
 2018-01-22 11:53:05 +01:00
Jim LAURIE
251e4609a9
Fix space 2018-01-22 11:35:14 +01:00
cyril lopez
88204154f9 Update list when PUT providers 2018-01-22 11:00:41 +01:00
cyril lopez
e425125f82 Put providers 2018-01-22 10:23:04 +01:00
ArkhipovK
ded4210eff strapi new connection config fail fix #476 #485 issues 2018-01-22 14:43:17 +06:00
Jim LAURIE
adea02af47
Merge pull request #491 from satriowisnugroho/fix-docs 
Fix docs
 2018-01-22 08:33:13 +01:00
Jim LAURIE
7fee830fc5
Merge branch 'master' into fix-docs 2018-01-22 08:17:32 +01:00
Jim LAURIE
c2315980cc
Merge pull request #460 from strapi/fix/list-plugins 
Fix list-plugins plugin icon css
 2018-01-22 08:09:25 +01:00
Satrio Wisnugroho
ec1c278618 Fix indentation 2018-01-22 11:08:05 +07:00
Satrio Wisnugroho
7f2fcd7c94 Fix missing comma 2018-01-22 10:41:31 +07:00
Jim LAURIE
cf4ec81993
Merge branch 'master' into fix/list-plugins 2018-01-19 18:36:33 +01:00
Jim LAURIE
69f1ea7d7a
Merge pull request #486 from strapi/alpha.8.3 
Alpha.8.3
 2018-01-19 18:36:18 +01:00
Aurelsicoko
9daf29be78 Be able to retrieve role data with populate 2018-01-19 17:57:10 +01:00
Jim LAURIE
bf69ea7de9
Merge branch 'master' into alpha.8.3 2018-01-19 17:55:24 +01:00
cyril lopez
9b1347d092 Add link to documentation for templating emails 2018-01-19 17:43:00 +01:00
cyril lopez
308b8ee04b Created users-permissions documentation folder 2018-01-19 17:31:45 +01:00
Jim LAURIE
f62fc05aa5
Merge pull request #484 from strapi/hotfix/deploy-2 
Hotfix/deploy 2
v3.0.0-alpha.8.3 		2018-01-19 17:21:39 +01:00
cyril lopez
e10309145e Edit providers 2018-01-19 17:16:14 +01:00
Jim LAURIE
b04a2250a2
Merge pull request #469 from Nsbx/master 
Fix package 'strapi-generate-new' on Windows
 2018-01-19 16:55:58 +01:00
Aurelsicoko
5b93cc5242 3.0.0-alpha.8.3 2018-01-19 16:49:57 +01:00
Nicolas Bondoux
c6841edfd7
Merge branch 'master' into master 2018-01-19 16:06:22 +01:00
Aurelsicoko
3c9e18564d Report changes from branch hotfix/deploy 2018-01-19 15:58:29 +01:00
Nicolas Bondoux
e60876fe0d
Fix use ShellJS 2018-01-19 15:41:01 +01:00
cyril lopez
630e06d7fa Get providers 2018-01-19 15:14:51 +01:00
Aurelsicoko
086b42f079 Improve deployment workflow and fix setup 2018-01-19 14:50:34 +01:00
cyril lopez
9572bf9749 Put email templates 2018-01-19 13:52:43 +01:00
Jim Laurie
c66e2b382a update strapi plugin email package 2018-01-19 13:38:33 +01:00
cyril lopez
11c5905d25 form to edit email templates 2018-01-19 13:34:55 +01:00
Jim LAURIE
e7c43e5786
Merge pull request #478 from strapi/alpha.8.1 
Alpha.8.2
 2018-01-19 12:24:36 +01:00
Jim LAURIE
07a84b5984
Merge branch 'master' into alpha.8.1 2018-01-19 12:08:10 +01:00
Jim Laurie
19ee51376b Add repo location in plugins package 2018-01-19 12:06:08 +01:00
Jim LAURIE
a76b0022c0
Merge pull request #477 from acifer/patch-3 
Updates the Summary.md to refer to correct Authentication page
 2018-01-19 09:44:01 +01:00