942 Commits

Author SHA1 Message Date
cyril lopez
578d2e2916 Fix css backheader and logout 2018-01-24 13:06:20 +01:00
cyril lopez
32ca068afb Fixes #498 2018-01-23 16:26:04 +01:00
cyril lopez
55ea0eb9e5 Update OverlayBlocker documentation, use context to prevent Overlay from being displayed 2018-01-23 15:34:34 +01:00
Jim LAURIE
eb1d1645fd
Merge branch 'master' into auth-provider/update-user-models 2018-01-23 10:45:26 +01:00
Jim Laurie
6b418b1460 Fix PR feedback and add twitter provider 2018-01-23 09:30:25 +01:00
Jim LAURIE
cf4ec81993
Merge branch 'master' into fix/list-plugins 2018-01-19 18:36:33 +01:00
Jim LAURIE
bf69ea7de9
Merge branch 'master' into alpha.8.3 2018-01-19 17:55:24 +01:00
Aurelsicoko
5b93cc5242 3.0.0-alpha.8.3 2018-01-19 16:49:57 +01:00
Aurelsicoko
3c9e18564d Report changes from branch hotfix/deploy 2018-01-19 15:58:29 +01:00
Aurelsicoko
086b42f079 Improve deployment workflow and fix setup 2018-01-19 14:50:34 +01:00
Jim LAURIE
2e55706fdb
Merge branch 'master' into alpha.8.1 2018-01-19 09:15:28 +01:00
Jim Laurie
7b0a106cb2 3.0.0-alpha.8.2 2018-01-19 08:52:34 +01:00
Jim LAURIE
77b068ef07
Merge branch 'master' into add-overlay-blocker 2018-01-18 09:33:00 +01:00
Jim Laurie
03643bfb13 3.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
cyril lopez
e7fcb3cd8c Fix typo 2018-01-17 14:30:37 +01:00
cyril lopez
d9895fc431 Remove the OverlayBlocker from users plugin pass set lockApp in the strapi object 2018-01-17 12:58:14 +01:00
cyril lopez
b13960de3c Created Global constants and actions to display the OverlayBlocker directly from the request helper when the server is restarting 2018-01-17 12:08:48 +01:00
cyril lopez
aa06c0bfd0 Update branch
Merge branch 'master' of github.com:strapi/strapi into add-overlay-blocker
2018-01-17 11:23:33 +01:00
cyril lopez
41eba07f21 etup 2018-01-17 10:36:25 +01:00
cyril lopez
52c8aeeee3
Merge branch 'master' into install-plugin 2018-01-16 18:08:54 +01:00
cyril lopez
50661fa805 Add redirection to plugin if the plugin is already installed, redirect the user to the mktplace for buying a tee shirt 2018-01-16 18:06:15 +01:00
cyril lopez
6adeeeadbb Fix list plugins description and css 2018-01-16 16:34:53 +01:00
Aurelsicoko
8c9f77a615 Use debug option instead of verbose 2018-01-16 16:33:05 +01:00
Aurelsicoko
83e0ffd323 Merge duplicate code and add verbose option on setup command 2018-01-16 16:18:33 +01:00
Aurelsicoko
adb11a0b8b Merge branch 'master' of github.com:strapi/strapi into fix/deploy 2018-01-16 16:02:02 +01:00
Aurelsicoko
4edcff2627 Merge branch 'fix/deploy' of github.com:strapi/strapi into fix/deploy 2018-01-16 10:39:32 +01:00
Aurélien GEORGET
ff62fb351c
Merge branch 'master' into fix/deploy 2018-01-15 19:02:32 +01:00
Aurelsicoko
9031ff1799 Fix webpack public path and production configuration templating 2018-01-15 17:45:22 +01:00
cyril lopez
0a62a4e6dc Fix install plugin page 2018-01-15 16:43:08 +01:00
Aurelsicoko
247caae4b4 Omit publicPath and update publicPath on the fly 2018-01-15 14:31:04 +01:00
Aurelsicoko
4b39785a8a Copy plugins.json content instead of faking the copy 2018-01-12 16:41:59 +01:00
cyril lopez
5b7c65e3ea Redo OverlayBlocker design 2018-01-12 12:51:39 +01:00
Aurelsicoko
216a1b3bbb Remove host configuration in admin build 2018-01-12 11:38:03 +01:00
Aurelsicoko
109d2ca6b0 Use build backend URL to load plugins from origin 2018-01-11 17:49:11 +01:00
cyril lopez
310f7b4b68 Rename setHasUserPlugin function 2018-01-11 17:26:46 +01:00
Aurelsicoko
e3c0ff6fc5 Add shelljs as dependency 2018-01-11 16:38:20 +01:00
Aurélien GEORGET
bcb7a68dde
Merge branch 'master' into fix/deploy 2018-01-10 18:27:52 +01:00
Aurelsicoko
b0fc115cd7 Use i18n when there is no description available for a plugin 2018-01-10 16:55:12 +01:00
Aurelsicoko
69ef0fa871 Fix CI 2018-01-10 15:38:28 +01:00
Aurelsicoko
143bfd3a7c Merge branch 'master' of github.com:strapi/strapi into fix/deploy 2018-01-09 19:36:41 +01:00
Aurelsicoko
3b54802ae9 Remove logs 2018-01-09 19:36:35 +01:00
Aurelsicoko
440b44ed27 Update documentation and improve plugins.json generation logic 2018-01-09 18:39:50 +01:00
Aurelsicoko
ce61844427 Use relative URL instead of absolute to load plugin and set administration origin 2018-01-09 17:09:54 +01:00
Jim Laurie
ff46faf306 Execute controller action out of authorization try 2018-01-09 13:53:52 +01:00
Jim LAURIE
3a4ca8ea49
Merge branch 'master' into enhancement/one-way 2018-01-09 11:00:34 +01:00
Aurélien GEORGET
77e28eacb2
Merge branch 'master' into improve/list-plugins 2018-01-08 18:14:10 +01:00
Aurelsicoko
6916134ee1 Update setup script to deploy and index.html rewrite 2018-01-08 16:34:41 +01:00
Aurélien GEORGET
8a1b95f2b5
Merge branch 'master' into enhancement/one-way 2018-01-08 12:12:01 +01:00
Aurelsicoko
10db375825 Fix #379 - Support one-way relationship 2018-01-08 12:10:48 +01:00