6695 Commits

Author SHA1 Message Date
ansuz
31c6e7241e Merge branch 'soon' into staging 2019-09-02 15:25:20 +02:00
ansuz
4e5f6edac4 update version to 3.0.1 for a minor release 2019-09-02 11:58:43 +02:00
ansuz
c2a6fe082f Merge branch 'soon' 2019-09-02 11:41:26 +02:00
yflory
a7bc83ac5d Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2019-09-02 11:33:36 +02:00
yflory
9e8c717035 Fix onlyoffice lastKnownHash bug 2019-09-02 11:30:48 +02:00
ansuz
2aa94ca965
Merge pull request #437 from zertrin/patch-1
Fix link to Docker wiki page on readme.md
2019-09-02 10:14:38 +02:00
zertrin
cc0574f61b
Fix link to Docker wiki page on readme.md 2019-08-31 14:08:55 +08:00
ansuz
05908ac035 store the current time in all pin-log messages 2019-08-30 16:31:08 +02:00
ansuz
a291486e3a remove deprecated scripts 2019-08-30 16:21:28 +02:00
ansuz
ecdb1505e2 lint compliance 2019-08-30 16:09:38 +02:00
ansuz
1ab4fd7952 advise users against using their emails as their username 2019-08-30 16:05:04 +02:00
Weblate
6d8892f269 Translated using Weblate (French)
Currently translated at 100.0% (1045 of 1045 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-08-30 13:20:57 +00:00
ansuz
42528632ac display correct pad expiration time based on /api/config 2019-08-30 15:17:03 +02:00
ansuz
1ec1d8b0e0 make fresh mode the default behaviour 2019-08-30 15:03:22 +02:00
ansuz
fcab0d4b6e deprecate common/curve.js in favour of the bower version 2019-08-30 14:41:47 +02:00
ansuz
b59f03b949 consider changes to metadata logs as channel activity 2019-08-30 14:30:17 +02:00
ansuz
1b7d984d39 Merge branch 'soon' into staging 2019-08-30 11:57:46 +02:00
yflory
b280e41b03 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2019-08-29 14:57:54 +02:00
yflory
13d2798329 Fix backspace in CodeMirror 2019-08-29 14:56:42 +02:00
ansuz
166ab65cd4 update changelog 2019-08-29 13:22:06 +02:00
ansuz
ebf41e93c0 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2019-08-29 12:13:23 +02:00
yflory
2416587466 Disable convertToSharedFolder 2019-08-29 12:12:14 +02:00
ansuz
69d48146d5 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2019-08-29 11:31:45 +02:00
yflory
416e0cde17 Fix removeOwnedChannel 2019-08-29 11:29:50 +02:00
yflory
3e53e43752 Fix drive export from settings and exported folder name 2019-08-29 11:01:06 +02:00
ansuz
7d33e261f8 add pending CHANGELOG for v3.0.0 2019-08-28 16:56:58 +02:00
yflory
0368bbad76 Fix drive export from settings and exported folder name 2019-08-28 16:53:18 +02:00
yflory
2a91643d59 Remove an owner 2019-08-28 16:37:13 +02:00
yflory
f6762f7c01 Make the friends list from the share modal reusable 2019-08-28 15:29:38 +02:00
yflory
28b2341f2c Serverside metadata update 2019-08-28 12:40:35 +02:00
ansuz
bf1332451f fix merge conflict 2019-08-27 17:54:31 +02:00
ansuz
113a362724 fix typo which causes ephemeral channels to be stored 2019-08-27 17:46:40 +02:00
ansuz
6fbfa2beea Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-27 17:08:35 +02:00
ansuz
1400fdbae0 pin to stable nthen version 2019-08-27 17:08:24 +02:00
yflory
7510e7319e Fix dropping files into codemirror 2019-08-27 16:07:40 +02:00
yflory
b88c5d2944 Fix notifications 2019-08-27 15:56:27 +02:00
yflory
d3fdb0d9fe Fix fileHost error 2019-08-27 15:37:45 +02:00
yflory
7bd4a4028b Fix fileHost again... 2019-08-27 15:31:22 +02:00
yflory
7afea886e7 Fix HTML in support UI 2019-08-27 14:39:25 +02:00
yflory
eca8394765 Fix a potential type error 2019-08-27 14:39:15 +02:00
yflory
86548e5cc1 Fix wrong fileHost when displaying thumbnails 2019-08-27 13:46:09 +02:00
yflory
a73e48de80 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-27 12:08:22 +02:00
yflory
76410b479b Fix potential XSS issues if CSP is badly configured 2019-08-27 12:03:25 +02:00
ansuz
1241d17b43 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-27 11:38:16 +02:00
yflory
c62e279224 Fix share modal friends list 2019-08-27 11:37:39 +02:00
ansuz
459c2ba7e3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-27 11:19:13 +02:00
yflory
3c8b9a55e0 Add background color to plain text media tags in the markdown apps 2019-08-27 11:16:25 +02:00
yflory
c786735b1a Improve rendering of plain text mediatags 2019-08-27 11:02:03 +02:00
yflory
5c80a8d9b5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-27 10:55:03 +02:00
yflory
8957bbd782 Ability to set ownership and password when sharing a folder 2019-08-27 10:53:41 +02:00