78 commits

Author	SHA1	Message	Date
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	dd684753d0	Fix gt()	2018-11-13 21:38:56 +00:00
Miroslav Prasil	f3e6cc6ffd	Set PartialOrd to consider invalid i32 UserOrgType lower than anything	2018-11-13 16:34:21 +00: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	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
Miroslav Prasil	54f54ee845	Update revision for users on collection save	2018-10-01 17:04:15 +01:00
Miroslav Prasil	c3c74506a7	Add missing fields to returned Org json	2018-10-01 16:00:11 +01:00
Daniel García	8651df8c2a	Fixed some lint issues	2018-09-13 21:55:23 +02:00
Miroslav Prasil	ec05f14f5a	Implement poor man's invitation via Organization invitation	2018-09-11 13:09:59 +01:00
Miroslav Prasil	049aa33f17	Fix editing users in Organization	2018-09-04 12:15:46 +01:00
Miroslav Prasil	2b2401be19	Update affected users revision on cipher and folder change	2018-08-21 17:32:00 +01:00
Miroslav Prasil	9eea0151ba	Update user revision timestamp on Organization changes	2018-08-21 13:26:22 +01:00
Miroslav Prasil	692ed81306	Do not show organization stuff to not accepted user	2018-07-13 17:21:19 +01:00
Daniel García	a1ffa4c28d	Allow TOTP generation in organizations (Fixes #50)	2018-07-01 15:49:52 +02:00
Daniel García	4cf9f83866	Fixed sync	2018-06-01 00:50:22 +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	62be23b1c0	Support listing and deleting users from collection	2018-05-30 15:40:37 +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
Miroslav Prasil	8b18c4c633	Implement cipher sharing	2018-05-14 16:19:24 +01:00
Miroslav Prasil	c054d0094a	set max storage to non-null value	2018-05-14 15:04:13 +01:00
Daniel García	032134aabc	Fixed some errors asigning collections to users	2018-05-11 20:08:02 +02:00
Miroslav Prasil	a0796acbc7	Implement suggested improvements	2018-05-03 17:47:27 +01:00
Miroslav Prasil	514a372bc8	Add per-user folder-cipher mapping	2018-04-30 23:38:55 +01:00
Daniel García	5210f9b951	Added org user editing	2018-04-25 00:34:40 +02:00
Daniel García	4093bf92fe	Initial organizations functionality: Creating orgs and inviting users	2018-04-24 22:01:55 +02:00