Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6910c43
Merge pull request #1533 from RedisInsight/release/2.16.0
vlad-dargel Dec 28, 2022
7d99036
Merge pull request #1665 from RedisInsight/bugfix/RI-4127_Flatpak_bui…
egor-zalenski Jan 31, 2023
b3248fc
Merge pull request #1668 from RedisInsight/main
vlad-dargel Jan 31, 2023
7220f71
Merge pull request #1670 from RedisInsight/release/2.18.0
vlad-dargel Jan 31, 2023
3626099
Merge pull request #1800 from RedisInsight/main
vlad-dargel Mar 1, 2023
89c16ac
Merge pull request #1801 from RedisInsight/release/2.20.0
vlad-dargel Mar 1, 2023
773d698
disable ssh tests
Mar 1, 2023
2822aa6
Merge pull request #1802 from RedisInsight/fix-latest
Mar 1, 2023
b10353e
create 2.24
vlad-dargel Mar 30, 2023
1b3dd89
Merge pull request #1890 from RedisInsight/release/2.22.0
vlad-dargel Mar 30, 2023
1491cdd
Merge pull request #1892 from RedisInsight/release/2.22.0
vlad-dargel Mar 30, 2023
7537054
Merge pull request #1894 from RedisInsight/release/2.22.1
vlad-dargel Mar 30, 2023
8ecd86c
Merge pull request #1896 from RedisInsight/release/2.22.1
vlad-dargel Mar 30, 2023
d47776b
Merge branch 'main' into release/2.24.0
vlad-dargel Apr 24, 2023
ab65041
Merge pull request #2006 from RedisInsight/feature/main-into-release-…
vlad-dargel Apr 24, 2023
6c65a69
Merge branch 'main' into feature/update-bundle-version
vlad-dargel Apr 26, 2023
571dcb3
update bundle version
vlad-dargel Apr 26, 2023
ba6a660
Merge pull request #2016 from RedisInsight/feature/update-bundle-version
vlad-dargel Apr 26, 2023
a0214e4
fixes for tests
vlad-dargel Apr 27, 2023
6c6c2d3
Merge pull request #2017 from RedisInsight/e2e/bugfix/fixes-tests
vlad-dargel Apr 27, 2023
77f49aa
update bundle
vlad-dargel Apr 27, 2023
9d785cc
Merge pull request #2020 from RedisInsight/feature/update-xcode
vlad-dargel Apr 27, 2023
d43cfb6
Updated config.yml
egor-zalenski Apr 27, 2023
852055f
Merge pull request #2023 from RedisInsight/build/extra_mac_resources
vlad-dargel Apr 27, 2023
c95baaf
update bundle
vlad-dargel Apr 27, 2023
5a22fb0
Merge pull request #2026 from RedisInsight/feature/update-bundle-to-r…
vlad-dargel Apr 27, 2023
a09731a
Merge pull request #2025 from RedisInsight/release/2.24.0
vlad-dargel Apr 27, 2023
9d0df8e
stick to electron: 19.0.7 since 19.1.9 has vulnerability
Apr 28, 2023
c779dad
Merge pull request #2030 from RedisInsight/fix/vulnerability-issue
Apr 28, 2023
a0a881f
Merge pull request #2033 from RedisInsight/latest
vlad-dargel Apr 28, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ aliases:
- mods-preview # OSS Standalone and all preview modules
- oss-st-6-tls # OSS Standalone v6 with TLS enabled
- oss-st-6-tls-auth # OSS Standalone v6 with TLS auth required
- oss-st-6-tls-auth-ssh # OSS Standalone v6 with TLS auth required through ssh
# - oss-st-6-tls-auth-ssh # OSS Standalone v6 with TLS auth required through ssh
- oss-clu # OSS Cluster
- oss-clu-tls # OSS Cluster with TLS enabled
- oss-sent # OSS Sentinel
Expand Down Expand Up @@ -565,7 +565,8 @@ jobs:
- release/redisstack
macosx:
macos:
xcode: 14.2.0
xcode: 14.3.0
resource_class: macos.x86.medium.gen2
parameters:
env:
description: Build environment (stage || prod)
Expand Down
2 changes: 1 addition & 1 deletion electron-builder.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"type": "distribution",
"hardenedRuntime": true,
"darkModeSupport": true,
"bundleVersion": "3",
"bundleVersion": "9",
"icon": "resources/icon.icns",
"artifactName": "${productName}-${os}-${arch}.${ext}",
"entitlements": "resources/entitlements.mac.plist",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
"cross-env": "^7.0.2",
"css-loader": "^5.0.1",
"css-minimizer-webpack-plugin": "^1.2.0",
"electron": "^19.0.7",
"electron": "19.0.7",
"electron-builder": "^23.6.0",
"electron-builder-notarize": "^1.5.1",
"electron-debug": "^3.2.0",
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/about-panel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const ICON_PATH = app.isPackaged
export default {
applicationName: 'RedisInsight-v2',
applicationVersion:
`${app.getVersion() || '2.22.1'}${process.env.NODE_ENV !== 'production' ? `-dev-${process.getCreationTime()}` : ''}`,
`${app.getVersion() || '2.24.0'}${process.env.NODE_ENV !== 'production' ? `-dev-${process.getCreationTime()}` : ''}`,
copyright: `Copyright © ${new Date().getFullYear()} Redis Ltd.`,
iconPath: ICON_PATH,
};
2 changes: 1 addition & 1 deletion redisinsight/api/config/default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default {
tlsKey: process.env.SERVER_TLS_KEY,
staticContent: !!process.env.SERVER_STATIC_CONTENT || false,
buildType: process.env.BUILD_TYPE || 'ELECTRON',
appVersion: process.env.APP_VERSION || '2.22.0',
appVersion: process.env.APP_VERSION || '2.24.0',
requestTimeout: parseInt(process.env.REQUEST_TIMEOUT, 10) || 25000,
excludeRoutes: [],
excludeAuthRoutes: [],
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/api/config/swagger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
info: {
title: 'RedisInsight Backend API',
description: 'RedisInsight Backend API',
version: '2.22.1',
version: '2.24.0',
},
tags: [],
};
Expand Down
2 changes: 1 addition & 1 deletion redisinsight/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "redisinsight",
"productName": "RedisInsight",
"private": true,
"version": "2.22.1",
"version": "2.24.0",
"description": "RedisInsight",
"main": "./main.prod.js",
"author": {
Expand Down
Binary file modified tests/e2e/test-data/upload-tutorials/customTutorials.zip
Binary file not shown.
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6762,10 +6762,10 @@ electron-updater@^5.0.5:
semver "^7.3.5"
typed-emitter "^2.1.0"

electron@^19.0.7:
version "19.1.9"
resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.9.tgz#01995eea4014f7cdb2f616f5f3492d4ed6f5e4f0"
integrity sha512-XT5LkTzIHB+ZtD3dTmNnKjVBWrDWReCKt9G1uAFLz6uJMEVcIUiYO+fph5pLXETiBw/QZBx8egduMEfIccLx+g==
electron@19.0.7:
version "19.0.7"
resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.7.tgz#c7a7841646adc6457de70b93661cc400bfdf9d38"
integrity sha512-Wyg+oGkY8cWYmm8tVka6CZmhJxnyUx+Us2ALyWiY4w73+dO9XUNB/c7vQNIm1Uk/DLMn9vFzgvcS9YtOOMqpbg==
dependencies:
"@electron/get" "^1.14.1"
"@types/node" "^16.11.26"
Expand Down