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

4681 Commits (d6b6b8f11f358dd9059516816d6f8d4f6bb4f693)

Author SHA1 Message Date
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
ClemDee 4f84a928a9 Small fixes and improvements 2019-08-13 18:05:03 +02:00
ClemDee f55c8c6b04 Open plain text files in code app && plain text files thumbnail 2019-08-13 16:09:06 +02:00
yflory 06748dcfb3 missing comma 2019-08-13 14:23:29 +02:00
ClemDee 23dc301eb1 Small fixes in sframe-common-file 2019-08-12 18:44:25 +02:00
yflory bbd59c6a2b Don't freeze the UI with old (invalid) states of the drive history 2019-08-12 16:14:51 +02:00
yflory 21658e9de1 Fix restoring an older version of the drive 2019-08-12 15:52:48 +02:00
ClemDee e1655ccd5c Drive contextmenu handlers optimisation 2019-08-12 15:40:26 +02:00
yflory 970dcb8b8b null is an object 2019-08-12 15:40:25 +02:00
yflory 3303e9738d Fix drive deletion 2019-08-12 15:38:21 +02:00
yflory 20ba9f86ff Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-12 15:34:08 +02:00
ansuz 628b8866cb
Merge pull request #426 from xwiki-labs/responsiveContextmenu 
Responsive contextmenu
 2019-08-12 15:31:54 +02:00
ClemDee 6548ec346c Add missing semicolon 2019-08-12 15:31:21 +02:00
yflory 5c6b3155ac Add safety measures to avoid removing your drive by accident 2019-08-12 15:30:59 +02:00
ClemDee 4351ece256 Change 'Other pads' title to 'More Pads' in contextmenu 2019-08-12 15:29:13 +02:00
ClemDee 1b05fb982c Ensure there are not two context submenus opened at the same time 2019-08-12 15:26:07 +02:00
ClemDee 9586695c75 Reorganize / add pads in contextmenu 2019-08-12 15:22:15 +02:00
ansuz 0de0d46dd3
Merge pull request #425 from xwiki-labs/fixTippyInWhiteboard 
Fix tippy in whiteboard
 2019-08-12 14:27:17 +02:00
ClemDee 6bcf9f13d3 Merge branch 'staging' into responsiveContextmenu 2019-08-12 12:16:07 +02:00
yflory d823deff92 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-12 12:15:17 +02:00
yflory a0598bf377 Fix infinite onChange loop in metadata 2019-08-12 12:15:06 +02:00
ClemDee b481b99441 Fix infinite function call recursion in whiteboard 2019-08-12 11:44:24 +02:00
ansuz ecffe23c08
Merge pull request #424 from xwiki-labs/fixSharingSettings 
Fix edit mode not default for url in drive share modal
 2019-08-12 11:12:35 +02:00
ansuz c76c3130cb
Merge pull request #423 from xwiki-labs/downloadFilesFromPad 
Download files from pad
 2019-08-12 10:55:42 +02:00
ClemDee c3c918cce7 Fix classname of contextmenu options 2019-08-12 10:55:03 +02:00
ansuz da3763a14b
Merge pull request #422 from xwiki-labs/contextmenuIconsEverywhere 
Contextmenu icons everywhere
 2019-08-12 10:52:07 +02:00
ClemDee e29e105bb0 Add comment to get the code more friendly 2019-08-12 10:50:12 +02:00
ClemDee cc5d060bce Fix edit mode not default for url in drive share modal 2019-08-09 16:15:33 +02:00
ClemDee 06f224bdfe Remove infinite function call recursion in whiteboard 2019-08-09 15:20:42 +02:00
ClemDee fb2da27115 Add download file from contextmenu in code and slide apps 2019-08-09 14:06:37 +02:00
ClemDee 73051ad30f Change save-in-your-cryptdrive icon on code contextmenu 2019-08-09 13:28:09 +02:00
ClemDee 095dfadbb0 Revert some pending stuff to be able to merge to staging 2019-08-09 11:48:57 +02:00
ansuz 2329b49678
Merge pull request #419 from xwiki-labs/readPlainTextFiles 
Read plain text files
 2019-08-08 17:53:03 +02:00
ClemDee a79ddf39ad Fix missing semi-colon 2019-08-08 17:49:40 +02:00
ClemDee 98abe3d791 Add file plugin to display plain text files 2019-08-08 17:49:19 +02:00
ansuz 592df7e152
Merge pull request #418 from xwiki-labs/cryptDriveStuff 
Crypt drive stuff
 2019-08-08 17:27:31 +02:00
ansuz 4e02135230
Merge pull request #417 from xwiki-labs/stripTag 
Strip tags
 2019-08-08 17:23:17 +02:00
ansuz 20815eb725
Merge pull request #416 from xwiki-labs/dontClickMoreThanOnceOnTheStorePadInDriveButton 
Dont click more than once on the store pad in drive button
 2019-08-08 17:22:11 +02:00
ClemDee eaae63f275 Correct stupid error 2019-08-08 17:21:00 +02:00
ansuz 24da4d8fc8
Merge pull request #415 from xwiki-labs/chatMarkdown 
Chat markdown
 2019-08-08 17:18:18 +02:00
ClemDee 24b1720d48 Improve APP.isMobile function 2019-08-08 17:04:09 +02:00
ClemDee 938bc0a4b2 Escape HTML tags from markdown for pad title 2019-08-08 16:47:45 +02:00
ClemDee 55d53cfac6 Prevent blocking UI if user disconnected 2019-08-08 16:42:21 +02:00
ClemDee 5679dd9fee Clean code 2019-08-08 16:34:56 +02:00
ansuz 1a8460aa11
Merge pull request #413 from xwiki-labs/driveHorizontalScrollbar 
Fix horizontal scrollbar in drive
 2019-08-08 15:54:21 +02:00
ansuz c66e1f02c2
Merge pull request #412 from xwiki-labs/downloadFiles 
Download files
 2019-08-08 15:35:09 +02:00
ansuz a9445155c9
Merge pull request #411 from xwiki-labs/cursorJsColor 
Cursor js color
 2019-08-08 15:04:08 +02:00
ClemDee ce6e4b0838 Remove useless code 2019-08-08 14:46:28 +02:00
ansuz 1fe2d39385
Merge pull request #410 from xwiki-labs/ctrlE 
Change ctrl+E default modal to new-pad modal in drive
 2019-08-08 14:35:40 +02:00
ClemDee 63dab2fefc Fix indent behaviour of Codemirror 2019-08-07 17:41:01 +02:00
ClemDee 5e1426bee0 Remove test context submenus 2019-08-07 12:27:19 +02:00
ClemDee 38e955e490 Set timeout before hiding submenu 2019-08-07 12:14:10 +02:00
ClemDee 3191b3cbdd Fix remaining context submenu issues 2019-08-07 12:06:55 +02:00
ClemDee 7e1425394a Move all create new pad in a submenu of the contextmenu 2019-08-07 10:43:31 +02:00
ClemDee c45b64ffe7 Change ctrl+E default modal to new-pad modal in drive 2019-08-06 16:39:58 +02:00
ClemDee 4b027e83ad Download folders in drive - test (no UI) 2019-08-06 13:48:55 +02:00
ClemDee 4f26986fde Download pads in drive - test 2019-08-06 12:27:54 +02:00
ClemDee 1f1614704e Fix visual issue when dragging an image only the image is ghost 2019-08-06 10:10:56 +02:00