cyril lopez
|
41eba07f21
|
etup
|
2018-01-17 10:36:25 +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 |
|
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 |
|
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 |
|
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 |
|
Aurelsicoko
|
4b39785a8a
|
Copy plugins.json content instead of faking the copy
|
2018-01-12 16:41:59 +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 |
|
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 |
|
Aurelsicoko
|
216a1b3bbb
|
Remove host configuration in admin build
|
2018-01-12 11:38:03 +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
|
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 |
|
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 |
|