Commit graph

5054 commits

Author SHA1 Message Date
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
yflory
321c7d5512 Move pin/unpin outside of userObject 2018-07-10 18:23:16 +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
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
yflory
e0cc1a6eb6 Display a shared folder in the drive 2018-07-09 14:36:55 +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
yflory
66591a3654 Merge branch 'rohref' into sharedfolder 2018-07-02 14:12:06 +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
yflory
470f404a24 temp 2018-06-28 15:31:30 +02:00
yflory
554b4a978d Load shared folders in the store 2018-06-28 14:15:30 +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 9195c57445.
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
ansuz
4e9baff0b6 bump version 2018-06-25 11:00:59 +02:00
yflory
fbe940c024 Fallback to async store in self.crypto doesn't exist in webworkers (ie/edge) 2018-06-22 19:43:07 +02:00
yflory
52cc007431 Merge branch 'master' into staging 2018-06-21 16:56:44 +02:00
yflory
ddcbd000dc Bump chainpad-server version 2018-06-21 16:55:54 +02:00
ansuz
567a4d2d98 use more restrictive semver for chainpad-server 2018-06-21 16:54:57 +02:00
yflory
ad0663c168 :q 2018-06-21 16:48:09 +02:00
yflory
29aca1da02 Bump listmap version 2018-06-21 14:36:38 +02:00
yflory
30beec0102 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-21 14:08:18 +02:00
yflory
d9c186a3da Merge branch 'staging' into socketio 2018-06-21 14:01:56 +02:00
ansuz
fc35d06c83 Merge branch 'soon' into staging 2018-06-21 10:42:25 +02:00
ansuz
184708f859 fix login from register page 2018-06-21 10:40:09 +02:00
yflory
a5b207d57b Password change UI 2018-06-20 10:02:56 +02:00
yflory
7948fe2b70 Merge branch 'soon' into staging 2018-06-19 17:02:26 +02:00
yflory
29f577dfc6 Improve history to load it chunk by chunk 2018-06-19 17:02:16 +02:00