72 Commits

Author SHA1 Message Date
Pierre Noël
57d7d876b7
Fix/#4513/ability to use a sub path behind a proxy (#5833)
* add possibility to use strapi on a non-root base url path

* fix documentation password form

* use server.url and admin.url in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update doc proxy

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* move server.url location in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* add possibility to put relative urls

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* allow '/' as an admin url + refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update yarn.lock

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove default proxy option

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* fix github provider

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* fix github login

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove files that should be here

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-08 13:50:00 +02:00
Alexandre Bodin
2e31afe6dd Upgrade doc to use env var and js config files
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-04-29 11:06:43 +02:00
Alexandre Bodin
5595f6ca94 Add policy loader
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-04-29 11:06:36 +02:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-03-02 15:18:08 +01:00
Alexandre Bodin
d1600dec21 Fix user-permissions bootstrap issue
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-01-16 16:56:14 +01:00
nurikabe
3c38fc33bf Remove soft hyphen (U+00AD) from reset password email subject line 2020-01-11 11:29:24 -05:00
Jim LAURIE
e5456da8eb
Merge branch 'master' into master 2019-12-23 11:04:29 +01:00
Sulakin Vadim
406dec145e
Update bootstrap.js 2019-12-18 08:23:54 +03:00
Sulakin Vadim
fc6ac8e231 add vk 2019-12-06 01:38:06 +03:00
Virginie Ky
ef66c9ccb8 Icon from db 2019-11-25 17:08:30 +01:00
Virginie Ky
11ccb5e7f3 Dynamic zone edit view ui 2019-11-20 17:46:53 +01:00
Alexandre BODIN
c69e3fd042
Merge branch 'master' into fix/forgot-password-url 2019-10-15 12:17:00 +02:00
Alexandre BODIN
656343d059
Disable reload on jwt.json creation (#4246) 2019-10-14 10:49:19 +02:00
Jim LAURIE
9b49bee4b4 Fix #549 forgot password url 2019-10-09 17:37:16 +02:00
Natalia Tsvetkova
92f00de254 Merge branch 'master' into feature/instagram_provider 2019-09-09 14:59:21 +02:00
Natalia Tsvetkova
6a3409891c Added instagram social auth provider 2019-09-06 09:19:23 +02:00
Alexandre Bodin
3b47457f4f make boostrap functions async only 2019-08-12 15:35:40 +02:00
Alexandre Bodin
eb7c4534f8 Exports schema.graphql in devmode, load extensions folder and run merge config and overwrites 2019-04-16 09:00:24 +02:00
DMehaffy
56de235297 Modify template for english 2018-08-27 08:11:23 -07:00
Jim LAURIE
7fdccc62ee PR feedback 2018-08-23 18:28:13 +02:00
Aurélien GEORGET
e8b7bd478a
Update bootstrap.js 2018-08-23 12:00:46 +02:00
Jim LAURIE
f27b2ae2f6
Merge branch 'master' into email-validation 2018-08-21 11:54:22 +02:00
Jim LAURIE
eec423a2cd Add confirmation email 2018-08-08 17:57:02 +02:00
David Thomas
27c88e3a1a
Merge branch 'master' into auth-microsoft 2018-08-05 12:20:05 -04:00
Jim LAURIE
44b3ae5f05
Update discord icon 2018-07-31 16:17:41 +02:00
DMehaffy
b8adba1e23 Finish adding Discord to Providers.js
Thanks to synth3tk for your help!

Note that with Discord the username is not unique so I combined the username and discriminator in order to store a unique "username"
2018-07-29 17:43:45 -07:00
DMehaffy
4c64168cda Add base structure for discord 2018-07-23 05:07:17 -07:00
David Thomas
06b741f322 Add Microsoft auth provider
Closes #1385
2018-07-22 22:03:29 -04:00
Jim Laurie
4fe7b6176e Fix conflicts & lint 2018-05-16 12:07:02 +02:00
Aurelsicoko
02a2e087cc Remove warning where clause 2018-05-09 15:11:55 +02:00
Jim LAURIE
c09f5138a2
Merge branch 'master' into eslint 2018-05-07 16:03:35 +02:00
soupette
68504fbe16 Add eslint to users-permissions backend 2018-04-30 18:26:56 +02:00
soupette
611dfb32eb Merge branch 'master' of github.com:strapi/strapi into sql-xp 2018-04-26 10:26:09 +02:00
Jim LAURIE
d94be998a4
Fix prevGrantConfig equal undefined when config not exist in db 2018-04-25 14:12:24 +02:00
Jim Laurie
8d2a46cd0c Fix conflict timestamp 2018-04-25 11:06:12 +02:00
Zhuang
d23ebfeaf0 merge the previous provider config 2018-04-24 22:18:21 +08:00
Jim Laurie
79ddc27cb1 U&P setup in bookshelf and handle oneToMany relation 2018-04-24 14:29:28 +02:00
Zhuang
e69dcc433b reload grant value to db when add/delete provider 2018-04-21 12:29:00 +08:00
Jim LAURIE
ab238dca61
Remove space 2018-04-16 09:48:43 +02:00
cece95
32aefbe5be fixed issue #923 2018-04-16 08:49:41 +02:00
Jim Laurie
489aefba06 Rename role registered to authenticated 2018-03-14 16:56:12 +01:00
Jim Laurie
9b7a216411 Add default role in advanced settings 2018-03-12 15:56:25 +01:00
Jim Laurie
957e7a08cb Environment agnostic for users-permissions configs 2018-02-13 15:04:21 +01:00
Jim Laurie
244b280919 New format store constructor
strapi.store(source).get(params)
strapi.store(source).set({params, value})

Co-authored-by: Aurelsicoko <aurelsicoko@gmail.com>
2018-02-06 13:10:43 +01:00
Jim Laurie
29af75cc51 Use database config for users-permissions plugin
Delete advanced, grant and email json files
Update setter to update data
2018-02-01 18:12:38 +01:00
cyril lopez
54a4f33371
Merge branch 'master' into fix/users-front 2018-01-26 17:37:01 +01:00
cyril lopez
6e23c90434 Fix css and wording
As seen in the demo I removed the test transform capitalize in the ListRow component.
Add width to the iconContainer so it s now perfectly aligned.
Add missing trad key and change wording for the toggle label
2018-01-26 17:31:52 +01:00
Jim Laurie
7f78cc9f84 Change data format email template 2018-01-26 10:18:36 +01:00
Aurelsicoko
1ac6a56ce0 Resolve conflicts 2018-01-25 15:26:25 +01:00
Aurelsicoko
fc21d5f30a Resolve conflicts 2018-01-25 13:25:09 +01:00