371 commits

Author	SHA1	Message	Date
brantje	5ddfd200d9	Auto detect urls	2016-10-07 12:09:54 +02:00
brantje	fc9a41d119	Fix filtering on tags	2016-10-07 11:15:51 +02:00
brantje	9a902fb446	Remove xxx of xx	2016-10-07 10:47:57 +02:00
brantje	c52984f779	Merge sharing_no_groups into master, fix conflicts	2016-10-07 10:45:03 +02:00
brantje	538a996892	Missing ;	2016-10-07 10:41:47 +02:00
Marcos Zuriaga	3ccd26e75b	Fix reencryption of history data	2016-10-07 00:54:57 +02:00
brantje	f406d61719	add/remove console.log	2016-10-06 23:47:17 +02:00
brantje	771ce949ef	fix for unsharing	2016-10-06 23:28:33 +02:00
brantje	c0a62d8a74	Remove console.log	2016-10-06 23:11:22 +02:00
brantje	27c7ed0037	Unshare almost works	2016-10-06 21:49:14 +02:00
Marcos Zuriaga	e414c0256e	Fix empty return value on the promise response	2016-10-06 21:34:29 +02:00
Marcos Zuriaga	e0ce28b720	Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups	2016-10-06 21:03:41 +02:00
Marcos Zuriaga	3270b7be4c	Now the .then of encryptcredential holds encrypted and plain text credential	2016-10-06 21:03:05 +02:00
brantje	a8e54c810f	Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups	2016-10-06 20:40:27 +02:00
Marcos Zuriaga	de5dc22efc	Fixes on the reencrypt method, now callback is executed	2016-10-06 20:39:34 +02:00
brantje	bf9863153c	Fix dropdown menu (remove it completely)	2016-10-06 20:38:19 +02:00
brantje	085b4e1500	Fix removing download link	2016-10-06 20:01:02 +02:00
Marcos Zuriaga	8ccae091c9	Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups	2016-10-06 19:53:30 +02:00
Marcos Zuriaga	a8c5d3f8c1	Fix server DDOS due to encrypted files data	2016-10-06 19:52:36 +02:00
brantje	38371ec7ee	Fix for sidebar closing on download	2016-10-06 19:52:09 +02:00
brantje	4b3d1b7450	Fix for ff downloads	2016-10-06 19:50:22 +02:00
brantje	a413d48e5f	Fix for uploading files to a shared credential	2016-10-06 19:30:01 +02:00
brantje	342385232c	Some fixes	2016-10-06 18:00:57 +02:00
brantje	67e8cb8138	Fix missing ,	2016-10-06 17:50:16 +02:00
brantje	77888059cb	Fix CredentialService not defined	2016-10-06 17:49:45 +02:00
brantje	b1b4770943	Fix FileService not defined	2016-10-06 17:48:31 +02:00
Marcos Zuriaga	686acdc394	Fix problem with promise context	2016-10-06 17:44:51 +02:00
Marcos Zuriaga	fe77149f9f	More fixes	2016-10-06 14:52:27 +02:00
Marcos Zuriaga	87b5f76705	Fixes	2016-10-06 14:15:01 +02:00
Marcos Zuriaga	c09622571c	Some fixes and improvements, js trolling me	2016-10-06 13:55:14 +02:00
brantje	218d27fcbc	Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups	2016-10-06 12:38:18 +02:00
Marcos Zuriaga	58e2ff7aa4	Fix misplaced ')'	2016-10-06 12:34:29 +02:00
brantje	0a17ddf8f4	Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups	2016-10-06 12:01:48 +02:00
brantje	1a924e4d2f	Move show spinner	2016-10-06 12:01:44 +02:00
Marcos Zuriaga	ecc85d1297	Added method for asynchronous credential update ... (needs testing, it's too late at the time i do this commit to try it)	2016-10-06 03:00:19 +02:00
brantje	2551ba4483	Fix missing acl check	2016-10-05 23:26:31 +02:00
brantje	0069844147	Change the way the credentials are loaded, load credentials every 5 min, Decline share request works	2016-10-05 23:06:29 +02:00
brantje	53c55d5fd6	Fix some bugs	2016-10-05 22:34:34 +02:00
brantje	130e296b1e	Fix unsharing	2016-10-05 20:08:47 +02:00
brantje	1c55e6dfa9	Fix unsharing	2016-10-05 20:07:13 +02:00
brantje	7d3d67c896	Fix for api change	2016-10-05 19:56:46 +02:00
brantje	161602fea9	Add icon	2016-10-05 19:46:03 +02:00
brantje	241872ee79	Fix for downloading non-shared files	2016-10-05 19:42:52 +02:00
brantje	c08243fbdf	Fix for non-shared credentials history	2016-10-05 19:41:47 +02:00
brantje	cc6cc0251d	Fix for revisions	2016-10-05 19:33:07 +02:00
brantje	01d07314ff	Fix for non shared credentials	2016-10-05 19:32:37 +02:00
brantje	4ecbcd9efa	Fix editing shared credentials	2016-10-05 19:27:24 +02:00
brantje	0d08902429	Remove console.log	2016-10-05 19:03:48 +02:00
brantje	836946e164	Restore revisions works	2016-10-05 19:02:27 +02:00
brantje	4ef465b7d0	Use guid	2016-10-05 18:55:12 +02:00
brantje	94c418bd5c	Fix error 500	2016-10-05 18:52:14 +02:00
brantje	8fa83f42f2	Remove console.log	2016-10-05 18:40:08 +02:00
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	d5d0676d6e	Patch datepicker to return date obj	2016-10-04 13:46:18 +02:00
brantje	e71a82218e	Fix for unsharing password	2016-10-04 12:57:41 +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	de27612a58	Updating almost works	2016-10-03 21:36:39 +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