Commit Graph

6675 Commits (cc0574f61bc02b40d2a8de083869b4f1fdb8d198)

Author SHA1 Message Date
zertrin cc0574f61b
Fix link to Docker wiki page on readme.md 2019-08-31 14:08:55 +08: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
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
ansuz d6c425fbfb Merge branch 'fix' into staging 2019-08-27 10:28:25 +02:00
ansuz eb6a7f9262 update footer and package.json version to 3.0.0 2019-08-27 10:28:08 +02:00
Weblate 0f23d7699a Translated using Weblate (Spanish)
Currently translated at 58.3% (609 of 1044 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/
2019-08-27 08:21:34 +00:00
Weblate 83d233c0bf Translated using Weblate (German)
Currently translated at 100.0% (1044 of 1044 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-08-27 08:21:33 +00:00
yflory 8d7bf62ff2 Don't leave the channel twice in cryptget 2019-08-26 18:53:49 +02:00
ansuz 5c7c54f607 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into fix 2019-08-26 18:48:21 +02:00
yflory c9420200ce Fix download folder 2019-08-26 18:47:17 +02:00
ansuz 0c9ccffdf3 Merge branch 'staging' into fix 2019-08-26 18:44:30 +02:00
ansuz 874093a126 push something that actually works 2019-08-26 18:42:20 +02:00
ansuz 52e5644234 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-26 18:39:29 +02:00
ansuz 9d40018da3 support cross-origin blobs 2019-08-26 18:39:23 +02:00
yflory 3f6e64338a Fix downloading file from the drive 2019-08-26 18:17:39 +02:00
yflory a67f7d3edb Fix translation key 2019-08-26 18:00:23 +02:00
ansuz d6fc35cab4 mkdirp the path to metadata before writing 2019-08-26 17:44:21 +02:00
ansuz 8d102ea762 log more 2019-08-26 17:40:14 +02:00
ansuz c18018ca79 Merge branch 'staging' into fix 2019-08-26 17:22:30 +02:00
yflory 2367a60236 Features pages UI 2019-08-26 17:18:28 +02:00
Weblate 335f6b1673 Translated using Weblate (French)
Currently translated at 100.0% (1044 of 1044 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-08-26 15:15:27 +00:00
Weblate 9f1a4441d4 Translated using Weblate (English)
Currently translated at 100.0% (1044 of 1044 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1042 of 1042 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-08-26 15:15:27 +00:00
yflory 67fef6f764 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-26 16:25:41 +02:00