yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 01:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,877 Commits 115 Branches 488 Tags
Commit Graph

628 Commits

Author SHA1 Message Date
Aurelsicoko
086b42f079 Improve deployment workflow and fix setup 2018-01-19 14:50:34 +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
77b068ef07
Merge branch 'master' into add-overlay-blocker 2018-01-18 09:33:00 +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
cyril lopez
d3f81bc2b1 Remove stm request helper and remove stm OverlayBlocker related constants and action 2018-01-17 14:19:02 +01:00
Aurelsicoko
ecc7fe0b83 Fix backend URL in development mode 2018-01-17 14:13:31 +01:00
cyril lopez
289f75aa98 Update branch 
Merge branch 'master' of github.com:strapi/strapi into add-overlay-blocker
 2018-01-17 13:00:00 +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
Jim Laurie
7a4cb0e507 Fix data path in connectivity functions 2018-01-17 09:14:34 +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
49cf60f477 Fix popUpWarning design 2018-01-16 17:35:45 +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
16c253a846 Fix Travis 2018-01-15 11:31:19 +01:00
cyril lopez
0d4b5003df Update branch 
Merge branch 'master' of https://github.com/strapi/strapi into add-overlay-blocker
 2018-01-12 17:55:22 +01:00
cyril lopez
100c70a2ac Change OverlayBlocker doc url 2018-01-12 17:53:48 +01:00
Aurelsicoko
4b39785a8a Copy plugins.json content instead of faking the copy 2018-01-12 16:41:59 +01:00
Aurelsicoko
cc455ee309 Only try to require configuration server when there is an app 2018-01-12 14:53:20 +01:00
Aurelsicoko
8d0a8379d0 Update path generation for admin and plugins 2018-01-12 14:46:02 +01:00
cyril lopez
1445dc0aa5 Fix redirect route 2018-01-12 14:03:30 +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
cyril lopez
c9a07da1e8 Check user token validity when receiving a 401 && set jwt expiration date 2018-01-11 15:59:00 +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
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
Aurelsicoko
6916134ee1 Update setup script to deploy and index.html rewrite 2018-01-08 16:34:41 +01:00
Aurelsicoko
c9d47b1fed Retrieve plugins' icons URL from API and name Redux store 2018-01-05 16:19:53 +01:00
Aurelsicoko
86fa933f5e Reorder documentation guide and fix CSS 2018-01-05 11:45:29 +01:00
Aurelsicoko
f6e3ab661e Improve plugin installation 2018-01-04 16:03:34 +01:00
cyril lopez
d616a4f7b6 Install plugin on port 1337 2017-12-20 11:23:50 +01:00
cyril lopez
f0ffee869e Update branch 
Merge branch 'relation/users' of github.com:strapi/strapi into relation/users
 2017-12-18 12:07:22 +01:00
cyril lopez
cbe4202742 Add tab nav to popuprelation 2017-12-18 12:05:52 +01:00
Aurelsicoko
1f989d8537 Remove capitalize on button too 2017-12-18 12:02:05 +01:00
Aurelsicoko
c6a1dcf5cd Only uppercase first letter of labels 2017-12-18 11:57:09 +01:00
cyril lopez
f43d7e75cc Update branch 
Merge branch 'master' of github.com:strapi/strapi into install-plugins
 2017-12-16 14:57:19 +01:00
cyril lopez
9fe1480a26 Created OverlayBlocker that prevents any action on the app and add download plugin dynamic 2017-12-12 19:53:04 +01:00
Aurelsicoko
628ad4add4 Fix strapi-bookshelf to work w/ associations w/ plugins & JWT condition 2017-12-12 16:14:38 +01:00