412 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Marcos Zuriaga	54e4b9435f	Merge branch 'master' into sharing_no_groups	2016-10-01 20:18:14 +02:00
Marcos Zuriaga	973746389d	Sharing settings improvements ... More sharing logic benchmarking and tests	2016-10-01 19:04:05 +02:00
brantje	3dc19d2371	Change warning bar z-index	2016-10-01 18:07:44 +02:00
brantje	1048365e95	Fix "only variables should be passed by reference"	2016-10-01 18:04:29 +02:00
brantje	0113217b3c	Merge branch 'cronFix'	2016-10-01 18:04:04 +02:00
brantje	03a90e9020	Fix action title	2016-10-01 17:53:32 +02:00
brantje	9e8b23679c	More loggin for the cron, less strict checking	2016-10-01 17:52:53 +02:00
brantje	c907bb540d	Merge branch 'bookmarklet'	2016-10-01 17:31:16 +02:00
brantje	6411351068	Add bookmarklet	2016-10-01 17:21:24 +02:00
Marcos Zuriaga	38299973d0	Removed group sharing logics ... Added user sharing crypto times to the UI	2016-10-01 15:18:22 +02:00
Marcos Zuriaga	739098ce39	More sharing logic	2016-10-01 01:20:41 +02:00
Marcos Zuriaga	76d9a16797	DB Sharing update	2016-10-01 00:30:34 +02:00
brantje	c4da0742df	Merge branch 'httpWarning'	2016-09-30 22:33:13 +02:00
brantje	8b26873159	Add warning for http connections	2016-09-30 22:31:46 +02:00
brantje	899eff73f2	Merge branch 'fixColorTabs'	2016-09-30 22:11:31 +02:00
brantje	1956512f76	Implemented use-theme at tabs	2016-09-30 22:10:34 +02:00
brantje	e790d37b01	Add code review section to readme	2016-09-30 21:58:26 +02:00
brantje	eae47eaa38	Merge branch 'replaceApply'	2016-09-30 21:58:06 +02:00
brantje	089b0e13d7	Replace all scope.apply with digest	2016-09-30 21:51:38 +02:00
brantje	4a074958f5	Implement new updated progressbar to templates	2016-09-30 21:47:46 +02:00
brantje	89c4644ff3	Make sharing page more pretty	2016-09-30 21:43:55 +02:00
Marcos Zuriaga	cbd10de133	Merge branch 'master' of github.com:nextcloud/passman	2016-09-30 21:27:28 +02:00
Marcos Zuriaga	d682df4806	Progressbar on share action for cypher ... TODO: add a progressbar of the upload and the actual upload	2016-09-30 21:26:55 +02:00
brantje	2899d24a2d	Merge branch 'renameVault'	2016-09-30 21:25:57 +02:00
brantje	4f1dd1da88	Clean up	2016-09-30 21:17:34 +02:00
brantje	ae49c9e149	Implement renaming vault	2016-09-30 21:15:28 +02:00
brantje	5476c0d1ba	Merge branch 'challengePassword'	2016-09-30 21:04:13 +02:00
brantje	3af9e39488	Clean up code	2016-09-30 20:56:17 +02:00
brantje	c94870e1c3	Clean up code	2016-09-30 20:49:35 +02:00
brantje	9dd4a86ec4	Remove temp var	2016-09-30 20:46:06 +02:00
brantje	0ff6065f4b	Implement a challenge password	2016-09-30 20:43:20 +02:00
Marcos Zuriaga	288e6f19c0	Fixes undefined bug	2016-09-30 20:06:31 +02:00
Marcos Zuriaga	511d20acbe	Merge branch 'master' of github.com:nextcloud/passman	2016-09-30 19:47:44 +02:00
Marcos Zuriaga	10b1762c72	Debug changes	2016-09-30 19:47:22 +02:00
brantje	6cc5a93536	Update readme	2016-09-30 19:12:13 +02:00
brantje	0bcc376706	Update readme	2016-09-30 19:12:00 +02:00
brantje	484a88b7ac	Fix loading password preferences at password creation	2016-09-30 18:48:25 +02:00
brantje	0a7c504b90	Fixes	2016-09-30 18:21:17 +02:00
brantje	04b0261cd3	Merge branch 'master' of github.com:nextcloud/passman	2016-09-30 17:44:37 +02:00
brantje	05e20cceb0	Small bugfixes	2016-09-30 17:44:21 +02:00
brantje	95a870a740	Decrease title width	2016-09-29 10:05:57 +02:00
Marcos Zuriaga	1bcaef4405	Merge branch 'master' of github.com:nextcloud/passman	2016-09-29 01:13:08 +02:00
Marcos Zuriaga	dac5c17360	Some more sharing logic	2016-09-29 01:12:39 +02:00
brantje	93ecc59036	Few minor ui tweaks	2016-09-29 00:22:28 +02:00
brantje	101f137db5	Merge branch 'vaultSettings'	2016-09-28 23:40:53 +02:00
brantje	2af885265e	Fix bugs	2016-09-28 23:40:33 +02:00
Sander	b317fe4359	Merge pull request #37 from nextcloud/vaultSettings ... Vault implement settings	2016-09-28 23:24:14 +02:00
brantje	fc99d93f86	Finish up vault settings	2016-09-28 23:23:24 +02:00
Marcos Zuriaga	e4032f6a95	Store vault data on the user once we have it ... Useful for further sharing process and progress calculation	2016-09-28 22:16:15 +02:00
brantje	3394d78d36	Save work	2016-09-28 22:15:03 +02:00