Commit Graph

37 Commits (377c3be9b36b4c29e680ed352fad5f474c32d304)

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