226 commits

Author	SHA1	Message	Date
brantje	af827ec0df	Shared revisions at Alice works	2016-10-05 18:39:00 +02:00
brantje	5ff5414f2c	Fix merge conflict	2016-10-05 18:27:56 +02:00
brantje	a77ae301f5	Stared to work on revisions	2016-10-05 18:24:36 +02:00
brantje	292fdef6ab	Add todo	2016-10-05 17:04:25 +02:00
brantje	ed04310c42	Remove console.log	2016-10-05 17:03:38 +02:00
brantje	e6aef00193	Downloading shared files works	2016-10-05 16:58:19 +02:00
brantje	e1404ed202	Little fixes in revision controller	2016-10-05 14:46:18 +02:00
brantje	6a38da7698	Add method to service	2016-10-05 14:36:02 +02:00
brantje	c62a0a8d7c	Small start of re encrypting files on share	2016-10-05 14:21:46 +02:00
brantje	35d6d3777c	Add activity support for sharing	2016-10-05 13:46:25 +02:00
brantje	4bc90d904e	Setting permission on share requests works	2016-10-05 12:48:59 +02:00
brantje	1a5a8604a4	Remove some console.log	2016-10-04 19:09:19 +02:00
brantje	d379abab18	acl -> acl_id	2016-10-04 19:04:15 +02:00
brantje	53821e83b8	Fixing stuff	2016-10-04 18:47:20 +02:00
Marcos Zuriaga	7d8a132463	Added upload progress bar on the sharing view	2016-10-04 18:42:21 +02:00
Marcos Zuriaga	0d8ad5b8f7	Tidy up code and make it more maintainable	2016-10-04 18:29:02 +02:00
brantje	86637c51f6	Fix for creating shares	2016-10-04 18:19:58 +02:00
brantje	713013caa7	Catch some errors	2016-10-04 18:15:40 +02:00
Marcos Zuriaga	db819771d8	Fix issue with users on the async shared key rsa encyrption	2016-10-04 17:24:19 +02:00
brantje	d333f76f37	Bug found	2016-10-04 16:42:58 +02:00
brantje	d058028c54	Fix updating shared credential	2016-10-04 16:20:55 +02:00
brantje	9a19e0c141	Frontend loads sharing acl	2016-10-04 15:14:31 +02:00
brantje	8c90599c34	Frontend loads sharing acl	2016-10-04 15:08:24 +02:00
brantje	6b0e208907	Get acl list on load	2016-10-04 14:50:49 +02:00
brantje	f363cb724e	Update route for incoming api change	2016-10-04 14:30:40 +02:00
brantje	bafb4a7f73	Update route for incoming api change	2016-10-04 14:25:28 +02:00
brantje	5c9aac9495	Expire shared items after a certain date	2016-10-04 14:15:34 +02:00
brantje	43d993ebf9	Add todo	2016-10-04 00:31:51 +02:00
brantje	294b9f7201	Link sharing works	2016-10-04 00:19:46 +02:00
brantje	6fe0ea1e97	Link sharing almost works	2016-10-03 23:53:11 +02:00
brantje	35d9432930	Update endpoint	2016-10-03 23:06:37 +02:00
brantje	306bdbda8b	Show message if an credential is expired	2016-10-03 23:00:46 +02:00
brantje	26b5778163	Change api route	2016-10-03 22:28:30 +02:00
brantje	1a1cf3e1bc	Show editor name at revision	2016-10-03 22:06:55 +02:00
brantje	a8297b0aed	Add console.logs	2016-10-03 21:53:45 +02:00
brantje	d47f546650	Add console.logs	2016-10-03 21:52:36 +02:00
brantje	653fd9bace	Delete prop	2016-10-03 21:42:16 +02:00
brantje	a14bcaf2ae	Rename file	2016-10-03 20:41:30 +02:00
brantje	ba6d089a9c	Bob can almost edit alices credential	2016-10-03 20:33:32 +02:00
brantje	7cf807de5f	Fix posting permissions	2016-10-03 19:31:59 +02:00
brantje	d572aca165	Add permission to link sharing	2016-10-03 19:19:28 +02:00
Marcos Zuriaga	f91b78a33b	Created toggle method on permissions	2016-10-03 19:06:25 +02:00
Marcos Zuriaga	5cfd481e63	Fix bitwise not	2016-10-03 18:55:34 +02:00
brantje	0d37b69d3b	Push baby, added setPermission	2016-10-03 18:44:49 +02:00
Marcos Zuriaga	f42d1e3c85	Fixed js permissions check ... Improved default permissions checks	2016-10-03 18:31:20 +02:00
brantje	0a9c097910	Add hasPermission	2016-10-03 18:14:18 +02:00
Marcos Zuriaga	23daf3a3ae	Changed definition of acl slighly	2016-10-03 18:02:49 +02:00
brantje	9b826df3e8	Add console.log to test SharingACL	2016-10-03 17:56:28 +02:00
brantje	a10c567b1f	Format file	2016-10-03 17:53:49 +02:00
brantje	3355db8d89	Unshare credentials	2016-10-03 17:23:03 +02:00