Commit Graph

6619 Commits (52e5644234c0588531047798409ef02560378470)

Author SHA1 Message Date
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
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
yflory 7c7a3660c8 Maybe fix losing selection in the code app when tab is not focused 2019-08-26 16:25:34 +02:00
yflory 521940f604 Don't update the proxy onfinechange when picking a cursor color 2019-08-26 15:30:35 +02:00
ansuz 57c5e664bb don't prompt users to upgrade to premium if subscriptions are disabled 2019-08-26 14:07:23 +02:00
yflory e2ff6c7c30 Fix fileHost in the file app 2019-08-23 17:38:08 +02:00
yflory 32c1ab842e Fix typo 2019-08-23 17:31:20 +02:00
yflory 9d32dbb7e5 Remove console.log 2019-08-23 17:19:08 +02:00
yflory 31f365474b Fix fileHost for avatars 2019-08-23 17:12:39 +02:00
yflory c7ca50c934 add "copy shareable link" button to "profile" page 2019-08-23 16:42:31 +02:00
yflory 7816c17cb5 Fix backspace shortcut in codemirror 2019-08-23 16:31:57 +02:00
yflory e3e4186f34 Remove placeholder 2019-08-23 16:20:50 +02:00
yflory d59b2f513f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-23 16:20:05 +02:00
Weblate e4ecf02774 Translated using Weblate (German)
Currently translated at 100.0% (1039 of 1039 strings)

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

Translated using Weblate (German)

Currently translated at 100.0% (1039 of 1039 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-08-23 14:19:56 +00:00
Weblate eabe639e7c Translated using Weblate (French)
Currently translated at 100.0% (1041 of 1041 strings)

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

Translated using Weblate (French)

Currently translated at 99.9% (1038 of 1039 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-08-23 14:19:56 +00:00
Weblate 753ba85983 Translated using Weblate (English)
Currently translated at 100.0% (1041 of 1041 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1040 of 1040 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1039 of 1039 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-08-23 14:19:56 +00:00
yflory c95db33157 Improve pricing visibility 2019-08-23 16:19:45 +02:00
yflory 74372ba5d4 Disable Ctrl+E modal in share and filepicker modals 2019-08-23 12:16:48 +02:00
yflory a125f6a764 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-23 12:03:04 +02:00
yflory ae1e221bdc Remove useless X in the download table 2019-08-22 18:04:38 +02:00
yflory 3c6e127831 Improve upload table UI 2019-08-22 18:04:11 +02:00
ansuz 71e44f46c7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-22 14:52:38 +02:00
ansuz 337e0bd141 update the server's cache whenever we write metadata 2019-08-22 14:52:30 +02:00
yflory fc72861721 Prevent users from opening a pad with the wrong app 2019-08-22 14:01:07 +02:00
ansuz a63bea1f59 remove invalid callback which would totally break channelBytes 2019-08-22 11:50:06 +02:00
ansuz 3c1aadd6c1 archive metadata even if there is no corresponding channel log 2019-08-22 11:49:43 +02:00
ansuz 55ea7f13fd fix invalid conditional which would block task scheduling 2019-08-22 11:49:02 +02:00
ansuz 8af7308da4 set a default value and describe disableIntegratedTasks in the example config 2019-08-21 14:06:57 +02:00
ansuz c17938a8e3 cache the metadata to save a few lookups 2019-08-21 14:04:23 +02:00
ansuz c5de4164bc make sure getIndex is always async in historyKeeper 2019-08-21 13:49:39 +02:00
ansuz 255f208a4a always enable tasks, but allow for admins to disable the integrated loop in the main server process 2019-08-21 13:36:27 +02:00
ansuz d30470f1aa correct an invalid comment 2019-08-21 13:22:43 +02:00
ansuz cdfbaf5ad9 write tasks along with metadata 2019-08-21 13:22:05 +02:00
ansuz 9623efd10b fix another non-standard instance of checking for metadata 2019-08-21 13:05:01 +02:00
ansuz b360d79a76 simplify 'isNewChannel' rpc 2019-08-21 12:54:24 +02:00
ansuz 7e13f7e3ca validate owners against amended metadata when removing channels 2019-08-21 12:46:45 +02:00
ansuz 31f7c4b90a validate owners against amended metadata when clearing channels 2019-08-21 12:45:19 +02:00
ansuz 8c92d3dc02 move metadata to the top of the file with all the other imports 2019-08-21 12:30:01 +02:00
ansuz c5ca82f0e1 throw errors if you try to update expiration times, as this isn't implemented yet 2019-08-21 12:28:19 +02:00
ansuz 0a0c64d240 only increment the metadata line index if you can parse the line 2019-08-21 12:26:46 +02:00
ansuz 1c37ec7aee prevent duplicated owners in metadata amendments 2019-08-21 12:25:17 +02:00
ansuz a3a7bcbe35 add comments for lots of functions 2019-08-21 12:15:27 +02:00
ansuz d6d7f4f601 include the size of the metadata log in the computed size of a channel 2019-08-21 12:14:49 +02:00
ansuz 2aebadcff3 use the correct path for channel data when restoring logs from the archive 2019-08-21 12:13:39 +02:00