Alexandre Bodin
|
de9521ce6b
|
Merge branch 'develop' into features/single-types
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
|
2020-02-10 21:09:50 +01:00 |
|
Alexandre Bodin
|
8a970562c9
|
Merge branch 'master' into develop
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
|
2020-02-10 19:15:20 +01:00 |
|
Jim LAURIE
|
015b4a5e23
|
Merge branch 'master' into fix/findUserByProvider
|
2020-02-07 10:10:30 +01:00 |
|
Jim LAURIE
|
638ddd201e
|
Merge branch 'master' into update-zh-hans-translations
|
2020-02-07 09:56:09 +01:00 |
|
Fredrik Söderquist
|
52e6d33f0e
|
Match provider when logging in, to make sure the right user is found
Signed-off-by: Fredrik Söderquist <fregu808@gmail.com>
|
2020-02-06 21:14:36 +01:00 |
|
cyril lopez
|
8745d2373a
|
Merge branch 'master' into feat/update-pl-translations
|
2020-02-06 14:39:05 +01:00 |
|
HichamELBSI
|
6fff7fcf46
|
Merge branch 'develop' into features/single-types
|
2020-02-06 14:11:44 +01:00 |
|
HichamELBSI
|
98871fcb46
|
Merge branch 'develop' into features/single-types
|
2020-02-05 16:41:30 +01:00 |
|
ruibaby
|
ff489ce051
|
feat: updated zh-Hans translations.
Signed-off-by: ruibaby <i@ryanc.cc>
|
2020-02-04 15:55:02 +08:00 |
|
soupette
|
3473143813
|
Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-31 17:14:24 +01:00 |
|
Virginie Ky
|
bb9ff9e47a
|
Merge branch 'master' into develop
|
2020-01-31 15:10:07 +01:00 |
|
Alexandre Bodin
|
761ad68392
|
v3.0.0-beta.18.7
|
2020-01-30 16:15:25 +01:00 |
|
soupette
|
a49d696c51
|
Fix routing and menu highlight
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-30 12:32:29 +01:00 |
|
soupette
|
144d07cdbe
|
Improve plugin left menu for trads and enable settings api
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-30 11:50:34 +01:00 |
|
Alexandre Bodin
|
576279626b
|
Merge branch 'develop' into features/single-types
|
2020-01-29 11:59:53 +01:00 |
|
Alexandre Bodin
|
b999bea3a9
|
Merge branch 'master' into develop
|
2020-01-29 11:59:41 +01:00 |
|
Virginie Ky
|
4ff189ac00
|
Merge branch 'master' into develop
|
2020-01-29 11:35:55 +01:00 |
|
Hicham EL ABBASSI
|
81c5537d7f
|
Merge branch 'develop' into features/single-types
|
2020-01-29 10:09:46 +01:00 |
|
Alexandre Bodin
|
4f5a0e7679
|
Cleanup eslint configs
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
|
2020-01-27 10:49:57 +01:00 |
|
soupette
|
96e092b300
|
Change the way we load plugins
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-23 16:46:50 +01:00 |
|
Alexandre Bodin
|
1106c07795
|
v3.0.0-beta.18.6
|
2020-01-23 08:13:13 +01:00 |
|
Mariusz Wachowski
|
4e5326490e
|
feat: updated pl translations
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
|
2020-01-22 21:54:08 +01:00 |
|
Alexandre Bodin
|
7a9c481d59
|
Merge branch 'develop' into features/single-types
|
2020-01-22 12:05:46 +01:00 |
|
Alexandre Bodin
|
9c96b180fe
|
Merge branch 'develop' into features/single-types
|
2020-01-22 10:39:42 +01:00 |
|
soupette
|
be64adaa1c
|
Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-22 10:29:36 +01:00 |
|
soupette
|
b3ba8c27ef
|
Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-21 16:12:46 +01:00 |
|
Alexandre Bodin
|
2ee13c0a12
|
v3.0.0-beta.18.5
|
2020-01-21 15:44:44 +01:00 |
|
Alexandre BODIN
|
bab82c864c
|
Merge branch 'master' into strapi-thomb-upgrade-purest
|
2020-01-21 14:26:51 +01:00 |
|
Alexandre Bodin
|
dce6bd432c
|
Merge branch 'develop' into features/single-types
|
2020-01-21 11:46:26 +01:00 |
|
soupette
|
6c27d224f2
|
Add eslint config
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-21 11:33:43 +01:00 |
|
Alexandre BODIN
|
4bebeb7d6d
|
Merge branch 'master' into master
|
2020-01-21 10:39:37 +01:00 |
|
Jim LAURIE
|
8027b135e1
|
fix: fix get role via graphql
Find one role issue due to params sharing in the GraphQL schema.
fix #5013
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
|
2020-01-20 17:00:20 +01:00 |
|
nurikabe
|
4ab268b134
|
RFC-822 doesn't require double quotes around the descriptive name in an email address
|
2020-01-18 16:39:27 -05: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 |
|
Fredrik Söderquist
|
21bbbbcfe8
|
Merge branch 'master' into fix/readCallbackProvider
|
2020-01-15 11:25:12 +01:00 |
|
Fredrik Söderquist
|
47a3a20654
|
remove querystring from ctx.path when reading provider
|
2020-01-15 11:18:12 +01:00 |
|
Alexandre BODIN
|
d04e5558e2
|
Merge branch 'master' into strapi-thomb-upgrade-purest
|
2020-01-14 11:53:52 +01:00 |
|
Alexandre BODIN
|
d11b1ba4a5
|
Merge branch 'master' into patch-1
|
2020-01-13 11:29:47 +01:00 |
|
nurikabe
|
3c38fc33bf
|
Remove soft hyphen (U+00AD) from reset password email subject line
|
2020-01-11 11:29:24 -05:00 |
|
virginieky
|
50643f94b3
|
Merge branch 'master' into chore/eslint-config
|
2020-01-10 17:44:43 +01:00 |
|
slackr
|
89675409ba
|
fix error reply text
|
2020-01-10 07:40:17 -05:00 |
|
Thomas Baxter
|
37dbd955e2
|
feat(purest): upgrading purest to 3.x
|
2020-01-08 12:55:16 -05:00 |
|
Jim LAURIE
|
df1fed99ec
|
docs: update copyright date to 2020
|
2020-01-08 15:41:08 +01:00 |
|
soupette
|
c62dad2140
|
Improve eslint config fron front-end files
|
2020-01-08 12:21:47 +01:00 |
|
Thomas Baxter
|
65482537dd
|
chore(deps): initial commit of upgrade to purest
|
2020-01-07 14:24:39 -05:00 |
|
Jaroslav Vrána
|
0215f64648
|
Merge branch 'master' into feature/adminTranslationCs
|
2020-01-07 19:32:32 +01:00 |
|
Alexandre Bodin
|
f0028241c8
|
v3.0.0-beta.18.4
|
2020-01-07 17:00:28 +01:00 |
|
Jozef Cipa
|
61972f6292
|
Merge branch 'master' into feature/slovak-translations
|
2020-01-06 18:22:48 +01:00 |
|
Alexandre BODIN
|
089c2cd189
|
Merge branch 'master' into fix-2963
|
2020-01-06 15:50:17 +01:00 |
|
profispojka
|
2c9b8283b3
|
Update cs.json
|
2020-01-05 16:04:00 +01:00 |
|