yflory
|
aafcb1bc02
|
Merge branch 'sharedfolder' into staging
|
2018-07-18 14:18:30 +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 |
|
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 |
|
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 |
|
Caleb James DeLisle
|
cb8888ea1a
|
Yes, so it turns out that making a small asthetic change after testing on every browser does actually break it :|
|
2018-07-12 16:51:48 +02:00 |
|
Caleb James DeLisle
|
fabdbc3b61
|
Add a feedback test for checking for CSS variables, so we won't use a feature which is not implemented by the vast majority of the people using CryptPad...
|
2018-07-12 16:02:46 +02:00 |
|
yflory
|
8516587ece
|
lint compliance
|
2018-07-11 15:28:34 +02:00 |
|
yflory
|
9787f5304a
|
Don't unpin channels that are still in another proxy
|
2018-07-11 15:28:24 +02:00 |
|
ansuz
|
3fb6cb3d00
|
lint compliance
|
2018-07-11 11:35:44 +02:00 |
|
ansuz
|
ca409e5eaa
|
support import/export in kanban
|
2018-07-11 10:50:42 +02:00 |
|
yflory
|
321c7d5512
|
Move pin/unpin outside of userObject
|
2018-07-10 18:23:16 +02:00 |
|
ansuz
|
8574128efd
|
unstub password change function
|
2018-07-10 16:44:24 +02:00 |
|
ansuz
|
25b0d764ed
|
pass initialState variable when copying your drive in the changeUserPassword function
because the hardest problems to debug are always fixed with one line changes
|
2018-07-10 16:42:11 +02:00 |
|
ansuz
|
54bc29f28c
|
WIP maybe I missed something
|
2018-07-10 15:16:43 +02:00 |
|
yflory
|
66a494cbd2
|
temp
|
2018-07-10 15:10:07 +02:00 |
|
yflory
|
4b86ed2dec
|
Shared folders UI
|
2018-07-10 14:41:37 +02:00 |
|
ansuz
|
0a9ea95796
|
always set userHash in localStorage even with modern users
|
2018-07-10 13:11:22 +02:00 |
|
yflory
|
bc7524c134
|
Fix tippy
|
2018-07-10 10:39:21 +02:00 |
|
yflory
|
6312dadb60
|
Fix shared folders names in the drive
|
2018-07-09 18:11:04 +02:00 |
|
ansuz
|
ce7ebf0326
|
don't stop users from registering if they cancel out of a prompt
|
2018-07-09 15:31:20 +02:00 |
|
yflory
|
e0cc1a6eb6
|
Display a shared folder in the drive
|
2018-07-09 14:36:55 +02:00 |
|
ansuz
|
a15e232469
|
complete modern user registration/login. general cleanup
|
2018-07-09 14:20:38 +02:00 |
|
ansuz
|
d79064a4c5
|
Merge branch 'staging' into modern-users2
|
2018-07-06 11:37:50 +02:00 |
|
ansuz
|
4ef2cfa88d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-07-06 11:37:00 +02:00 |
|
ansuz
|
57a39258c3
|
WIP big commit
|
2018-07-06 11:36:48 +02:00 |