32 Commits (6e153dc85848bf3680280e5b842ca411a3655735)

Author SHA1 Message Date
ansuz af40e140f9 safety net for call of undefined function in mergeDrive 6 years ago
yflory 8516587ece lint compliance 6 years ago
yflory 321c7d5512 Move pin/unpin outside of userObject 6 years ago
yflory 66a494cbd2 temp 6 years ago
yflory 425ac8ea57 Migration for read-only links + fix issues with read-only pads 7 years ago
yflory 0f9a71686e Add support for read-only href stored in filesData 7 years ago
yflory 8f28621bb0 Remove unnecessary logs when logging in 7 years ago
yflory 64c85fe548 Don't return channel in parsePadUrl 7 years ago
yflory 1879c1829c Add passwod prompt to access protected pads 7 years ago
yflory 47e4ce623a Fix import pads from anon drive at registration 7 years ago
yflory 0840570fbf Async store part 1 7 years ago
yflory 280a7c2765 Clean cryptpad-common 7 years ago
yflory 477f14bb8b Put constants in a separate file 7 years ago
yflory 30c8c253dd Remove util and hash from common 7 years ago
yflory cdeac00633 Merge branch 'staging' into newdrive 7 years ago
yflory 138ad17e3e Fix 'import local pads' in settings creating duplicates 7 years ago
yflory 47fe7b1c53 Drive in sandboxed iframe 7 years ago
yflory cab595f959 Fix duplicate folders in the drive 8 years ago
yflory e40f43bd20 Migrated pads were not displayed instantly in the drive 8 years ago
yflory a57f7c6ce7 Fix lint errors 8 years ago
yflory 2a94bdaf05 test 8 years ago
yflory 1c2ea04f11 Drive refactoring 8 years ago
yflory 1a7c4d5ebe Store the FS_hash in the user object after the merge 8 years ago
ansuz 78b11584f8 remove unused variables 8 years ago
Caleb James DeLisle c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter 8 years ago
yflory daabb0b3ad Integrate and fix the new fileObject (userObject) 8 years ago
ansuz 9b4b642d4a protect against subtly corrupted user objects 8 years ago
yflory 16e5788011 Call the callback if we can't parse the local Drive to import it 8 years ago
yflory 0c1efd361b Make sure the href is updated everywhere when importing a stronger link 8 years ago
yflory b701e3cc85 Fix lint errors 8 years ago
yflory 4206382865 Fix the settings app to allow backup for unregistered users 8 years ago
yflory f62267f8a1 Ability to import local pads in the user object 8 years ago