302 Commits

Author SHA1 Message Date
yflory
9e8c717035 Fix onlyoffice lastKnownHash bug 2019-09-02 11:30:48 +02:00
yflory
06809fd3ba Update codemirror settings in realtime 2019-08-19 16:53:17 +02:00
yflory
c608bdd2dc Merge branch 'off' into staging 2019-08-19 15:38:22 +02:00
yflory
656b129543 Ability to remove handlers from worker-channel and metadata-manager 2019-08-19 15:37:08 +02:00
yflory
c1656d7b5b Merge branch 'unifiedMetadata' into staging 2019-08-19 15:27:59 +02:00
yflory
6f0062d023 Add comments and timeout errors 2019-08-19 14:37:55 +02:00
ansuz
04feef793b resolve merge conflicts 2019-08-16 17:39:22 +02:00
yflory
c4a90a90f2 Fix disconnection event not propagating to the UI 2019-08-16 11:33:57 +02:00
yflory
eaeb995661 Remove debugging code 2019-08-14 10:38:42 +02:00
yflory
06748dcfb3 missing comma 2019-08-13 14:23:29 +02:00
yflory
970dcb8b8b null is an object 2019-08-12 15:40:25 +02:00
yflory
3303e9738d Fix drive deletion 2019-08-12 15:38:21 +02:00
yflory
5c6b3155ac Add safety measures to avoid removing your drive by accident 2019-08-12 15:30:59 +02:00
ClemDee
b49c39b895 Fix file progress value going over 100% 2019-07-19 11:34:30 +02:00
yflory
51facff6fd Send a mailbox address (encrypted) to the owned pads metadata 2019-07-17 17:01:25 +02:00
yflory
f0d753e3f4 Merge branch 'staging' into unifiedMetadata 2019-07-17 15:25:01 +02:00
yflory
7bc0c7ce95 Fix duplicate notifications n reconnect 2019-07-17 10:49:26 +02:00
yflory
9b45f0dd79 Add translation keys 2019-07-16 17:29:55 +02:00
yflory
65d76a9241 Merge branch 'request' into staging 2019-07-16 14:37:03 +02:00
yflory
a169b4c3b3 Display a notification when there is a new message from the support team 2019-07-16 14:31:57 +02:00
yflory
5be37f2e45 Unified metadata 2019-07-13 15:24:54 +02:00
yflory
60bea6b33b Request capabilities part 2 2019-07-13 11:47:58 +02:00
yflory
4156b1988f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-07-11 14:16:31 +02:00
yflory
6f1e281cf8 request capabilities temp 2019-07-11 14:16:04 +02:00
ansuz
5f5cd1e045 oups, add a missing closing brace 2019-07-08 12:12:42 +02:00
ansuz
8be6c84e2f guard against null elements in the drive 2019-07-08 12:10:57 +02:00
yflory
9d476ce9cd Fix error in the console 2019-07-05 17:06:02 +02:00
yflory
abf8ef6276 Pin admin mailbox 2019-07-04 10:37:05 +02:00
yflory
77e893c3ea Merge branch 'staging' into support 2019-07-02 14:46:36 +02:00
yflory
3f500cfd5c lint compliance 2019-07-01 18:19:54 +02:00
yflory
7a0f30488c Hide duplicates when receiving access to a pad via notifications 2019-07-01 18:07:40 +02:00
yflory
2e8e6e6de2 Return th timestamp in mailbox history 2019-07-01 13:42:40 +02:00
yflory
75e0b68f51 Add mailbox history 2019-06-27 18:21:54 +02:00
yflory
93b4dac8bb Support mailbox in the support and admin apps 2019-06-27 17:08:23 +02:00
yflory
22c9af6961 Support page 2019-06-25 16:39:15 +02:00
yflory
59d5723f3e Fix read-only spreadsheets 2019-06-24 18:17:42 +02:00
yflory
bba3e355d0 Invalid ID fix 2019-06-24 12:28:49 +02:00
yflory
f5858f524d Fix invalid file ID in the drive 2019-06-24 12:17:08 +02:00
yflory
f3dd85a7af Fix infinite loading screen 2019-06-20 10:54:15 +02:00
yflory
2c661310c7 Merge branch 'staging' into foldersColor 2019-06-18 15:36:22 +02:00
yflory
1f5eb66fe0 Merge branch 'soon' into staging 2019-06-18 11:27:57 +02:00
yflory
eaa389fcb8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-18 11:10:56 +02:00
yflory
07775d6e13 Use shared folders events to pin and unpin pads 2019-06-18 11:10:46 +02:00
ClemDee
e9598de655 Add folder metadata and folder color 2019-06-18 10:44:27 +02:00
yflory
04d8578f4e Shared folder history 2019-06-17 14:13:06 +02:00
ansuz
7b8ac3d8c8 Merge branch 'soon' into staging 2019-06-14 10:45:25 +02:00
yflory
3e4ee75137 Fix race condition with pins 2019-06-14 10:03:52 +02:00
yflory
db84b41225 Merge branch 'shareModal' into staging 2019-06-07 11:16:41 +02:00
yflory
ae9caecc52 fix race condition 2 2019-06-06 15:40:08 +02:00
yflory
62c96d562f Fix race condition with nthen 2019-06-06 15:33:08 +02:00