Commit graph

5682 commits

Author SHA1 Message Date
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
yflory
7658fb90a2 Translations for spellcheck 2019-01-03 18:47:27 +01:00
yflory
cef9733262 Enable spellcheck in pad 2018-12-21 18:16:29 +01:00
yflory
c6acd191b9 Own drive translations 2018-12-20 11:18:12 +01:00
yflory
f2f9b57505 Own drive migration 2018-12-19 18:59:20 +01:00
yflory
b2b23446e8 Add missing translations 2018-12-18 14:48:52 +01:00
yflory
bbc06f668f Fix undefined hash for deleted shared folders 2018-12-17 15:49:48 +01:00
yflory
d760961719 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-12-17 11:58:34 +01:00
yflory
a11a883cff Cursor improvements in pad, code and slide 2018-12-17 11:44:08 +01:00
ansuz
9eaa03092f
Merge pull request #305 from interfect/patch-1
Update documentation for Docker usage
2018-12-17 10:34:43 +01:00
interfect
b817ac1511
Improve Docker documentation in the repo
Now it will link to the wiki too.
2018-12-15 10:20:03 -08:00
interfect
1e07d3a157
Persist all directories with Docker 2018-12-15 10:10:01 -08:00
yflory
d76c21fcf5 Register link in the login page 2018-12-14 16:50:25 +01:00
yflory
2031d535d7 Cursor in pads (again) 2018-12-14 16:40:15 +01:00
yflory
ee3102143f Remove debugging logs 2018-12-14 15:38:04 +01:00
yflory
28f50c3590 Merge branch 'oo2' of github.com:xwiki-labs/cryptpad into oo2 2018-12-13 16:25:58 +01:00
yflory
760f58b74c Merge branch 'staging' into oo2 2018-12-13 16:24:11 +01:00
ansuz
db95b1f243 Merge branch 'soon' into staging 2018-12-13 16:14:10 +01:00
yflory
bca120a3ee Display the correct available apps on the home page 2018-12-13 15:07:18 +01:00
yflory
47fa7f29c9 Merge branch 'disableApps' into staging 2018-12-13 14:46:24 +01:00
ansuz
1cdae1d3dd update changelog for Opossum release 2018-12-13 14:23:51 +01:00
yflory
2498f45eb3 Clickable links in pad 2018-12-13 13:22:19 +01:00
yflory
ae7d97b3dd Ability to disable apps using appconfig 2018-12-12 14:52:58 +01:00
yflory
f883fb7e04 Preserve chat and cursor channel when importing a template 2018-12-12 13:48:28 +01:00
yflory
1a0344547b Improve cursor in pad 2018-12-11 15:59:40 +01:00
yflory
7bbf6951f2 Disable cursors in pad 2018-12-11 14:16:15 +01:00
yflory
bfd94c7f2b Merge branch 'cursor' into staging 2018-12-11 13:36:49 +01:00
yflory
95a0bc9fc1 Merge branch 'rochat' into staging 2018-12-11 13:36:41 +01:00
yflory
489a99c5c4 Don't delete the old chat for now 2018-12-11 13:35:00 +01:00
yflory
cc6ffcc788 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-12-11 12:04:29 +01:00
yflory
0197f583f2 Translations for the cursor position settings 2018-12-11 12:04:11 +01:00
ansuz
8960c8fcbd bump to latest version and codename 2018-12-11 11:11:17 +01:00
yflory
13da052325 Update translation key 2018-12-11 11:09:34 +01:00