Daniel García
|
f84cbeaaf8
|
Merge branch 'master' into rocket-0.4
# Conflicts:
# src/db/models/organization.rs
|
2018-11-14 16:14:49 +01:00 |
|
Miroslav Prasil
|
66a4c5d48b
|
Implement comparison between i32 and UserOrgType
|
2018-11-12 17:13:25 +00:00 |
|
Daniel García
|
c673370103
|
Updated bw_rs to Rocket version 0.4-rc1
|
2018-11-01 19:25:09 +01:00 |
|
janost
|
e985221b50
|
User::save() should return QueryResult instead of bool
|
2018-10-14 19:33:12 +02:00 |
|
janost
|
64f6c60bfd
|
Organization::save() and UserOrganization::save() should return QueryResult instead of bool
|
2018-10-14 16:04:23 +02:00 |
|
Miroslav Prasil
|
a28caa33ef
|
Implement poor man's admin panel
|
2018-10-12 15:20:10 +01:00 |
|
janost
|
5292d38c73
|
CollectionCipher::save() and delete() should return QueryResult instead of bool
|
2018-10-07 11:06:11 +02:00 |
|
janost
|
c29bc9309a
|
Return proper error message for org reinvite
|
2018-10-05 12:29:41 +02:00 |
|
Daniel García
|
2aabf14372
|
Merge pull request #206 from mprasil/collection_revision
Collection update updates User revision
|
2018-10-01 19:31:43 +02:00 |
|
Miroslav Prasil
|
d9457e929c
|
Add continuation token when we return object list
|
2018-10-01 17:55:48 +01:00 |
|
Miroslav Prasil
|
86b49856a7
|
Handle return value from Collection::save()
|
2018-10-01 17:50:31 +01:00 |
|
Daniel García
|
8651df8c2a
|
Fixed some lint issues
|
2018-09-13 21:55:23 +02:00 |
|
Daniel García
|
928e2424c0
|
Updated dependencies and fixed errors
|
2018-09-13 16:05:13 +02:00 |
|
Daniel García
|
f397f0cbd0
|
Implement organization import for admins and owners (Fixes #178)
|
2018-09-13 15:16:24 +02:00 |
|
Miroslav Prasil
|
c1cd4d9a6b
|
Modify User::new to be keyless and paswordless
|
2018-09-11 14:25:12 +01:00 |
|
Miroslav Prasil
|
ec05f14f5a
|
Implement poor man's invitation via Organization invitation
|
2018-09-11 13:09:59 +01:00 |
|
Miroslav Prasil
|
c58682e3fb
|
Fix the logic in user edditing
|
2018-09-04 16:10:26 +01:00 |
|
Miroslav Prasil
|
db111ae2a0
|
Check properly the user membership in Organization
|
2018-09-04 13:37:44 +01:00 |
|
Miroslav Prasil
|
049aa33f17
|
Fix editing users in Organization
|
2018-09-04 12:15:46 +01:00 |
|
Miroslav Prasil
|
40d09ddd2a
|
Add PUT alias for Organization updates
|
2018-08-21 13:25:52 +01:00 |
|
Miroslav Prasil
|
00b882935f
|
Deserialize "null" to empty Vec for Collections
|
2018-08-14 11:06:42 +01:00 |
|
Miroslav Prasil
|
0dfd9c7670
|
Add couple more aliases for PUTs and DELETEs
|
2018-08-13 16:45:30 +01:00 |
|
Daniel García
|
a291dea16f
|
Updated dependencies and Docker image to new web-vault
|
2018-07-21 17:27:00 +02:00 |
|
Daniel García
|
1cb67eee69
|
Implement leave organization (accessed from the bottom of the user's settings page)
|
2018-07-11 16:30:03 +02:00 |
|
Daniel García
|
0905355629
|
Fix wrong case in import struct, invite collections and user Uri back-compat
|
2018-06-13 14:39:29 +02:00 |
|
Daniel García
|
483066b9a0
|
Some style changes, removed useless matches and formats
|
2018-06-11 15:44:37 +02:00 |
|
Daniel García
|
5ec728683e
|
Make sure the inputs are always in the same case (PascalCase, which is what upstream seems to prefer most of the time)
|
2018-06-01 00:18:50 +02:00 |
|
Daniel García
|
faa26ab8f5
|
Changed error message
|
2018-05-31 15:36:51 +02:00 |
|
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)
|
2018-05-30 22:30:45 +02:00 |
|
Miroslav Prasil
|
135ab4fb20
|
Clean up organizations.rs with new request guards
|
2018-05-30 17:12:18 +01:00 |
|
Miroslav Prasil
|
46f3b229ee
|
Removed unnecessary checks, simplified the code a bit
|
2018-05-30 16:01:56 +01:00 |
|
Miroslav Prasil
|
62be23b1c0
|
Support listing and deleting users from collection
|
2018-05-30 15:40:37 +01:00 |
|
Miroslav Prasil
|
4d50014e35
|
Implement request guards for organization
|
2018-05-30 13:35:10 +01:00 |
|
Miroslav Prasil
|
85ecd001a5
|
Fix user invitation
|
2018-05-28 17:26:02 +01:00 |
|
Miroslav Prasil
|
941747f9e8
|
Implement deleting Organization
|
2018-05-19 22:09:32 +01:00 |
|
Miroslav Prasil
|
a0d2ca3f24
|
Implement deleting collections
|
2018-05-16 23:05:50 +01:00 |
|
Daniel García
|
032134aabc
|
Fixed some errors asigning collections to users
|
2018-05-11 20:08:02 +02:00 |
|
Daniel García
|
79b4ddcae8
|
Added read_only bit to users_collections
|
2018-05-04 20:10:35 +02:00 |
|
Daniel García
|
0cb58add54
|
Implemented some admin methods, inserted CollectionsUsers only when Org accessAll == false, and implemented find_collection when user has access_all in Org
|
2018-05-04 19:47:31 +02:00 |
|
Miroslav Prasil
|
514a372bc8
|
Add per-user folder-cipher mapping
|
2018-04-30 23:38:55 +01:00 |
|
Miroslav Prasil
|
7e9e200d29
|
Add support for adding and viewing of org ciphers
|
2018-04-27 12:49:34 +01:00 |
|
Miroslav Prasil
|
c5185ddb83
|
Adding some oganization features
|
2018-04-26 17:19:08 +01:00 |
|
Daniel García
|
5210f9b951
|
Added org user editing
|
2018-04-25 00:34:40 +02:00 |
|
Daniel García
|
e6132809d2
|
Implemented delete user from org and added checks to the already existing org methods
|
2018-04-24 23:04:17 +02:00 |
|
Daniel García
|
4093bf92fe
|
Initial organizations functionality: Creating orgs and inviting users
|
2018-04-24 22:01:55 +02:00 |
|
Daniel García
|
dfefbf1f31
|
Fixed cipher import, created missing data structs instead of using generic Value, and fixed some warnings
|
2018-02-23 00:38:54 +01:00 |
|
Daniel García
|
1bc346688c
|
Some initial work on organizations, nothing works yet
|
2018-02-17 23:04:34 +01:00 |
|