Commit graph

5827 commits

Author SHA1 Message Date
yflory
ec2f21ec64 Implement lock mechanisms for spreadsheets 2019-01-24 15:26:35 +01:00
ansuz
21d035393d disable english translations 2019-01-24 14:48:18 +01:00
ansuz
5410728bff lint compliance 2019-01-24 14:47:39 +01:00
Paul Libbrecht
73a75c11c9 Actualizing German translations. PL 2019-01-23 19:04:05 +01:00
yflory
e993925d81 Better implementation of the IE fix 2019-01-22 13:36:21 +01:00
yflory
01f93f6f7b FIx unrecoverable errors when using IE11 2019-01-22 12:25:49 +01:00
yflory
2a95127aee Fix custom limits not applied when adminEmail is set to false 2019-01-21 17:42:04 +01:00
yflory
2ac176eeec Share the correct index in onlyoffice messages 2019-01-21 16:54:31 +01:00
yflory
7d0f34a684 Debugging tools 2019-01-21 16:54:15 +01:00
ansuz
f5e0a5dc27
Merge pull request #312 from mcrosson/refactor-multiarch-docker
Multi arch docker file
2019-01-21 16:46:22 +01:00
yflory
29f8cfbfe0 Remove sockjs dependency and ooserver code 2019-01-21 10:44:39 +01:00
yflory
a66d8c1384 Use lastKnownHash to handle checkpoints in the realtime channel 2019-01-18 18:17:34 +01:00
ansuz
93c5dc9202 Merge branch 'soon' into staging 2019-01-18 15:45:02 +01:00
ansuz
69b50dd102 Merge branch 'master' into soon 2019-01-18 15:44:52 +01:00
yflory
1ecc460686 Fix a backup and restore issue from the settings 2019-01-18 15:41:09 +01:00
yflory
ef452d1221 Fix language detection in codemirror when importing a markdown file 2019-01-15 18:20:33 +01:00
yflory
8dbeee1af9 Realtime spreadsheets 2019-01-15 17:54:44 +01:00
yflory
a41a31a574 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-15 14:34:17 +01:00
yflory
6fa7b147e9 Add C, C++, Objective-C and Java to the list of languages in the code app 2019-01-15 14:34:11 +01:00
yflory
c5f554fe7b Test with onlyoffice 5.2.6 2019-01-15 14:28:49 +01:00
yflory
b79ba61984 Improve realtime channel for onlyoffice 2019-01-15 10:46:39 +01:00
ansuz
5a61453492 Merge branch 'soon' into staging 2019-01-14 16:42:37 +01:00
ansuz
6cf8720458 update how the async store chooses to prune history to avoid the diverged checkpoint bug 2019-01-14 16:40:54 +01:00
ansuz
3de8cf186c Merge branch 'soon' into staging 2019-01-14 15:33:44 +01:00
ansuz
724e4e39f5 Merge branch 'master' into soon 2019-01-14 15:33:29 +01:00
ansuz
9105a89eab intantiate ephemeral channels with 34 hex characters 2019-01-14 15:32:49 +01:00
ansuz
6963f00a57 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-14 15:32:09 +01:00
yflory
efdecd4059 First step for realtime in onlyoffice apps 2019-01-14 14:01:22 +01:00
KemoNine
0234578081 Update to node:6-stretch as slim is not available on arm64v8 labels 2019-01-11 17:57:04 +00:00
ansuz
6f89156415 guard against calling an undefined function 2019-01-11 17:01:43 +01:00
ansuz
8bab799ac9 guard against calling an undefined function 2019-01-11 17:01:22 +01:00
ansuz
77c0cf7359 guard against calling an undefined function 2019-01-11 16:58:39 +01:00
yflory
41a1148c17 Use the same code for the different frontend channels 2019-01-11 15:30:26 +01:00
KemoNine
9261aa193b refactor docker to support arm32/arm64/amd64 all in one build 2019-01-11 06:10:19 +00:00
ansuz
20959f84ae return Boolean from our test for WebRTC support 2019-01-10 18:21:39 +01:00
ansuz
275a3c80fc roll back to less 3.7.1 because newer versions break IE
see https://github.com/less/less.js/issues/3321
2019-01-10 18:20:32 +01:00
ansuz
060e5a12a2 lint compliance 2019-01-09 16:16:44 +01:00
ansuz
0f644b04b2 send feedback related to full drive export 2019-01-09 16:16:32 +01:00
ansuz
5e6f4c738b update changelog for Pademelon release 2019-01-09 15:19:22 +01:00
yflory
b4aae68c0c Fix access rights in the file app 2019-01-09 12:15:08 +01:00
yflory
6a45f5233e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-08 17:47:38 +01:00
yflory
6af7d393fd Fix cache issue with ckeditor css 2019-01-08 17:47:22 +01:00
ansuz
34608a0484 update footer and version 2019-01-08 15:29:50 +01:00
ansuz
0783944e1c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-08 15:17:51 +01:00
ansuz
424a14625d add feedback keys for password change and drive migration 2019-01-08 15:17:43 +01:00
yflory
573a3557f1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-08 15:03:16 +01:00
yflory
5b80fafe5e Add feedback 2019-01-08 15:03:02 +01:00
ansuz
ab832f38b7 send feedback for the subscription button in the settings sidebar 2019-01-08 14:44:40 +01:00
ansuz
bcd6a4b6c6 add feedback keys 2019-01-08 14:33:02 +01:00
yflory
107c352922 Update translations 2019-01-08 14:02:54 +01:00