Commit Graph

7208 Commits (bfd46fb570170c5ab43aaf2f8ad3659728d58ae5)

Author SHA1 Message Date
ansuz 54c2a61cd0 update some variable names to better reflect usage 2019-07-22 15:42:29 +02:00
ansuz 9a178f35ae add a few more comments and standardize an inline regexp 2019-07-22 15:36:37 +02:00
ansuz ddb1b7b019 add a bunch of comments to the historyKeeper 2019-07-22 15:34:36 +02:00
ClemDee ff66c4162b Add file plugin to display plain text files 2019-07-22 12:27:07 +02:00
ClemDee 9a25ac537a Add file plugin to display plain text files 2019-07-22 12:04:34 +02:00
ClemDee e542be75a3 Don't hide download panel if mouse over 2019-07-19 11:37:50 +02:00
ClemDee b74f7b5ec2 Set file upload progressbar responsive 2019-07-19 11:36:43 +02:00
ClemDee b49c39b895 Fix file progress value going over 100% 2019-07-19 11:34:30 +02:00
yflory 0636714829 Share with friends as template 2019-07-18 17:18:36 +02:00
yflory 4396fda0ff Remember share settings when sharing a pad with a friend 2019-07-18 16:58:57 +02:00
ClemDee 438ff211e1 Add condition to allow folder upload 2019-07-18 16:11:19 +02:00
ClemDee 5c5a6b963d Fix defaults options for folder upload 2019-07-18 16:07:14 +02:00
ClemDee 165feef7d4 Folder upload only shows a modal for global folder options 2019-07-18 15:22:09 +02:00
ansuz f2a7f8b7bc add some comments and rename some misleading variables 2019-07-18 12:16:53 +02:00
ClemDee 06cbabd373 Add extension in file name in upload options 2019-07-18 12:15:20 +02:00
ansuz 234fdc12b1 Merge branch 'staging' into editable-metadata 2019-07-18 11:57:59 +02:00
ansuz 29a4035b79 make a note about a small problem 2019-07-18 11:57:21 +02:00
ClemDee 1361334eaf Fix file name & extension in upload options 2019-07-18 11:45:10 +02:00
ClemDee 73dcce564e Functionnal folder upload 2019-07-18 11:38:33 +02:00
ClemDee a5310e323a Almost functionnal folder import 2019-07-17 18:02:25 +02:00
yflory e8ff7a9208 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-07-17 17:46:20 +02:00
Weblate d0001a71e7 Translated using Weblate (German)
Currently translated at 98.7% (1017 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-07-17 15:46:10 +00:00
Weblate 68d285746c Translated using Weblate (English)
Currently translated at 100.0% (1030 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-07-17 15:46:10 +00:00
yflory b524643af4 Display the owners names in the properties modal when we can 2019-07-17 17:45:44 +02:00
yflory 7105629f3d Merge branch 'staging' into unifiedMetadata 2019-07-17 17:21:16 +02:00
yflory e2c13d9724 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-07-17 17:01:46 +02:00
yflory d7630fd093 Fix translation key 2019-07-17 17:01:34 +02:00
yflory 51facff6fd Send a mailbox address (encrypted) to the owned pads metadata 2019-07-17 17:01:25 +02:00
yflory adef61672c Fix translation key 2019-07-17 17:00:43 +02:00
yflory f0d753e3f4 Merge branch 'staging' into unifiedMetadata 2019-07-17 15:25:01 +02:00
ansuz 14add53f99 Merge branch 'soon' into staging 2019-07-17 14:50:47 +02:00
ansuz 646d8e7341 add some comments to common-hash for new APIs 2019-07-17 14:50:22 +02:00
yflory 8e749d6a36 Remove old code 2019-07-17 14:32:15 +02:00
yflory bc38c50e0c Fix translation key again.... 2019-07-17 14:31:52 +02:00
ansuz 0b17df3302 add missing header to CHANGELOG 2019-07-17 14:24:40 +02:00
ansuz 0b36286fc8 2.25.0 changelog update 2019-07-17 14:16:19 +02:00
ansuz c42b572948 add a comment to the config file about the support keys 2019-07-17 14:16:06 +02:00
yflory 4e3ec86d8c Fix translation keys again 2019-07-17 13:26:04 +02:00
yflory f9162d41f7 Fix translation keys 2019-07-17 12:15:28 +02:00
ClemDee 3884ccb7f3 Add upload-folder icon 2019-07-17 12:15:14 +02:00
Weblate 85380b64cf Translated using Weblate (Russian)
Currently translated at 44.0% (447 of 1017 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
2019-07-17 10:13:04 +00:00
Weblate 2f93b9e836 Translated using Weblate (English)
Currently translated at 100.0% (1029 of 1029 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1028 of 1028 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1027 of 1027 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1026 of 1026 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1026 of 1026 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1025 of 1025 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1024 of 1024 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1023 of 1023 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1022 of 1022 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1021 of 1021 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1020 of 1020 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1019 of 1019 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1019 of 1019 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1018 of 1018 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-07-17 10:13:04 +00:00
yflory 1bb47e28ef Update icons 2019-07-17 12:00:55 +02:00
ClemDee e18433c7f9 Add dummy folder upload 2019-07-17 12:00:22 +02:00
yflory 05613c15b0 Merge branch 'master' into staging 2019-07-17 11:20:17 +02:00
yflory c72bffeb66 Update icons 2019-07-17 10:58:30 +02:00
yflory eee040a868 Fix 'req is undefined' 2019-07-17 10:50:51 +02:00
yflory 36a57b4007 Fix duplicate notifications n reconnect 2019-07-17 10:50:23 +02:00
yflory 7bc0c7ce95 Fix duplicate notifications n reconnect 2019-07-17 10:49:26 +02:00
yflory 64304c57d3 Update translation key 2019-07-17 10:48:25 +02:00