Andreas Pfurtscheller
|
9634962a78
|
Merge branch 'master' into patch-1
|
2020-01-22 22:49:00 +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 |
|
Batuhan Kök
|
2d0ac17c34
|
Turkish translations updated
Signed-off-by: Batuhan Kök <batuhankok@gmail.com>
|
2020-01-22 23:21:27 +03:00 |
|
Alexandre BODIN
|
5cfc584e63
|
Merge pull request #5058 from strapi/fix/dz-delete-mongo-issue
Fix mongoose dz delete query
|
2020-01-22 19:34:42 +01:00 |
|
virginieky
|
823eb32046
|
Merge branch 'master' into front/users-permissions
|
2020-01-22 18:22:36 +01:00 |
|
Virginie Ky
|
c38285a4e1
|
clean
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-22 18:20:45 +01:00 |
|
Virginie Ky
|
ab85b7642e
|
Merge branch 'webhooks/tests' of github.com:strapi/strapi into webhooks/tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-22 18:11:12 +01:00 |
|
Alexandre BODIN
|
11582918b4
|
Merge branch 'master' into fix/dz-delete-mongo-issue
|
2020-01-22 18:04:43 +01:00 |
|
Alexandre Bodin
|
77e5b8233d
|
Fix mongoose dz delete query
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
|
2020-01-22 17:54:59 +01:00 |
|
Virginie Ky
|
22fa1a963a
|
snapshots
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-22 17:47:09 +01:00 |
|
cyril lopez
|
51c33144c6
|
Merge branch 'master' into webhooks/tests
|
2020-01-22 17:26:29 +01:00 |
|
virginieky
|
b4a04724cd
|
Merge pull request #5042 from strapi/webhooks/leftmenu-scrollbar
Helper-plugin Leftmenu scrollbar
|
2020-01-22 15:34:43 +01:00 |
|
Alexandre BODIN
|
9fdf3b170f
|
Merge pull request #5052 from strapi/single-types/generate-single-type-api
generate single type api routes
|
2020-01-22 15:03:10 +01:00 |
|
Alexandre Bodin
|
0528827b5f
|
Remove unwanted code
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
|
2020-01-22 14:32:58 +01:00 |
|
virginieky
|
a501cc817d
|
Merge branch 'master' into webhooks/leftmenu-scrollbar
|
2020-01-22 14:28:41 +01:00 |
|
soupette
|
0632698912
|
Merge branch 'master' of github.com:strapi/strapi into fix/5038
|
2020-01-22 12:14:53 +01:00 |
|
soupette
|
a9c9549458
|
Fixes #5038
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-22 12:14:17 +01:00 |
|
Alexandre Bodin
|
929eea0f55
|
Merge branch 'features/single-types' into single-types/generate-single-type-api
|
2020-01-22 12:05:57 +01:00 |
|
Alexandre Bodin
|
7a9c481d59
|
Merge branch 'develop' into features/single-types
|
2020-01-22 12:05:46 +01:00 |
|
Alexandre Bodin
|
7392d7f573
|
Merge branch 'master' of github.com:strapi/strapi
|
2020-01-22 12:04:57 +01:00 |
|
Alexandre Bodin
|
be97c8b4f0
|
Allow codecov comments on master and develop
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
|
2020-01-22 12:04:46 +01:00 |
|
Alexandre Bodin
|
958db137df
|
Generate route.json based on content type kind
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
|
2020-01-22 11:29:37 +01:00 |
|
Alexandre Bodin
|
8afc962df1
|
Support generate api inside of other api
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
|
2020-01-22 10:51:33 +01:00 |
|
cyril lopez
|
27c3cf7a91
|
Merge pull request #4995 from strapi/chore/ctb-front-end-tests
Chore/ctb front end tests
|
2020-01-22 10:51:28 +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 |
|
virginieky
|
941f14a074
|
Merge pull request #5039 from strapi/chore/eslint-config-front
Improve eslint configuration for front-end files
|
2020-01-22 10:06:55 +01:00 |
|
DaiAoki
|
d868233003
|
fix quick-start-tutorial.md document.
Signed-off-by: DaiAoki <a.dai.0814ap@gmail.com>
|
2020-01-22 09:25:32 +09:00 |
|
Andreas Pfurtscheller
|
aff59ab0d0
|
Fix production.html
Remove supposedly misplaced script tag
Signed-off-by: Andreas Pfurtscheller <andreas.pfurtscheller@penflock.com>
|
2020-01-21 23:34:28 +01:00 |
|
soupette
|
d0c3a0ddb7
|
Merge branch 'chore/eslint-config-front' of github.com:strapi/strapi into chore/eslint-config-front
|
2020-01-21 18:36:20 +01:00 |
|
soupette
|
489c7b2324
|
Fix lint
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-21 18:34:27 +01:00 |
|
Virginie Ky
|
bfbfb36b5a
|
webhooks leftmenu scrollbar
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-21 18:18:28 +01:00 |
|
Virginie Ky
|
2dd1107a6a
|
scrollbar ui
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-21 18:17:21 +01:00 |
|
virginieky
|
221fbbcb3c
|
Merge branch 'master' into webhooks/tests
|
2020-01-21 18:15:44 +01:00 |
|
cyril lopez
|
b5f2824f6d
|
Merge branch 'master' into chore/eslint-config-front
|
2020-01-21 18:00:52 +01:00 |
|
cyril lopez
|
2220faef2b
|
Merge pull request #5040 from strapi/fix/date-display
Fix timestamp display
|
2020-01-21 18:00:28 +01:00 |
|
soupette
|
cd03d672c2
|
Fix lint
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-21 17:53:21 +01:00 |
|
Virginie Ky
|
00b664ea61
|
headersInput tests
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-21 17:29:39 +01:00 |
|
cyril lopez
|
a6ac47afd9
|
Merge branch 'master' into chore/ctb-front-end-tests
|
2020-01-21 17:24:27 +01:00 |
|
soupette
|
ca1e82337c
|
Fixes #5019
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-21 17:09:03 +01:00 |
|
soupette
|
c2f238fabc
|
Add new line before if rule
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-21 16:44:57 +01:00 |
|
soupette
|
eb00b7e0ea
|
Add newline-before-return rule
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-21 16:31:05 +01:00 |
|
soupette
|
2a4351794b
|
Fix lint webhooks
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-21 16:25:14 +01:00 |
|
soupette
|
b3ba8c27ef
|
Fix conflicts
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-21 16:12:46 +01:00 |
|
Virginie Ky
|
dfd6c51ca8
|
Merge branch 'master' of github.com:strapi/strapi into webhooks/tests
|
2020-01-21 16:06:28 +01:00 |
|
Virginie Ky
|
06d05014bd
|
headersinput tests ip
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-21 16:06:05 +01:00 |
|
soupette
|
f50f89f0a8
|
Update eslint configuration
Signed-off-by: soupette <cyril.lpz@gmail.com>
|
2020-01-21 16:03:31 +01:00 |
|
Virginie Ky
|
b176ee3589
|
EditView and ListView reducers
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
|
2020-01-21 15:50:31 +01:00 |
|
Alexandre Bodin
|
2ee13c0a12
|
v3.0.0-beta.18.5
v3.0.0-beta.18.5
|
2020-01-21 15:44:44 +01:00 |
|
Alexandre BODIN
|
23f7af19f6
|
Merge pull request #5015 from adcar/patch-1
Fix typo invalid date format
|
2020-01-21 15:16:37 +01:00 |
|