2771 Commits

Author SHA1 Message Date
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
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
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
256f0912a5
Merge branch 'master' into doc-migration-alpha.8 2018-01-18 15:27:35 +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
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
Jim LAURIE
7be9addd82
Merge pull request #438 from strapi/add-documentation
Add helpers in documentation
2018-01-18 12:13:54 +01:00
Jim LAURIE
f129a24920
Delete text migration guide link 2018-01-18 11:47:12 +01:00
Jim LAURIE
2612a6250d
Merge branch 'master' into add-documentation 2018-01-18 11:44:03 +01:00
Jim Laurie
5adff62481 Update strapi version in documentation 2018-01-18 11:18:48 +01:00
cyril lopez
b29ff0893e Update branch
Merge branch 'add-overlay-blocker' of github.com:strapi/strapi into add-overlay-blocker
2018-01-18 10:57:39 +01:00
cyril lopez
87d01af7a7 Decrease BackHeader z-index 2018-01-18 10:56:31 +01:00
Jim LAURIE
b53b074b3f
Update overlay blocker documentation 2018-01-18 09:40:48 +01:00
Jim LAURIE
77b068ef07
Merge branch 'master' into add-overlay-blocker 2018-01-18 09:33:00 +01:00
Jim LAURIE
7034aff360
Merge pull request #461 from strapi/alpha.8
3.0.0-alpha.8
2018-01-17 21:25:26 +01:00
Jim Laurie
03643bfb13 3.0.0-alpha.8 v3.0.0-alpha.8 2018-01-17 16:59:28 +01:00
cyril lopez
e50a56d230 Fix list-plugins plugin icon css 2018-01-17 16:47:13 +01:00
Aurélien GEORGET
10dfd71c84
Merge pull request #454 from strapi/install-plugin
Install plugin
2018-01-17 16:09:24 +01:00
Aurélien GEORGET
8ca63de5a9
Merge branch 'master' into install-plugin 2018-01-17 15:32:36 +01:00
Aurélien GEORGET
02594dc964
Update styles.scss 2018-01-17 15:32:21 +01:00
Jim LAURIE
832dd1629e
Merge pull request #459 from strapi/fix/create-user-log
Fix postgres and mysql logs user table creation
2018-01-17 15:02:49 +01:00
cyril lopez
8571d05c4f Update branch
Merge branch 'add-overlay-blocker' of github.com:strapi/strapi into add-overlay-blocker
2018-01-17 14:38:07 +01:00
cyril lopez
d35f36bd27 Update branch
Merge branch 'master' of github.com:strapi/strapi into add-overlay-blocker
2018-01-17 14:37:45 +01:00