yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-14 03:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 117 Branches 489 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jim LAURIE
cd44524cdf
Merge pull request #441 from strapi/fix-auth-redirect-route 
Fix redirect route
 2018-01-12 15:24:22 +01:00
Jim Laurie
6e44e2e274 Add provider connection 2018-01-12 15:20:13 +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
7ae1cc944e Freeze app when add/modifying a field in ctb 2018-01-12 14:42:47 +01:00
cyril lopez
696fe5b836 Add OverlayBlocker to ctb when deleting a model 2018-01-12 14:17:29 +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
4dabad9c65 Add server restart watcher to ctb when deleting content type 2018-01-12 10:56:16 +01:00
Jim LAURIE
5834090a71
Merge pull request #440 from fixerror/master 
fix bug
 2018-01-12 09:14:27 +01:00
FixError
c5bb2da0a4 fix bug 
(const variable is assigned it cannot be assigned again and an attempt to do so will throw an error)
 2018-01-12 00:58:34 +02:00
Aurelsicoko
109d2ca6b0 Use build backend URL to load plugins from origin 2018-01-11 17:49:11 +01:00
cyril lopez
a347456aba
Merge branch 'master' into add-documentation 2018-01-11 17:49:07 +01:00
cyril lopez
267c4e1675
Merge pull request #439 from strapi/verify/user-jwtToken 
Verify/user jwt token
 2018-01-11 17:42:43 +01:00
cyril lopez
5d470d890d Update branch 
Merge branch 'master' of https://github.com/strapi/strapi into verify/user-jwtToken
 2018-01-11 17:28:08 +01:00
cyril lopez
310f7b4b68 Rename setHasUserPlugin function 2018-01-11 17:26:46 +01:00
cyril lopez
1a07c2caad Enable /user/me route for guest users 2018-01-11 17:13:09 +01:00
Aurelsicoko
e3c0ff6fc5 Add shelljs as dependency 2018-01-11 16:38:20 +01:00
cyril lopez
2af14f24c5 Throw error when trying to get /user/me with no headers 2018-01-11 16:24:16 +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
Jim LAURIE
b690951b65
Merge pull request #416 from strapi/user-schema-logs 
Add logs if missing things in user table
 2018-01-11 15:48:58 +01:00
Aurelsicoko
cc72b9055f Enhance the way the source path are generated 2018-01-11 15:48:05 +01:00
Jim LAURIE
09e7f0fc67
Merge branch 'master' into user-schema-logs 2018-01-11 15:01:47 +01:00
Jim Laurie
f545f373aa Fix PR feedback 2018-01-11 15:00:34 +01:00
Jim LAURIE
99316e42d5
Merge pull request #420 from strapi/database-setup 
Form to configure database connection
 2018-01-11 14:28:36 +01:00
cyril lopez
25c8aa66de Add helpers in documentation 2018-01-11 14:23:44 +01:00
Jim Laurie
054df448a9 Merge branch 'user-schema-logs' of github.com:strapi/strapi into user-schema-logs 2018-01-11 13:44:25 +01:00
Jim LAURIE
7abcca01fa
Merge branch 'master' into database-setup 2018-01-11 13:44:05 +01:00
Jim LAURIE
e40d36ac7c
Merge pull request #435 from lucaperret/master 
feat(plugin-users-permissions): add endpoint to fetch authenticated user model
 2018-01-11 13:25:43 +01:00
Jim Laurie
99346d41fc Use Path resolver for connectivity script 2018-01-11 13:22:49 +01:00
Aurélien GEORGET
486e49b4b2
Merge branch 'master' into master 2018-01-11 10:40:45 +01:00