Commit Graph

2021 Commits (886451393ec465cfe48bbfcff1e535edf6a32ab9)

Author SHA1 Message Date
yflory a117e329dc Add a Share entry in the drive's context menu 2018-08-23 12:34:44 +02:00
yflory e0b7f3f965 When importing a shared folder to the drive, open this folder directly 2018-08-23 11:55:14 +02:00
yflory 61659c1252 Fix template icon not overriden by a thumbnail in the PCS 2018-08-22 16:32:44 +02:00
yflory ce08d7b650 Merge branch 'master' into soon 2018-08-22 15:34:06 +02:00
yflory b084b892bd Fix cache issues with workers in firefox 2018-08-22 15:26:42 +02:00
ansuz af40e140f9 safety net for call of undefined function in mergeDrive 2018-08-16 16:59:52 +02:00
yflory a65e083fca Change PCS template icons 2018-07-28 11:38:22 +02:00
yflory 9a6fa4cbe2 Create a copy when uploading an owned file in a shared folder 2018-07-28 08:58:16 +02:00
yflory 20a9eee719 Disable shared folders creation by default 2018-07-20 18:41:14 +02:00
yflory f2baaf5b5b Fix shared folders issues including disappearing folders 2018-07-20 18:28:56 +02:00
yflory 4325ed4dde Fix small UI issues in drive 2018-07-20 12:29:18 +02:00
yflory bad1d7311a Fix drive tests 2018-07-20 12:04:42 +02:00
yflory d816a2ed9f Prevent timeout when restoring drive 2018-07-19 17:51:38 +02:00
yflory 2be78deb93 Fix Drive history 2018-07-19 17:07:14 +02:00
yflory 8c20c7823e Empty trash callback was missing 2018-07-19 15:32:45 +02:00
Caleb James DeLisle 5527949c70 Make LessLoader flow properly, sorry about that 2018-07-18 16:22:44 +02:00
yflory ef73cf89cd Merge branch 'soon' into staging 2018-07-18 15:10:23 +02:00
yflory 8eccffd8e4 Don't remove migrated read-only pads 2018-07-18 14:56:49 +02:00
yflory 64b51f3a80 jshint compliance 2018-07-18 14:25:48 +02:00
yflory ebfa2c2dc3 Merge branch 'less-less' into staging 2018-07-18 14:18:37 +02:00
yflory aafcb1bc02 Merge branch 'sharedfolder' into staging 2018-07-18 14:18:30 +02:00
Caleb James DeLisle 8d95efa144 Reference the relevant line in alertify.js 2018-07-18 13:22:27 +02:00
Caleb James DeLisle a57a8e51a1 Prevent alertify.js from overriding styles 2018-07-18 13:20:16 +02:00
ansuz e110f20397 support blocks on remote domains 2018-07-17 17:41:30 +02:00
yflory e59aec0a45 Try...catch on testworker.js 2018-07-17 16:46:24 +02:00
yflory 08005a709e Add a share icon in the drive when displaying a shared folder 2018-07-17 16:38:20 +02:00
ansuz 1629d7bb1d provide a SANE default in case httpUnsafeOrigin is not provided 2018-07-17 16:31:15 +02:00
ansuz bcbec0144c provide a default in case httpUnsafeOrigin is not provided 2018-07-17 16:20:40 +02:00
yflory 6143bceabb Fix XXX 2018-07-17 15:38:23 +02:00
ansuz a2fd32d6a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-17 14:49:19 +02:00
ansuz e6d4bced18 clean up extraneous variables and log statements 2018-07-17 14:34:25 +02:00
yflory ecb9f039b1 Fix pad password change not reloading with the correct URL 2018-07-17 12:27:23 +02:00
yflory c9ac3c7c2b Fix search in shared folders 2018-07-17 11:22:01 +02:00
yflory fc91cf606b Disable moveToTrash button for pads in shared folders 2018-07-16 18:05:23 +02:00
ansuz 2c22232a47 check if a user is logged in strictly by User_hash 2018-07-16 15:45:45 +02:00
ansuz 848a918eda remove out of date comments 2018-07-16 15:45:19 +02:00
yflory 5b48eff78c Remove owned pads deleted from the server in shared folders 2018-07-16 14:05:36 +02:00
ansuz b9c4aa43b5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-16 11:25:11 +02:00
ansuz 3d95e6088a leave a FIXME note 2018-07-16 11:24:58 +02:00
Caleb James DeLisle 792f7bcc64 show how long less takes to compile 2018-07-14 15:21:45 +02:00
Caleb James DeLisle 6c49318ac7 Show how long it takes to parse less 2018-07-14 15:19:39 +02:00
Caleb James DeLisle 0d5ac05866 refactoring of the less infrastructure 2018-07-14 15:15:23 +02:00
yflory b5c2eb8a9c Automatically refresh the drive when a change occurs in a shared folder 2018-07-13 19:24:49 +02:00
yflory 4706b8a9de Store newly created pads in the correct (shared) folder 2018-07-13 15:01:23 +02:00
yflory 6a80f49fe0 Don't load expired or deleted shared folders 2018-07-13 14:47:53 +02:00
Caleb James DeLisle a6d3dbf94f Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS 2018-07-12 19:13:04 +02:00
Caleb James DeLisle 4a352f2ed8 Use import (reference) whenever the less file supposedly emits no CSS 2018-07-12 18:43:17 +02:00
yflory 7d89026d83 Fix more issues with shared folders 2018-07-12 17:27:16 +02:00
Caleb James DeLisle c5105d7b84 Merge branch 'check-for-css-variables' into staging 2018-07-12 17:16:21 +02:00
Caleb James DeLisle a440359bc7 Commit patches provided to me by someone who Seemed Trustworthy At The Time
(should fix false negatives in shared-worker detection)
2018-07-12 16:59:36 +02:00