yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-29 17:04:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,803 Commits 118 Branches 506 Tags
Commit Graph

2803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Laurie
a6e78f023b Fix conflicts 2018-01-23 10:55:57 +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
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
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
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
Jim LAURIE
bf69ea7de9
Merge branch 'master' into alpha.8.3 2018-01-19 17:55:24 +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
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
Aurelsicoko
086b42f079 Improve deployment workflow and fix setup 2018-01-19 14:50:34 +01:00
Jim Laurie
c66e2b382a update strapi plugin email package 2018-01-19 13:38:33 +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
Jim LAURIE
2e55706fdb
Merge branch 'master' into alpha.8.1 2018-01-19 09:15:28 +01:00
acifer
1413069d6b
Updates the Summary.md to refer to correct Authentication page 
Reference to authentication was broken when its name was updated. Its fixed with correcting the filename.
 2018-01-19 09:08:52 +01:00
Jim Laurie
7b0a106cb2 3.0.0-alpha.8.2 2018-01-19 08:52:34 +01:00
Jim Laurie
5accaf30e3 Hot fix permission detection 2018-01-19 07:38:30 +01:00
Nicolas Bondoux
6b1deaf0ed
Merge branch 'master' into master 2018-01-18 16:07:33 +01:00
Jim LAURIE
8b069da4e1
Merge pull request #466 from strapi/doc-migration-alpha.8 
Add migration from alpha.7.4 to alpha.8
 2018-01-18 16:06:16 +01:00
Nicolas Bondoux
ed80aa4c86
Fix generate new package on windows 2018-01-18 16:02:32 +01:00
Jim Laurie
f9920a4739 Disable local provider 2018-01-18 16:01:52 +01:00
Jim Laurie
5e8259af73 Can disable a provider 2018-01-18 15:45:02 +01:00
Jim LAURIE
256f0912a5
Merge branch 'master' into doc-migration-alpha.8 2018-01-18 15:27:35 +01:00
Jim Laurie
fc22f13cfc Merge branch 'auth-provider/update-user-models' of github.com:strapi/strapi into auth-provider/configs 2018-01-18 15:15:25 +01:00
Pierre BURGY
1c555293b1
Update README.md 
Change Getting Started link in README.md
 2018-01-18 15:10:55 +01:00
Jim Laurie
6da09af501 Fix plugin multi middleware 2018-01-18 14:53:25 +01:00
Jim Laurie
6ae2f6dfee Add unique email verification on user update 2018-01-18 14:10:26 +01:00
Jim Laurie
cf6b240451 Merge branch 'master' of github.com:strapi/strapi into auth-provider/configs 2018-01-18 13:45:46 +01:00
Jim LAURIE
37f73c4dde
Merge pull request #446 from strapi/add-overlay-blocker 
Add overlay blocker
 2018-01-18 13:45:31 +01:00
Jim LAURIE
c6a0d0afbf
Merge branch 'master' into add-overlay-blocker 2018-01-18 13:31:36 +01:00
Jim LAURIE
cdefbe7a08
Merge pull request #465 from strapi/update-doc-version 
Update strapi version in documentation
 2018-01-18 13:30:16 +01:00
Jim Laurie
801a47994a Add migration from alpha.7.4 to alpha.8 2018-01-18 12:28:59 +01:00
Jim LAURIE
8b3d71559f
Merge branch 'master' into update-doc-version 2018-01-18 12:14:38 +01:00