yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-11 10:18:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 114 Branches 488 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Aurélien GEORGET
dedc5db56b
Merge pull request #434 from strapi/enhancement/middlewares 
Update middleware dependencies and remove unnecessary convert
 2018-01-11 10:39:00 +01:00
Aurélien GEORGET
d38b2bb03d
Merge branch 'master' into enhancement/middlewares 2018-01-11 10:24:17 +01:00
Aurelsicoko
5eea65b4cc Merge branch 'fix/deploy' of github.com:strapi/strapi into fix/deploy 2018-01-11 10:13:14 +01:00
Aurelsicoko
4826689ef8 Add comma 2018-01-11 10:12:27 +01:00
Luca Perret
7cf77a9d57 fix(plugin-users-permissions): Config layout - 
Duplicate key email
 2018-01-11 00:23:28 +01:00
Luca Perret
5035170424 feat(plugin-users-permissions): add /user/me to fetch authenticated user model 2018-01-10 20:29:34 +01:00
Luca Perret
d877440862 typo(plugin-users-permissions): useless curly brace 2018-01-10 20:28:05 +01:00
cyril lopez
05fe3e16c7 Fix paths 2018-01-10 18:48:35 +01:00
Aurélien GEORGET
bcb7a68dde
Merge branch 'master' into fix/deploy 2018-01-10 18:27:52 +01:00
Aurélien GEORGET
07447c2879
Merge pull request #421 from strapi/install-plugins 
Install plugin from the administration panel
 2018-01-10 18:27:35 +01:00
Aurelsicoko
b8b9d75d58 Merge branch 'master' of github.com:strapi/strapi into install-plugins 2018-01-10 18:14:16 +01:00
Jim Laurie
4e1fe20531 Merge branch 'database-setup' of github.com:strapi/strapi into database-setup 2018-01-10 18:10:20 +01:00
Jim Laurie
df5b9f3dab Change wording 2018-01-10 18:08:43 +01:00
Jim LAURIE
35cb6e6194
Merge branch 'master' into database-setup 2018-01-10 17:42:31 +01:00
Aurélien GEORGET
d55133cf57
Merge branch 'master' into fix/deploy 2018-01-10 17:38:55 +01:00
Jim LAURIE
b0d3b392c1
Merge pull request #433 from strapi/improve/doc-plugin 
Improve/doc plugin
 2018-01-10 17:29:35 +01:00
Aurélien GEORGET
43296d72aa
Merge branch 'master' into improve/doc-plugin 2018-01-10 17:09:12 +01:00
Aurelsicoko
b0fc115cd7 Use i18n when there is no description available for a plugin 2018-01-10 16:55:12 +01:00
Jim Laurie
b17d1a29b2 Fix symlink to strapi module for strapi-bookshelf 2018-01-10 16:52:32 +01:00
Aurélien GEORGET
8d68215f4e
Merge branch 'master' into fix/deploy 2018-01-10 15:49:47 +01:00
Aurelsicoko
69ef0fa871 Fix CI 2018-01-10 15:38:28 +01:00
Jim Laurie
e1fb02ab53 Test connection in connector node module 2018-01-10 15:31:54 +01:00
Jim Laurie
9ace21f210 Fix connection functions 2018-01-10 15:05:02 +01:00
Jim Laurie
bf7daaf99a Reorder promises 2018-01-10 14:45:32 +01:00
Jim LAURIE
bcb6587f93
Merge pull request #430 from strapi/fix/ctb-no-model-api 
Fix/ctb no model api
 2018-01-10 14:11:08 +01:00
Aurélien GEORGET
79b2635019
Merge branch 'master' into fix/ctb-no-model-api 2018-01-10 13:58:20 +01:00