Commit graph

3635 commits

Author SHA1 Message Date
yflory
2be78deb93 Fix Drive history 2018-07-19 17:07:14 +02:00
yflory
8b20b14184 Fix current path in toolbar reversing some names 2018-07-19 16:38:41 +02:00
yflory
c08951dd91 Press enter to create a shared folder when typing its name 2018-07-19 15:33:20 +02:00
yflory
8c20c7823e Empty trash callback was missing 2018-07-19 15:32:45 +02:00
yflory
1e092f36ba Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-19 11:43:06 +02:00
yflory
a95cf85f20 Fix shared folder creation using the wrong icon 2018-07-19 10:57:31 +02:00
Caleb James DeLisle
5527949c70 Make LessLoader flow properly, sorry about that 2018-07-18 16:22:44 +02:00
ansuz
a181c09a68 Merge branch 'soon' into staging 2018-07-18 15:56:44 +02:00
ansuz
c1eb6d6a01 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2018-07-18 15:53:26 +02:00
ansuz
e2600e4b36 display a loading screen while users are changing their passwords 2018-07-18 15:53:12 +02:00
yflory
f97685cc15 lint compliance 2018-07-18 15:12:07 +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
3a7d1e5beb Fix 'save to drive' icon displayed for anonymous users in whiteboard 2018-07-17 16:41:50 +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
b4c294565e Hide shared folder creation links when inside a shared folder 2018-07-17 14:00:28 +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
ed881840cd remove XXX label from non-blocking feature 2018-07-16 17:08:16 +02:00
yflory
9c58dc216f Remove option to move a shared folder to the trash 2018-07-16 16:17:34 +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
668b7425a8 Make sure we won't move pads from a shared folder to the trash 2018-07-16 15:39:34 +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
507e5b18e9 Remove all less includes where no mixin or variable is used after 2018-07-12 19:22:32 +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