infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity
6,759 Commits
1 Branch
3 Tags
274 MiB
Commit Graph

4738 Commits (65b0112dcb42332738d5eb32d9e14cf21a770d9c)

Author SHA1 Message Date
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 fcab0d4b6e deprecate common/curve.js in favour of the bower version 2019-08-30 14:41:47 +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 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 2d5b6a53ff Fix UI issues with ownership management 2019-08-29 11:28:51 +02:00
yflory 3e53e43752 Fix drive export from settings and exported folder name 2019-08-29 11:01:06 +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
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 76410b479b Fix potential XSS issues if CSP is badly configured 2019-08-27 12:03:25 +02:00
yflory c62e279224 Fix share modal friends list 2019-08-27 11:37:39 +02:00
yflory c786735b1a Improve rendering of plain text mediatags 2019-08-27 11:02:03 +02:00
yflory 8957bbd782 Ability to set ownership and password when sharing a folder 2019-08-27 10:53:41 +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
yflory c9420200ce Fix download folder 2019-08-26 18:47:17 +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
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 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 ae1e221bdc Remove useless X in the download table 2019-08-22 18:04:38 +02:00
yflory fc72861721 Prevent users from opening a pad with the wrong app 2019-08-22 14:01:07 +02:00
yflory f966a479de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-20 13:55:46 +02:00
yflory 24ea640397 Kill the testworker to save memory usage 2019-08-20 13:55:37 +02:00
Clément Desableau e1477bd32e Make context submenus don't overflow on Y axis 2019-08-20 01:58:49 +02:00
yflory 06809fd3ba Update codemirror settings in realtime 2019-08-19 16:53:17 +02:00
yflory 92a41f84f7 Fix wrong owner in the properties modal 2019-08-19 16:00:55 +02:00
yflory c608bdd2dc Merge branch 'off' into staging 2019-08-19 15:38:22 +02:00
yflory 656b129543 Ability to remove handlers from worker-channel and metadata-manager 2019-08-19 15:37:08 +02:00
yflory c1656d7b5b Merge branch 'unifiedMetadata' into staging 2019-08-19 15:27:59 +02:00
yflory 6f0062d023 Add comments and timeout errors 2019-08-19 14:37:55 +02:00
yflory 3dba20776f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-19 13:40:24 +02:00
yflory 7988a30338 Fix folder upload UI 2019-08-19 13:39:40 +02:00
ansuz 08e9080dec
Merge pull request #428 from xwiki-labs/folderToSF 
Folder to sf
 2019-08-19 12:12:22 +02:00
ansuz a368948fb6 handle errors when converting folders to shared folders 2019-08-19 12:06:06 +02:00
ansuz 7d583975b8 fix a few things, add comments for others 2019-08-19 11:56:52 +02:00
ansuz 5dacc6ceeb Merge branch 'soon' into staging 2019-08-16 17:39:54 +02:00
ansuz 04feef793b resolve merge conflicts 2019-08-16 17:39:22 +02:00
Weblate 1af467aa84 Translated using Weblate (French) 
Currently translated at 100.0% (1039 of 1039 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
 2019-08-16 14:51:04 +00:00
ansuz dc65213130 Merge branch 'merge-plainTextFiles' into staging 2019-08-16 16:02:53 +02:00
ClemDee bd717f16e3 Add translation keys 2019-08-16 16:02:29 +02:00
ansuz bf3e638adc resolve merge conflicts, lint compliance 2019-08-16 16:02:10 +02:00
Weblate c9569a136d Translated using Weblate (Russian) 
Currently translated at 48.7% (502 of 1030 strings)

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

Translated using Weblate (Russian)

Currently translated at 47.1% (485 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
 2019-08-16 13:37:15 +00:00
Weblate c555a0f500 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 32.3% (333 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/pt_BR/
 2019-08-16 13:37:15 +00:00
Weblate 242677300b Translated using Weblate (German) 
Currently translated at 100.0% (1030 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
 2019-08-16 13:37:15 +00:00
Weblate 3511f3b802 Translated using Weblate (French) 
Currently translated at 100.0% (1030 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
 2019-08-16 13:37:15 +00:00
ansuz 32fa527dc9
Merge pull request #427 from xwiki-labs/exportFolder 
Export folder
 2019-08-16 15:02:02 +02:00
ClemDee 58a3f76464 Fix two comments 2019-08-16 14:35:07 +02:00
ClemDee f2063f3748 Remove translation fallbacks 2019-08-16 13:56:25 +02:00
ClemDee e8c98200ec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-16 13:52:32 +02:00
ClemDee a00ac64e0e Remove translation fallback 2019-08-16 13:51:55 +02:00
ClemDee 79b667c835 Remove translation fallback 2019-08-16 13:51:16 +02:00
yflory c4a90a90f2 Fix disconnection event not propagating to the UI 2019-08-16 11:33:57 +02:00
yflory ba24cde76d Fix cryptget not stopping chainpad-netflux when done 2019-08-16 10:23:58 +02:00
ClemDee 792ce4133b Fix a little thing that disappeared with the merge 2019-08-14 17:54:01 +02:00
ClemDee 75732ba373 Merge branch 'exportFolderTests' into exportFolder 2019-08-14 17:33:22 +02:00
ClemDee a0d85c6e34 Export folder is now working in drive 2019-08-14 17:27:37 +02:00
ClemDee 51241bda48 Merge branch 'staging' into exportFolderTests 2019-08-14 15:59:59 +02:00
yflory a327f4a0bf Fix cryptget memory issues 2019-08-14 15:59:16 +02:00
ClemDee f017215300 Add progress bar for pad download 2019-08-14 15:42:32 +02:00
yflory 9c26df4213 Add comments 2019-08-14 15:12:44 +02:00
ClemDee 2ee3b77a43 Merge branch 'staging' into exportFolderTests 2019-08-14 14:58:38 +02:00
yflory 3e56a88173 Add progress data when using cryptget 2019-08-14 14:57:14 +02:00
ClemDee bb9898fa35 Download files code refractoring 2019-08-14 14:49:40 +02:00
yflory 548c633375 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-14 14:45:19 +02:00
ClemDee f627837cd1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-14 10:44:50 +02:00
yflory eaeb995661 Remove debugging code 2019-08-14 10:38:42 +02:00
ClemDee 2a2f45ec25 Remove translation fallbacks 2019-08-14 10:36:53 +02:00
ClemDee a5405cb6a0 Set properties at the bottom of the contextmenu 2019-08-14 10:30:32 +02:00