yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-27 10:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 116 Branches 490 Tags
Commit Graph

9273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
e90f0b5858
Merge pull request #457 from strapi/fix/connectivity-data-path 
Fix data path in connectivity functions
 2018-01-17 12:16:17 +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
Jim Laurie
da0789a890 Merge branch 'fix/connectivity-data-path' of github.com:strapi/strapi into fix/connectivity-data-path 2018-01-17 11:39:36 +01:00
Jim Laurie
acb17bc5ca Relaunch travis build 2018-01-17 11:39:22 +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
8222a30d98 Fix doc typos 2018-01-17 10:46:29 +01:00
cyril lopez
8866354d9c Update branch 
Merge branch 'master' of github.com:strapi/strapi into add-documentation
 2018-01-17 10:39:26 +01:00
cyril lopez
41eba07f21 etup 2018-01-17 10:36:25 +01:00
Jim LAURIE
d0d80b62e4
Fix missing dot 2018-01-17 10:13:23 +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
Aurelsicoko
b04a495bc4 Prefix plugin global name 2018-01-16 17:54:35 +01:00
cyril lopez
49cf60f477 Fix popUpWarning design 2018-01-16 17:35:45 +01:00
Jim LAURIE
696368815c
Merge pull request #431 from strapi/fix/deploy 
Fix/deploy
 2018-01-16 16:59:25 +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
b6d4dbf16e Remove https from documentation examples 2018-01-16 16:00:52 +01:00
cyril lopez
451500b434
Merge pull request #448 from strapi/fix/install-plugin 
Fix install plugin page
 2018-01-16 10:46:05 +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
Aurélien GEORGET
ec08c22aef
Merge branch 'master' into fix/install-plugin 2018-01-15 18:18:36 +01:00
Jim LAURIE
96050824f1
Merge pull request #447 from acifer/patch-1 
Update and rename authentification.md to authentication.md
 2018-01-15 18:02:56 +01:00
Jim Laurie
1bcae6c73e Add unique email restriction on provider and local register 2018-01-15 17:58:11 +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
acifer
b713866ea1
Update and rename authentification.md to authentication.md 2018-01-15 16:41:42 +01:00
Jim Laurie
1b2897bd83 Get and update advanced settings 2018-01-15 16:23:54 +01:00
Jim Laurie
072dc10137 Add registration restriction on provider and local register 2018-01-15 15:19:59 +01:00
Jim Laurie
02a89fbb5b Generate advanced configs 2018-01-15 15:01:21 +01:00
Jim Laurie
3a9cb9b453 Use email templte config reset password 2018-01-15 14:50:53 +01:00
Aurelsicoko
247caae4b4 Omit publicPath and update publicPath on the fly 2018-01-15 14:31:04 +01:00
Jim Laurie
7ab44d4b0f Update email template config 2018-01-15 12:05:01 +01:00
Jim Laurie
24d5a5116f Get email template 2018-01-15 11:59:10 +01:00
cyril lopez
950d020082 Add overlay blocker to user plugin when creating/updating a role 2018-01-15 11:36:48 +01:00
Aurelsicoko
16c253a846 Fix Travis 2018-01-15 11:31:19 +01:00
Jim Laurie
eb64d8fe7d Create email template config file 2018-01-15 11:29:38 +01:00
cyril lopez
17fd135ac1 Add overlayBlocker when deleting a role in users plugin 2018-01-15 11:28:43 +01:00
cyril lopez
c838b90e21 Add serverRestart to users-permissions 2018-01-15 11:07:40 +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
cyril lopez
977a79eaff Fix up plugin required props error 2018-01-12 17:50:18 +01:00
cyril lopez
e49ae84b97 Add OverlayBlocker to stm 2018-01-12 17:35:00 +01:00
cyril lopez
967f3e6725 Add OverlayBlocker in all actions that require restart server in ctb, comment ModelPage willUpdate lifecycle that redirects the user to /404 when updating a content type name 2018-01-12 17:20:19 +01:00
Aurelsicoko
4b39785a8a Copy plugins.json content instead of faking the copy 2018-01-12 16:41:59 +01:00
Jim Laurie
82d85d781c Fix grant file creation 2018-01-12 16:07:21 +01:00
Jim Laurie
1eb7b12934 Omit grant.json config file 2018-01-12 16:04:01 +01:00
Jim Laurie
aa9b1214a5 Add documentation 2018-01-12 15:48:14 +01:00