2651 Commits

Author SHA1 Message Date
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
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
cd44524cdf
Merge pull request #441 from strapi/fix-auth-redirect-route
Fix redirect route
2018-01-12 15:24:22 +01:00
cyril lopez
1445dc0aa5 Fix redirect route 2018-01-12 14:03:30 +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
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
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
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
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
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
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
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
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
Jim LAURIE
7ea9fdf6f4
Merge pull request #428 from strapi/fix/language-api
Authorize config files name as API fix #417
2018-01-10 13:55:15 +01:00
Jim LAURIE
502b101598
Fix PR feedback 2018-01-10 13:39:42 +01:00
cyril lopez
6d71241275 Update branch
Merge branch 'improve/doc-plugin' of https://github.com/strapi/strapi into improve/doc-plugin
2018-01-10 13:36:38 +01:00
cyril lopez
7a1249f890 Fix typo 2018-01-10 13:36:24 +01:00
Aurélien GEORGET
1d8bd57006
Merge branch 'master' into fix/language-api 2018-01-10 13:34:33 +01:00
Aurélien GEORGET
7c2ab6eea5
Merge branch 'master' into fix/ctb-no-model-api 2018-01-10 13:29:26 +01:00
Aurélien GEORGET
f1d755c7fc
Update quick-start.md 2018-01-10 13:14:45 +01:00