Merge pull request #148 from mprasil/beta
Merge Beta to master
No related branches found
No related tags found
Showing
- Cargo.lock 117 additions, 149 deletionsCargo.lock
- Cargo.toml 8 additions, 8 deletionsCargo.toml
- Dockerfile 12 additions, 16 deletionsDockerfile
- docker/set-vault-baseurl.patch 23 additions, 0 deletionsdocker/set-vault-baseurl.patch
- docker/settings.Production.json 0 additions, 9 deletionsdocker/settings.Production.json
- rust-toolchain 1 addition, 1 deletionrust-toolchain
- src/api/core/accounts.rs 5 additions, 0 deletionssrc/api/core/accounts.rs
- src/api/core/ciphers.rs 88 additions, 3 deletionssrc/api/core/ciphers.rs
- src/api/core/mod.rs 17 additions, 0 deletionssrc/api/core/mod.rs
- src/api/core/organizations.rs 60 additions, 14 deletionssrc/api/core/organizations.rs
- src/api/core/two_factor.rs 23 additions, 0 deletionssrc/api/core/two_factor.rs
- src/db/models/attachment.rs 6 additions, 0 deletionssrc/db/models/attachment.rs
- src/db/models/cipher.rs 22 additions, 1 deletionsrc/db/models/cipher.rs
- src/db/models/collection.rs 12 additions, 0 deletionssrc/db/models/collection.rs
- src/db/models/folder.rs 2 additions, 0 deletionssrc/db/models/folder.rs
- src/db/models/organization.rs 31 additions, 6 deletionssrc/db/models/organization.rs
- src/db/models/user.rs 19 additions, 0 deletionssrc/db/models/user.rs
- src/main.rs 1 addition, 0 deletionssrc/main.rs
- src/util.rs 10 additions, 9 deletionssrc/util.rs
Loading
Please register or sign in to comment