Skip to content

Commit

Permalink
Merge branch 'Noovolari:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ri0day committed Jul 11, 2024
2 parents 734a415 + e3abf82 commit 2b28c86
Show file tree
Hide file tree
Showing 29 changed files with 492 additions and 277 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/desktop-app-cd-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,6 @@ jobs:
shell: bash
run: |
cd packages/desktop-app
curl https://asset.noovolari.com/signing-tool/CodeSignTool-v1.2.7-windows.zip --output CodeSignTool-v1.2.7-windows.zip -s
unzip CodeSignTool-v1.2.7-windows.zip
CONFIG_FILE=code_sign_tool.properties
cat "./CodeSignTool-v1.2.7-windows/conf/$CONFIG_FILE"
npm install
npm run release-win
rm -Rf ./release/win-unpacked
Expand Down Expand Up @@ -404,6 +400,7 @@ jobs:
publish-changelog:
runs-on: ubuntu-latest
environment: prod
needs: [ publish-draft ]
if: needs.tag-validation.outputs.validator == 1
steps:
Expand All @@ -424,6 +421,7 @@ jobs:
invalidate-distribution:
runs-on: ubuntu-latest
environment: prod
needs: [ publish-changelog ]
if: needs.tag-validation.outputs.validator == 1
steps:
Expand All @@ -443,6 +441,7 @@ jobs:
publish-github-release:
runs-on: ubuntu-latest
environment: prod
needs: [ invalidate-distribution, tag-validation ]
if: needs.tag-validation.outputs.validator == 1
steps:
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [0.26.1](https://github.com/Noovolari/leapp/compare/v0.26.0...v0.26.1) (2024-06-05)

### Bug Fixes
* fixed Leapp Pro workspace export functionality:
now it is able to keep IAM Users Access Keys in the system keychain during the transition to the local workspace.
Thanks to [Nuru](https://github.com/Nuru) for the support!

### [0.26.0](https://github.com/Noovolari/leapp/compare/v0.25.3...v0.26.0) (2024-05-13)

### Features
* added **Noovolari important communication** to command bar

### [0.25.3](https://github.com/Noovolari/leapp/compare/v0.25.2...v0.25.3) (2024-03-29)

### Bug Fixes
Expand Down
14 changes: 8 additions & 6 deletions docs/leapp-pro/export-pro-workspace.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@
3. from the Leapp Options "General" tab, click the button next to the "Export Pro/Team workspace" label;
![](../../images/tutorials/export-pro-workspace/export-pro-workspace.png?style=center-img)
4. close the Leapp Options dialog;
5. close Leapp (on macOS ⌘+Q);
5. you should see a **Leapp-lock.json.exported** file in the ~/.Leapp folder;
6. remove the Leapp-lock.json file and rename Leapp-lock.json.exported to Leapp-lock.json;
5. Lock the Leapp Pro workspace;
6. switch to the Local workspace;
7. close Leapp (on macOS ⌘+Q);
8. you should see a **Leapp-lock.json.exported** file in the ~/.Leapp folder;
9. remove the Leapp-lock.json file and rename Leapp-lock.json.exported to Leapp-lock.json;
```shell
rm Leapp-lock.json
mv Leapp-lock.json.exported Leapp-lock.json
```
7. re-open Leapp;
8. switch to the Local Workspace;
9. you should now see your Pro Workspace migrated into the Local one.
10. re-open Leapp;
11. switch to the Local Workspace;
12. you should now see your Pro Workspace migrated into the Local one.
18 changes: 0 additions & 18 deletions docs/leapp-pro/getting-started/index.md

This file was deleted.

20 changes: 0 additions & 20 deletions docs/leapp-pro/getting-started/lock.md

This file was deleted.

27 changes: 0 additions & 27 deletions docs/leapp-pro/getting-started/sign-in.md

This file was deleted.

26 changes: 0 additions & 26 deletions docs/leapp-pro/getting-started/sign-up.md

This file was deleted.

38 changes: 0 additions & 38 deletions docs/leapp-pro/security-and-password.md

This file was deleted.

36 changes: 0 additions & 36 deletions docs/leapp-pro/synchronization.md

This file was deleted.

12 changes: 2 additions & 10 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,7 @@ nav:
- 'Developer Reference': 'plugins/plugins-development.md'
- 'General Options': 'built-in-features/general-options.md'
- 'Leapp PRO':
- 'Getting Started':
- 'Getting Started': 'leapp-pro/getting-started/index.md'
- 'Sign-up': 'leapp-pro/getting-started/sign-up.md'
- 'Sign-in': 'leapp-pro/getting-started/sign-in.md'
- 'Lock your Workspace': 'leapp-pro/getting-started/lock.md'
- 'Synchronization': 'leapp-pro/synchronization.md'
- 'Security and password': 'leapp-pro/security-and-password.md'
- 'Export PRO Workspace': 'leapp-pro/export-pro-workspace.md'
- 'Roadmap': https://roadmap.leapp.cloud/tabs/4-in-progress
- Contributing:
- 'Get involved': 'contributing/get-involved.md'
- 'Useful Scripts': 'usefull-scripts/export-profile.md'
Expand Down Expand Up @@ -125,8 +117,8 @@ extra:
markdown_extensions:
- pymdownx.emoji:
emoji_index: !!python/name:materialx.emoji.twemoji
emoji_generator: !!python/name:materialx.emoji.to_svg
emoji_index: !!python/name:material.extensions.emoji.twemoji
emoji_generator: !!python/name:material.extensions.emoji.to_svg
- admonition
- pymdownx.details
- pymdownx.highlight
Expand Down
11 changes: 6 additions & 5 deletions packages/cli/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions packages/cli/src/service/team-service-stub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ export interface WorkspaceState {
export class TeamService {
constructor(_l: any, _e: any, _a: any, _p: any, _t: any, _m: any, _s: any, _r: any, _v: any, _i: any, _c: any, _n: any, _o: any, _y: any) {}

get skipKeychainSecretsDeletion(): boolean {
return false;
}

set skipKeychainSecretsDeletion(value: boolean) {}

get isLeappTeamStubbed(): boolean {
return true;
}
Expand Down
Loading

0 comments on commit 2b28c86

Please sign in to comment.