Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4c12071
Merge pull request #392 from DefGuard/dev
t-aleksander Mar 3, 2025
b756bf7
Update enterprise license path
Mar 12, 2025
9ca4ce1
Merge pull request #400 from DefGuard/dev
t-aleksander Mar 14, 2025
959fa32
Update pull_request_template.md
teon May 5, 2025
8ef72c6
Update pull_request_template.md
teon May 5, 2025
c50233d
Update LICENSE.md
teon May 19, 2025
528ec51
Disable macos and windows builds for 1.4 alpha release
j-chmielewski Jun 6, 2025
0437d8f
add no data message when there is no locations in an instance
filipslezaklab Jun 9, 2025
66428c1
uncomment windows builds
t-aleksander Jun 9, 2025
e10065f
Enabled macOS build
kchudy Jun 9, 2025
d9aae30
Update FUNDING.yml
teon Jun 10, 2025
45affd9
Migrate to a new defguard Apple account (#447)
kchudy Jun 11, 2025
e0f3bc5
Bump wireguard-rs version
j-chmielewski Jun 13, 2025
3a1350c
Bump dependencies
j-chmielewski Jun 13, 2025
1213430
Merge branch 'main' into release/1.2.4
filipslezaklab Jun 18, 2025
a9da043
allow clippy result large err
filipslezaklab Jun 18, 2025
79e4732
Merge pull request #454 from DefGuard/release/1.2.4
filipslezaklab Jun 18, 2025
955b31a
update macos release workflow (#457)
filipslezaklab Jun 18, 2025
605c777
Purge old stats on start (#459)
t-aleksander Jun 18, 2025
b590001
Use new smart card for signing (#463)
Jun 20, 2025
02be5d5
Update dependencies
Jun 20, 2025
d896967
Cargo update
j-chmielewski Jun 23, 2025
fc5cb13
Merge branch 'main' into release/1.4
j-chmielewski Jun 23, 2025
796129b
Merge pull request #464 from DefGuard/release/1.4
j-chmielewski Jun 23, 2025
6f8daef
Merge branch 'dev' into post_1.4_merger
wojcik91 Jul 2, 2025
6293713
update protos
wojcik91 Jul 2, 2025
2c0af08
update dependencies
wojcik91 Jul 2, 2025
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: 1 addition & 4 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
# These are supported funding model platforms

ko_fi: defguard
custom: ['https://paypal.me/defguard']
custom: ['https://defguard.net/pricing/']
6 changes: 6 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 📝 New contributors

- [ ] I have read, understand, and agree to the Contributor Agreement. By checking this box, I confirm I have the right to contribute this work and I grant Defguard sp. z o.o. the necessary rights to use my contribution as outlined in the full agreement.: https://tnt.sh/s/defguard-contribution-agreement

⚠︎ If the checkbox will not be confirmed - we can't include your contribution in our codebase.

## 📖 Description

1. include a **summary of the changes and the related issue**, eg. _Closes #XYZ_
Expand Down
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Dual license info
The code in this repository is available under a dual licensing model:

1. Open Source License: The code, except for the contents of the "src/enterprise" directory, is licensed under the AGPL license (this license). This applies to the open core components of the software.
2. Enterprise License: All code in this repository (including within the "src/enterprise" directory) is licensed under a separate Enterprise License (see file src/enterprise/LICENSE.md).
1. Open Source License: The code, except for the contents of the "src-tauri/src/enterprise/" directory, is licensed under the AGPL license (this license). This applies to the open core components of the software.
2. Enterprise License: All code in this repository (including within the "src-tauri/src/enterprise/" directory) is licensed under a separate Enterprise License (see file src/enterprise/LICENSE.md).

# GNU AFFERO GENERAL PUBLIC LICENSE

Expand Down
16 changes: 9 additions & 7 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
cargo-tauri
toolchain
rust-analyzer-unwrapped
nodejs_18
nodejs_20
nodePackages.pnpm
trunk
];
Expand Down
Loading
Loading