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 |
|
yflory
|
f760253137
|
Fix typo
|
2019-01-08 14:02:03 +01:00 |
|
yflory
|
d87a87410d
|
Preserve hidden owned pads from a deleted folder
|
2019-01-08 13:57:22 +01:00 |
|
yflory
|
a9e030a6a8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2019-01-08 10:54:00 +01:00 |
|
yflory
|
6140952763
|
Hide duplicated owned pads settings for anon users
|
2019-01-08 10:53:40 +01:00 |
|
ansuz
|
611fb4895c
|
Merge branch 'soon' into staging
|
2019-01-07 17:07:21 +01:00 |
|
ansuz
|
6457d2219e
|
Merge pull request #309 from promasu/patch-3
Made CSP syntax in nginx example conf valid
|
2019-01-07 17:06:46 +01:00 |
|
Adrian Nöthlich
|
3f9ae30b52
|
Made CSP syntax in nginx example conf valid
Made CSP syntax valid. There were arguments for e.g. blob: oder data: missing
|
2019-01-07 15:12:46 +01:00 |
|
Paul Libbrecht
|
1cd79e12f2
|
Latest update of the German translation (cursors, shared folders, ...).
|
2019-01-07 12:25:19 +01:00 |
|
yflory
|
1e672c4a6b
|
Use onlyoffice spreadsheets without ooserver
|
2019-01-07 12:02:38 +01:00 |
|
yflory
|
047a4a3ab4
|
Copy files to a shared folder instead of moving them
|
2019-01-07 10:25:13 +01:00 |
|
Paul Libbrecht
|
4d7bfd316a
|
Merge pull request #308 from rhoio/patch-1
Style, grammar and typo fixes in german translation
|
2019-01-07 08:35:53 +01:00 |
|
rhoio
|
5294604b90
|
Style, grammar and typo fixes in german translation
|
2019-01-06 17:40:36 +01:00 |
|
yflory
|
0a7adb3e88
|
Hide duplicated owned pads
|
2019-01-04 15:10:13 +01:00 |