yflory
|
e0cc1a6eb6
|
Display a shared folder in the drive
|
2018-07-09 14:36:55 +02:00 |
|
ansuz
|
16f276a18c
|
fix anon pad import
|
2018-07-09 14:34:33 +02:00 |
|
ansuz
|
a15e232469
|
complete modern user registration/login. general cleanup
|
2018-07-09 14:20:38 +02:00 |
|
ansuz
|
3d4b693722
|
use correctly scoped variable
|
2018-07-06 11:54:01 +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 |
|
ansuz
|
0c3b898000
|
simple one line fixes
|
2018-07-06 10:28:41 +02:00 |
|
yflory
|
0c9dfc1fb5
|
Add proxy manager inner
|
2018-07-05 16:33:46 +02:00 |
|
yflory
|
bd6a199dca
|
Add missing functions to the proxy manager
|
2018-07-05 13:56:16 +02:00 |
|
yflory
|
a25a72b5db
|
Add a proxy manager to handle operations between shared folders
|
2018-07-05 10:37:06 +02:00 |
|
ansuz
|
ab04a7cb46
|
fix the bug I caused while trying to silence the linter
|
2018-07-02 17:43:39 +02:00 |
|
yflory
|
66591a3654
|
Merge branch 'rohref' into sharedfolder
|
2018-07-02 14:12:06 +02:00 |
|
yflory
|
846755b0a7
|
Increase requirejs timeout (thanks Firefox...)
|
2018-07-02 14:02:05 +02:00 |
|
ansuz
|
a3e0e765b5
|
derive block URI and URL in dedicated functions
|
2018-07-02 11:11:50 +02:00 |
|
yflory
|
a99e5a3aaa
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-07-02 11:03:58 +02:00 |
|
yflory
|
af5cc30381
|
Fix undefined function when calling error() in the drive
|
2018-07-02 11:02:43 +02:00 |
|
yflory
|
071c34d4fa
|
Fix undefined secret with password-protected files (#250)
|
2018-07-02 10:51:43 +02:00 |
|
yflory
|
27797c0520
|
Fix undefined secret with password-protected files (#250)
|
2018-07-02 10:50:30 +02:00 |
|
yflory
|
425ac8ea57
|
Migration for read-only links + fix issues with read-only pads
|
2018-06-29 18:16:04 +02:00 |
|
yflory
|
0f9a71686e
|
Add support for read-only href stored in filesData
|
2018-06-28 18:16:38 +02:00 |
|
ansuz
|
12cf1993b9
|
flow compliance for loginBlock RPCs
|
2018-06-28 16:52:23 +02:00 |
|
yflory
|
34914785eb
|
lint compliance
|
2018-06-28 16:15:38 +02:00 |
|
yflory
|
a537f7de8b
|
Fix infinite loading screen caused by some browser settings
|
2018-06-28 16:13:52 +02:00 |
|
yflory
|
470f404a24
|
temp
|
2018-06-28 15:31:30 +02:00 |
|
ansuz
|
57d0738f32
|
Merge branch 'modern-users' into staging
|
2018-06-28 15:30:10 +02:00 |
|
ansuz
|
cc6f3dc0e4
|
lint compliance
|
2018-06-28 15:25:22 +02:00 |
|
ansuz
|
cfc81e8c96
|
allocate blockSeed as Uint8Array
|
2018-06-28 15:21:13 +02:00 |
|
yflory
|
554b4a978d
|
Load shared folders in the store
|
2018-06-28 14:15:30 +02:00 |
|
ansuz
|
7aa7b82c60
|
merge staging
|
2018-06-28 13:33:54 +02:00 |
|
ansuz
|
c85a551546
|
Merge pull request #249 from xwiki-labs/de-translation-pl
Translating one extra line.
|
2018-06-28 13:30:23 +02:00 |
|
ansuz
|
76c9b01d45
|
update changelog one more time
|
2018-06-27 15:13:47 +02:00 |
|
ansuz
|
fc6322b105
|
ignore /block/
|
2018-06-27 15:03:48 +02:00 |
|
ansuz
|
2c56972be6
|
update changelog and example nginx config
|
2018-06-27 15:03:38 +02:00 |
|
ansuz
|
232ef4c243
|
Merge branch 'master' of /home/ansuz/Desktop/cryptpad
|
2018-06-27 13:51:32 +02:00 |
|
ansuz
|
04d080d5a8
|
2.4.0 changelog
|
2018-06-27 13:48:36 +02:00 |
|
ansuz
|
6d94f6ce21
|
roll back to pre-socket.io code
|
2018-06-26 15:31:57 +02:00 |
|
ansuz
|
02169bfa83
|
Revert "Use socket.io instead of WebSocket"
In hindsight this may have been a terrible idea.
RIP uptime.
This reverts commit 9195c5744549fab0104fa844f5581ff0c7a7f755.
|
2018-06-26 15:30:40 +02:00 |
|
yflory
|
6dc7e7eff4
|
Disable WebWorkers by default
|
2018-06-26 14:15:25 +02:00 |
|
yflory
|
bfb850554d
|
Fix the contacts app with workers
|
2018-06-25 18:08:47 +02:00 |
|
yflory
|
87dc528a99
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-06-25 16:59:52 +02:00 |
|
yflory
|
6d8693ff8c
|
Fix history mode UI
|
2018-06-25 16:59:40 +02:00 |
|
ansuz
|
7dc393a2d2
|
remove debug log
|
2018-06-25 15:33:54 +02:00 |
|
ansuz
|
d76f3dceab
|
remove comment
|
2018-06-25 14:30:41 +02:00 |
|
ansuz
|
fb5553f918
|
fix typo
|
2018-06-25 14:25:37 +02:00 |
|
ansuz
|
9820ac278f
|
address npm warnings
|
2018-06-25 13:45:25 +02:00 |
|
yflory
|
76bc82ac13
|
lint compliance
|
2018-06-25 13:42:17 +02:00 |
|
yflory
|
0160ef30b7
|
Fix pad password change
|
2018-06-25 12:08:06 +02:00 |
|
yflory
|
9b6895b47a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-06-25 11:13:08 +02:00 |
|
yflory
|
355dc5c993
|
Hide account password change form in settings
|
2018-06-25 11:13:02 +02:00 |
|