Commit Graph
12 Commits
Author SHA1 Message Date
Michiel Hazelhof 9bc010cb57 Update and fix unified branch (#257)
* Upstream patches

* Fix license generator according to upstream changes (#245) (#249)

* Test generating user and organization licenses during build check (#252)

* Fix ps1 script and update language

* Update class path

* Cleanup code

* Cleanup code

* Cleanup code

* Refactor and fixes

* Copy all files

* Copy files only when needed

* Make call consistent

* Simplify call

* Clarify language

* Reuse code

* Cleanup

* Cleanup

* Remove NewtonSoft.Json

* Upgrade dnlib

* Cleanup

* Fix path issue

* Fix comparator

* Cleanup circleci

* Fix type

* Fix circleci

* Properly detect previous version

* Add missing parameter

* Better detect running patched containers

* Improve naming

* Fix line endings

* Fix typo

* Add comment

* Fix tabs

* Cleanup org license

* Use proper file extension

* Add missing file

* Migrate cert.cert if exists

* Check for the correct file

* Fix character check

* Add comment

* Add more documentation

* Add proper line endings

* Add potentially correct line

* Add auto restart

* Update comment

* Improve consistency between bash and powerhell

* Update documentation

* Detect buildx

* Fix spelling mistake

* Fix check order and improve verbosity
2025-10-05 19:40:16 +01:00
Michiel Hazelhof 076b0a624b Upstream patches (#240) 2025-07-15 10:00:09 +01:00
Michiel Hazelhof 770dcd33f6 Move Manually generating Certificate & Key section in README.md for unified (#220)
* Update Dockerfile

See #215 and #207

* Move Manually generating Certificate & Key section in README.md

See #216
2025-01-12 12:14:30 +01:00
Michiel Hazelhof b6d2c9244c Update Dockerfile (#217)
See #215 and #207
2024-11-24 19:05:26 +01:00
Michiel Hazelhofandcaptainhook b47fe37279 Update license to version 15 (#211) (#212)
Co-authored-by: captainhook <16797541+captainhook@users.noreply.github.com>
2024-10-15 11:12:55 +01:00
Michiel Hazelhof f75731633c Use new location (#201) 2024-06-30 01:30:58 +00:00
Michiel Hazelhof 0a45513872 Follow master updates and general improvements (#194)
* Use correct framework

* Upgrade packages

* Remove unused variable

* Migrate away from deprecated package

* Improve naming

* Fix typo

* Simplify constructors
2024-03-31 11:13:05 +01:00
Michiel Hazelhof c8192610dc Properly fix Dockerfiles (#189) 2024-03-04 21:16:30 +00:00
Michiel Hazelhof e4da85d46e Updated the unified branch (#180)
* Updated license version to 12, added SM options, increased max seats (short to int) (#172)

* - Updated license version to 12
- Added new SM license options
* Change seats, smseats, smserviceaccounts from short to int, like they are in the Bitwarden server code, to allow for the accurate maximum amount of seats

* Add extra ignore

* Code cleanup

* Ignore more VS cruft

* Bring up to date with upstream

(Update License to use Secrets Manager fully)

* Update to .NET 8.0
2024-02-23 14:44:27 +00:00
Michiel HazelhofandMichiel Hazelhof 38e6ebc5f9 Update licenseGen with latest version and options (#165) (#166)
Co-authored-by: Michiel Hazelhof <m.hazelhof@fyn.nl>
2023-04-23 12:41:27 +00:00
Michiel Hazelhof d4abc9e5b7 Full Unified support including Linux and Windows (#155 / #154)
* Initial work

* Fix typo

* Fix typo

* Fix stupid issue

* Add comments and fix minor issues

* Add extra information

* Add Linux script for generating keys

* Add circleci

* Add comments

* Add extra option

* Add missing permissions and empty script for now

* Fix line endings

* Add missing mount point

* Simplify patch

* Fix scripts

* Reduce complexity

* Fix circleci

* Remove useless line

* Move to src folder and improve image creation
2023-01-16 21:13:43 +01:00
Michiel HazelhofandMichiel Hazelhof 006fa1fecf Update .net core and newtonsoft.json
Co-authored-by: Michiel Hazelhof <m.hazelhof@fyn.nl>

Due to compatibility issues laid out in issue #53:

Update from .net core 2.0 to 3.1 and newtonsoft.json 12.0.1 to 12.0.3.
2020-03-14 07:00:25 -04:00