Daniel García
|
f84cbeaaf8
|
Merge branch 'master' into rocket-0.4
# Conflicts:
# src/db/models/organization.rs
|
6 years ago |
Miroslav Prasil
|
dd684753d0
|
Fix gt()
|
6 years ago |
|
Miroslav Prasil
|
f3e6cc6ffd
|
Set PartialOrd to consider invalid i32 UserOrgType lower than anything
|
6 years ago |
|
Miroslav Prasil
|
66a4c5d48b
|
Implement comparison between i32 and UserOrgType
|
6 years ago |
|
Daniel García
|
c673370103
|
Updated bw_rs to Rocket version 0.4-rc1
|
6 years ago |
janost
|
64f6c60bfd
|
Organization::save() and UserOrganization::save() should return QueryResult instead of bool
|
6 years ago |
|
Miroslav Prasil
|
a28caa33ef
|
Implement poor man's admin panel
|
6 years ago |
|
Miroslav Prasil
|
54f54ee845
|
Update revision for users on collection save
|
6 years ago |
|
Miroslav Prasil
|
c3c74506a7
|
Add missing fields to returned Org json
|
6 years ago |
|
Daniel García
|
8651df8c2a
|
Fixed some lint issues
|
6 years ago |
|
Miroslav Prasil
|
ec05f14f5a
|
Implement poor man's invitation via Organization invitation
|
6 years ago |
|
Miroslav Prasil
|
049aa33f17
|
Fix editing users in Organization
|
6 years ago |
|
Miroslav Prasil
|
2b2401be19
|
Update affected users revision on cipher and folder change
|
6 years ago |
|
Miroslav Prasil
|
9eea0151ba
|
Update user revision timestamp on Organization changes
|
6 years ago |
|
Miroslav Prasil
|
692ed81306
|
Do not show organization stuff to not accepted user
|
6 years ago |
|
Daniel García
|
a1ffa4c28d
|
Allow TOTP generation in organizations (Fixes #50)
|
7 years ago |
|
Daniel García
|
4cf9f83866
|
Fixed sync
|
7 years ago |
|
Daniel García
|
1a4b1a8254
|
Enabled unused variable warning again, fixed some possible bugs where we didn't check some parameters, and explicitly marked all unused parameters (mostly orgheaders)
|
7 years ago |
|
Miroslav Prasil
|
62be23b1c0
|
Support listing and deleting users from collection
|
7 years ago |
|
Miroslav Prasil
|
941747f9e8
|
Implement deleting Organization
|
7 years ago |
|
Miroslav Prasil
|
a0d2ca3f24
|
Implement deleting collections
|
7 years ago |
|
Miroslav Prasil
|
8b18c4c633
|
Implement cipher sharing
|
7 years ago |
|
Miroslav Prasil
|
c054d0094a
|
set max storage to non-null value
|
7 years ago |
|
Daniel García
|
032134aabc
|
Fixed some errors asigning collections to users
|
7 years ago |
|
Miroslav Prasil
|
a0796acbc7
|
Implement suggested improvements
|
7 years ago |
|
Miroslav Prasil
|
514a372bc8
|
Add per-user folder-cipher mapping
|
7 years ago |
Daniel García
|
5210f9b951
|
Added org user editing
|
7 years ago |
|
Daniel García
|
4093bf92fe
|
Initial organizations functionality: Creating orgs and inviting users
|
7 years ago |
