32 Commits

Author	SHA1	Message	Date
ansuz	af40e140f9	safety net for call of undefined function in mergeDrive	2018-08-16 16:59:52 +02:00
yflory	8516587ece	lint compliance	2018-07-11 15:28:34 +02:00
yflory	321c7d5512	Move pin/unpin outside of userObject	2018-07-10 18:23:16 +02:00
yflory	66a494cbd2	temp	2018-07-10 15:10:07 +02:00
yflory	425ac8ea57	Migration for read-only links + fix issues with read-only pads	2018-06-29 18:16:04 +02:00
yflory	0f9a71686e	Add support for read-only href stored in filesData	2018-06-28 18:16:38 +02:00
yflory	8f28621bb0	Remove unnecessary logs when logging in	2018-06-11 11:23:11 +02:00
yflory	64c85fe548	Don't return channel in parsePadUrl	2018-04-27 17:23:23 +02:00
yflory	1879c1829c	Add passwod prompt to access protected pads	2018-04-25 19:03:58 +02:00
yflory	47e4ce623a	Fix import pads from anon drive at registration	2017-12-15 18:27:13 +01:00
yflory	0840570fbf	Async store part 1	2017-11-30 10:33:09 +01:00
yflory	280a7c2765	Clean cryptpad-common	2017-11-23 12:28:49 +01:00
yflory	477f14bb8b	Put constants in a separate file	2017-11-21 16:46:19 +01:00
yflory	30c8c253dd	Remove util and hash from common	2017-11-13 16:32:40 +01:00
yflory	cdeac00633	Merge branch 'staging' into newdrive	2017-09-25 17:35:06 +02:00
yflory	138ad17e3e	Fix 'import local pads' in settings creating duplicates	2017-09-25 17:09:26 +02:00
yflory	47fe7b1c53	Drive in sandboxed iframe	2017-09-22 19:35:06 +02:00
yflory	cab595f959	Fix duplicate folders in the drive	2017-07-04 14:51:35 +02:00
yflory	e40f43bd20	Migrated pads were not displayed instantly in the drive	2017-06-19 11:52:57 +02:00
yflory	a57f7c6ce7	Fix lint errors	2017-06-09 16:39:44 +02:00
yflory	2a94bdaf05	test	2017-06-09 13:41:11 +02:00
yflory	1c2ea04f11	Drive refactoring	2017-06-08 17:52:00 +02:00
yflory	1a7c4d5ebe	Store the FS_hash in the user object after the merge	2017-05-16 11:25:37 +02:00
ansuz	78b11584f8	remove unused variables	2017-05-04 16:16:09 +02:00
Caleb James DeLisle	c341fa8e94	Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter	2017-04-18 12:14:32 +02:00
yflory	daabb0b3ad	Integrate and fix the new fileObject (userObject)	2017-04-13 14:06:40 +02:00
ansuz	9b4b642d4a	protect against subtly corrupted user objects	2017-03-30 17:19:49 +02:00
yflory	16e5788011	Call the callback if we can't parse the local Drive to import it	2017-03-14 12:09:52 +01:00
yflory	0c1efd361b	Make sure the href is updated everywhere when importing a stronger link	2017-03-08 15:49:02 +01:00
yflory	b701e3cc85	Fix lint errors	2017-03-08 14:59:51 +01:00
yflory	4206382865	Fix the settings app to allow backup for unregistered users	2017-03-08 14:45:39 +01:00
yflory	f62267f8a1	Ability to import local pads in the user object	2017-03-07 18:39:21 +01:00