Commit Graph

2301 Commits (9c69c9acd714bd10a8213fbe7c081bf8d4d940a1)

Author SHA1 Message Date
yflory ca45ff31d1 Refactor messenger to use commands from UI to store 2018-11-27 16:55:56 +01:00
yflory f5965716b6 Minor update because of flow... 2018-11-27 13:58:33 +01:00
yflory 2a46b8f855 Fix an issue with last known hash in the messenger 2018-11-27 13:42:11 +01:00
yflory dbad925e5e New cursor recovery system (beta) 2018-11-26 16:23:16 +01:00
yflory 13d6579861 Add typing test in the code app 2018-11-22 14:45:12 +01:00
ansuz 1b83431382 Merge branch 'master' of https://git.xwikisas.com/xwiki-labs/cryptpad 2018-11-20 13:11:49 +01:00
ansuz d407f9af74 downgrade an XXX to a FIXME 2018-11-20 11:27:59 +01:00
ansuz fcce48f2dd Merge branch 'soon' into staging 2018-11-20 11:12:41 +01:00
yflory 8522c3723d Translations for the NGI logo 2018-11-19 17:08:20 +01:00
yflory 3a4cfbb7e8 Disable HTML in chat 2018-11-13 17:19:28 +01:00
yflory 22f1ac9e1e Merge branch 'master' of github.com:xwiki-labs/cryptpad 2018-11-13 14:21:24 +01:00
yflory fc915e3337 Use DiffMarked in messenger to avoid duplicate code 2018-11-13 14:14:23 +01:00
yflory b166c70a5f Fix conflict when a user was reverting the latest patch from someone else 2018-11-09 16:38:16 +01:00
yflory 8f849d8d4a Merge branch 'staging' into cursor 2018-11-08 18:24:33 +01:00
yflory 4daa2266c0 Fix new network open for each shared folder 2018-11-08 18:24:06 +01:00
yflory fe0d579d56 Cursor improvements in pad (Beta) 2018-11-08 12:06:46 +01:00
yflory 82c3c7f50b Improve the Typing Test in pad 2018-11-08 10:46:07 +01:00
yflory a5b04bd62a Download a file from the drive using the context menu 2018-11-06 18:35:04 +01:00
Paul Libbrecht 3f2e6b0611 completion 2018-11-06 13:01:17 +01:00
yflory 4e26a8fbc5 Merge branch 'soon' into staging 2018-11-06 10:47:03 +01:00
Paul Libbrecht 12b2224dad Bad syntax error left. Sorry. Now fixed.
paul
2018-11-05 19:10:56 +01:00
yflory b74e086602 Shortcuts are now added from sframe-common 2018-11-05 17:46:51 +01:00
yflory 05e7d5eb9b Add missing translation 2018-11-05 17:32:25 +01:00
yflory 997692efb4 Use the font-size codemirror setting in the slide app too 2018-11-05 17:30:07 +01:00
yflory 1c5847dd01 Prevent Ctrl+S from saving useless content. Add support for custom shortcuts in CkEditor 2018-11-05 16:53:25 +01:00
yflory 1d31aab990 Display more warning messages about the full drive export 2018-11-05 15:09:32 +01:00
yflory 7509ce1cc7 Use new application icons 2018-11-05 12:02:27 +01:00
Paul Libbrecht 31a6fac4e0 Update German translation with latest phrases. Paul 2018-11-02 21:03:20 +01:00
ansuz ef08771ffa
Fix typo in German translation, closes #290
s/Unbenennen/Umbenennen
2018-10-29 12:11:16 +01:00
yflory db25d914ab Improve default UI for small or zoomed screens 2018-10-29 11:48:22 +01:00
yflory 8b554dec63 Set font size in code editor from the settings page (#140) 2018-10-29 11:46:57 +01:00
yflory e4daa5adbe Fix random character insertion 2018-10-25 17:26:46 +02:00
yflory 98db6057c8 Allow shared workers by default 2018-10-23 15:06:17 +02:00
yflory 3c99302c32 Update French translation 2018-10-23 14:21:42 +02:00
yflory 4e3c09f640 Merge branch 'master' into staging 2018-10-22 17:22:28 +02:00
yflory 6924541080 Merge branch 'move' into staging 2018-10-22 17:13:41 +02:00
yflory 85cb56df1d Import changes from pull requests in master (translation files were moved) 2018-10-22 17:11:17 +02:00
yflory fc86e5daf8 French translation 2018-10-22 15:13:55 +02:00
yflory ef37bac2e7 Add UI for the CryptDrive export 2018-10-19 18:38:35 +02:00
yflory 3e9e92dcac Implement full CryptDrive export 2018-10-18 18:50:38 +02:00
yflory 92ce311694 Basic CryptDrive export with pads 2018-10-17 14:32:33 +02:00
yflory f4d5a7567f Return an error when the pad has been deleted from the server 2018-10-16 17:49:24 +02:00
yflory 9f0398826d Make customized translations more maintainable 2018-10-15 18:38:41 +02:00
yflory caa72ba949 Remove dropdown menus scrollbar when space is available 2018-10-15 16:35:21 +02:00
yflory 3257914b17 Add support for PowerShell mode in codemirror 2018-10-08 11:16:38 +02:00
yflory bf55657993 Password-protected shared folders 2018-10-05 18:06:11 +02:00
yflory c127f0a5f6 Add a comment 2018-10-05 18:04:48 +02:00
yflory 7d3d3cf5ac Distinguish between two anonymous users in the chat 2018-10-05 18:04:20 +02:00
ansuz 90c905827d
Merge pull request #281 from ryanpcmcquen/patch-2
Typo fix: additionnal => additional
2018-10-05 10:22:03 -04:00
yflory 2a313a90e0 Don't rejoin a dropped channel on reconnect and leave chat channel 2018-10-04 11:08:23 -04:00
yflory 498703384f Don't rejoin a dropped channel on reconnect and leave chat channel 2018-10-04 15:29:34 +02:00
yflory 2a86db2001 New Features page 2018-10-03 17:25:04 +02:00
yflory 5cbe2f7c0f Fix tag autocomplete and Tags category in the drive 2018-10-03 15:22:13 +02:00
yflory 5d3d591228 Keep trying until the first tab is loaded 2018-10-02 18:14:06 +02:00
yflory c59d744d78 Fix loading a tab while another one is initializing the worker 2018-10-02 17:49:39 +02:00
ansuz 1d63419df8 update error handling, but leave the note to come back 2018-10-02 11:31:08 -04:00
yflory c5c6dc8223 Enable browser notifications for messaging tools 2018-10-02 12:08:25 +02:00
yflory 1201f2dcc4 Fix small UI issue 2018-10-01 18:28:25 +02:00
yflory 9a6e6f6e15 Fix User menu and link to drive in anonymous shared folders 2018-10-01 18:24:08 +02:00
yflory d78a00b5e1 Ese the correct document type in the text for the store corner popup 2018-10-01 17:35:19 +02:00
yflory 930677750c Merge branch 'anonsf' into staging 2018-10-01 16:21:53 +02:00
yflory 0a83840c9c View a shared folder with an unregistered user 2018-10-01 15:17:27 +02:00
Ryan P. C. McQuen df442f9b1e
Typo fix: additionnal => additional 2018-09-28 20:16:41 -07:00
yflory 17bc1ee703 Load shared folder when not logged in 2018-09-28 15:06:24 +02:00
ansuz e77f833652 come back to this error 2018-09-25 20:09:45 -04:00
ansuz ad4e36015b Merge branch 'soon' into staging 2018-09-20 11:44:56 -04:00
ansuz 91cff453f1 enable shared folders by default 2018-09-20 11:40:42 -04:00
yflory 0e9b30744b Add support for less highlighting 2018-09-19 17:06:39 +02:00
yflory 6b4643a916 Add syntax highlighting in code blocks rendered from markdown 2018-09-19 16:51:53 +02:00
ansuz 7deb346552 update to new marked lib without breaking custom renderers 2018-09-17 15:35:53 -04:00
yflory bd1b120ab1 Add feedback about crowdfunding 2018-09-17 16:02:52 +02:00
yflory f662036817 Change the hash in the address bar when browsing a shared folder 2018-09-17 15:10:10 +02:00
yflory 7a93927068 Fix UI issues with the new pad modals 2018-09-17 14:39:52 +02:00
yflory 179df27e3c Fix autostore not displaying the error message when over pin limit 2018-09-17 11:23:35 +02:00
yflory c1ef8243a1 Ability to select multiple files to upload (#275) 2018-09-17 10:31:27 +02:00
yflory 6c27d2964c Disable friends chat in pad messenger 2018-09-14 15:42:41 +02:00
yflory 1895d6cbd8 Disable crowdfunding message for premium users 2018-09-14 11:21:52 +02:00
yflory 6257b23f16 Crowdfunding config 2018-09-14 10:36:29 +02:00
yflory 716159d300 Add OpenCollective links 2018-09-13 18:47:46 +02:00
yflory d2c1ed5eff Implement reconnect function in the messenger 2018-09-13 15:44:48 +02:00
yflory 10823fc124 Add toolbar notification when the messenger is closed 2018-09-12 15:07:50 +02:00
yflory 5276dc0bf6 lint compliance 2018-09-12 14:53:55 +02:00
yflory 621fc9a897 Ability to disable messenger at a global level 2018-09-12 14:51:37 +02:00
yflory c38eb6588e Fix small issues with the messenger 2018-09-12 11:55:26 +02:00
yflory 6c6ce7b7a8 Fix messenger bugs 2018-09-11 17:42:00 +02:00
yflory ac989a1e73 lint compliance 2018-09-11 16:48:44 +02:00
yflory f3c36bfd57 Improve messenger initial history 2018-09-11 16:47:52 +02:00
yflory 40c7cdd7c8 Fix an issue with messenger while opening the same tab twice 2018-09-10 18:16:24 +02:00
yflory 216c94b1f0 Fix messenger notifications 2018-09-10 17:50:36 +02:00
yflory 382690e5c8 Don't open other pads' chat in the current pad's messenger 2018-09-10 17:43:19 +02:00
yflory cdce69e677 Improve messenger UI in apps 2018-09-10 13:20:01 +02:00
yflory d4dd58e7df Add a pad room when the messenger is active in a pad 2018-09-07 19:35:06 +02:00
yflory 9e27f111cb lint compliance 2018-09-06 18:45:53 +02:00
yflory e6743887fc Refactor contacts/messenger so that it is usable directly in the apps 2018-09-06 18:41:22 +02:00
yflory 525703e7d8 Fix autostore popup displayed for dropped files 2018-09-04 10:36:19 +02:00
yflory 855612e98b Make oo work with hashes v2 2018-09-03 11:20:32 +02:00
yflory bf9cf95292 Merge branch 'staging' into oo2 2018-09-03 10:49:12 +02:00
yflory ee1027ceb9 Ability to import mediatags to the drive 2018-08-31 15:41:08 +02:00
yflory 2bb7e68792 Remember previous values in the file upload modal 2018-08-30 12:14:37 +02:00
yflory 475301477f Progress bar for loading a pad (framework only) 2018-08-30 12:07:21 +02:00
yflory 264f7dc6a1 Move base64 migration prompt to corner and only when the pad is stored 2018-08-30 11:21:33 +02:00
yflory 7b06626581 Merge branch 'autostore' into staging 2018-08-30 10:26:19 +02:00
yflory 90c96bfb70 Prompt users to migrate base64 images to mediatags in the pad app 2018-08-29 18:20:34 +02:00
yflory b1f2d287b4 Add warning for chrome 68 users on Mac 2018-08-28 17:44:15 +02:00
yflory 256b7b5bb4 Phantom viewers potential fix 2018-08-28 16:28:32 +02:00
yflory 0e1c525c30 Fix an issue with new shared folder added to drive from another session 2018-08-28 14:29:13 +02:00
yflory d201e9a0cd Disable some toolbar features not available if the pad is not stored 2018-08-28 12:12:47 +02:00
yflory 9ebb598467 Make automatic pad storage configurable 2018-08-28 11:42:48 +02:00
yflory e8a5244362 Autostore base 2018-08-27 14:58:09 +02:00
yflory a117e329dc Add a Share entry in the drive's context menu 2018-08-23 12:34:44 +02:00
yflory e0b7f3f965 When importing a shared folder to the drive, open this folder directly 2018-08-23 11:55:14 +02:00
yflory 61659c1252 Fix template icon not overriden by a thumbnail in the PCS 2018-08-22 16:32:44 +02:00
yflory ce08d7b650 Merge branch 'master' into soon 2018-08-22 15:34:06 +02:00
yflory b084b892bd Fix cache issues with workers in firefox 2018-08-22 15:26:42 +02:00
ansuz af40e140f9 safety net for call of undefined function in mergeDrive 2018-08-16 16:59:52 +02:00
yflory a65e083fca Change PCS template icons 2018-07-28 11:38:22 +02:00
yflory 9a6fa4cbe2 Create a copy when uploading an owned file in a shared folder 2018-07-28 08:58:16 +02:00
yflory 20a9eee719 Disable shared folders creation by default 2018-07-20 18:41:14 +02:00
yflory f2baaf5b5b Fix shared folders issues including disappearing folders 2018-07-20 18:28:56 +02:00
yflory 4325ed4dde Fix small UI issues in drive 2018-07-20 12:29:18 +02:00
yflory bad1d7311a Fix drive tests 2018-07-20 12:04:42 +02:00
yflory d816a2ed9f Prevent timeout when restoring drive 2018-07-19 17:51:38 +02:00
yflory 2be78deb93 Fix Drive history 2018-07-19 17:07:14 +02:00
yflory 8c20c7823e Empty trash callback was missing 2018-07-19 15:32:45 +02:00
Caleb James DeLisle 5527949c70 Make LessLoader flow properly, sorry about that 2018-07-18 16:22:44 +02:00
yflory ef73cf89cd Merge branch 'soon' into staging 2018-07-18 15:10:23 +02:00
yflory 8eccffd8e4 Don't remove migrated read-only pads 2018-07-18 14:56:49 +02:00
yflory 64b51f3a80 jshint compliance 2018-07-18 14:25:48 +02:00
yflory ebfa2c2dc3 Merge branch 'less-less' into staging 2018-07-18 14:18:37 +02:00
yflory aafcb1bc02 Merge branch 'sharedfolder' into staging 2018-07-18 14:18:30 +02:00
Caleb James DeLisle 8d95efa144 Reference the relevant line in alertify.js 2018-07-18 13:22:27 +02:00
Caleb James DeLisle a57a8e51a1 Prevent alertify.js from overriding styles 2018-07-18 13:20:16 +02:00
ansuz e110f20397 support blocks on remote domains 2018-07-17 17:41:30 +02:00
yflory e59aec0a45 Try...catch on testworker.js 2018-07-17 16:46:24 +02:00
yflory 08005a709e Add a share icon in the drive when displaying a shared folder 2018-07-17 16:38:20 +02:00
ansuz 1629d7bb1d provide a SANE default in case httpUnsafeOrigin is not provided 2018-07-17 16:31:15 +02:00
ansuz bcbec0144c provide a default in case httpUnsafeOrigin is not provided 2018-07-17 16:20:40 +02:00
yflory 6143bceabb Fix XXX 2018-07-17 15:38:23 +02:00
ansuz a2fd32d6a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-17 14:49:19 +02:00
ansuz e6d4bced18 clean up extraneous variables and log statements 2018-07-17 14:34:25 +02:00
yflory ecb9f039b1 Fix pad password change not reloading with the correct URL 2018-07-17 12:27:23 +02:00
yflory c9ac3c7c2b Fix search in shared folders 2018-07-17 11:22:01 +02:00
yflory fc91cf606b Disable moveToTrash button for pads in shared folders 2018-07-16 18:05:23 +02:00
ansuz 2c22232a47 check if a user is logged in strictly by User_hash 2018-07-16 15:45:45 +02:00
ansuz 848a918eda remove out of date comments 2018-07-16 15:45:19 +02:00
yflory 5b48eff78c Remove owned pads deleted from the server in shared folders 2018-07-16 14:05:36 +02:00
ansuz b9c4aa43b5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-16 11:25:11 +02:00
ansuz 3d95e6088a leave a FIXME note 2018-07-16 11:24:58 +02:00
Caleb James DeLisle 792f7bcc64 show how long less takes to compile 2018-07-14 15:21:45 +02:00
Caleb James DeLisle 6c49318ac7 Show how long it takes to parse less 2018-07-14 15:19:39 +02:00
Caleb James DeLisle 0d5ac05866 refactoring of the less infrastructure 2018-07-14 15:15:23 +02:00
yflory b5c2eb8a9c Automatically refresh the drive when a change occurs in a shared folder 2018-07-13 19:24:49 +02:00
yflory 4706b8a9de Store newly created pads in the correct (shared) folder 2018-07-13 15:01:23 +02:00
yflory 6a80f49fe0 Don't load expired or deleted shared folders 2018-07-13 14:47:53 +02:00
Caleb James DeLisle a6d3dbf94f Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS 2018-07-12 19:13:04 +02:00
Caleb James DeLisle 4a352f2ed8 Use import (reference) whenever the less file supposedly emits no CSS 2018-07-12 18:43:17 +02:00
yflory 7d89026d83 Fix more issues with shared folders 2018-07-12 17:27:16 +02:00
Caleb James DeLisle c5105d7b84 Merge branch 'check-for-css-variables' into staging 2018-07-12 17:16:21 +02:00
Caleb James DeLisle a440359bc7 Commit patches provided to me by someone who Seemed Trustworthy At The Time
(should fix false negatives in shared-worker detection)
2018-07-12 16:59:36 +02:00
Caleb James DeLisle cb8888ea1a Yes, so it turns out that making a small asthetic change after testing on every browser does actually break it :| 2018-07-12 16:51:48 +02:00
Caleb James DeLisle fabdbc3b61 Add a feedback test for checking for CSS variables, so we won't use a feature which is not implemented by the vast majority of the people using CryptPad... 2018-07-12 16:02:46 +02:00
yflory 8516587ece lint compliance 2018-07-11 15:28:34 +02:00
yflory 9787f5304a Don't unpin channels that are still in another proxy 2018-07-11 15:28:24 +02:00
yflory 321c7d5512 Move pin/unpin outside of userObject 2018-07-10 18:23:16 +02:00
ansuz 8574128efd unstub password change function 2018-07-10 16:44:24 +02:00
ansuz 25b0d764ed pass initialState variable when copying your drive in the changeUserPassword function
because the hardest problems to debug are always fixed with one line changes
2018-07-10 16:42:11 +02:00
ansuz 54bc29f28c WIP maybe I missed something 2018-07-10 15:16:43 +02:00
yflory 66a494cbd2 temp 2018-07-10 15:10:07 +02:00
yflory 4b86ed2dec Shared folders UI 2018-07-10 14:41:37 +02:00
ansuz 0a9ea95796 always set userHash in localStorage even with modern users 2018-07-10 13:11:22 +02:00
yflory bc7524c134 Fix tippy 2018-07-10 10:39:21 +02:00
yflory 6312dadb60 Fix shared folders names in the drive 2018-07-09 18:11:04 +02:00
yflory e0cc1a6eb6 Display a shared folder in the drive 2018-07-09 14:36:55 +02:00
ansuz a15e232469 complete modern user registration/login. general cleanup 2018-07-09 14:20:38 +02:00
ansuz d79064a4c5 Merge branch 'staging' into modern-users2 2018-07-06 11:37:50 +02:00
ansuz 4ef2cfa88d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-06 11:37:00 +02:00
ansuz 57a39258c3 WIP big commit 2018-07-06 11:36:48 +02:00
ansuz 0c3b898000 simple one line fixes 2018-07-06 10:28:41 +02:00
yflory 0c9dfc1fb5 Add proxy manager inner 2018-07-05 16:33:46 +02:00
yflory bd6a199dca Add missing functions to the proxy manager 2018-07-05 13:56:16 +02:00
yflory a25a72b5db Add a proxy manager to handle operations between shared folders 2018-07-05 10:37:06 +02:00
yflory 66591a3654 Merge branch 'rohref' into sharedfolder 2018-07-02 14:12:06 +02:00
ansuz a3e0e765b5 derive block URI and URL in dedicated functions 2018-07-02 11:11:50 +02:00
yflory a99e5a3aaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-02 11:03:58 +02:00
yflory af5cc30381 Fix undefined function when calling error() in the drive 2018-07-02 11:02:43 +02:00
yflory 071c34d4fa Fix undefined secret with password-protected files (#250) 2018-07-02 10:51:43 +02:00
yflory 27797c0520 Fix undefined secret with password-protected files (#250) 2018-07-02 10:50:30 +02:00
yflory 425ac8ea57 Migration for read-only links + fix issues with read-only pads 2018-06-29 18:16:04 +02:00
yflory 0f9a71686e Add support for read-only href stored in filesData 2018-06-28 18:16:38 +02:00
yflory 34914785eb lint compliance 2018-06-28 16:15:38 +02:00
yflory a537f7de8b Fix infinite loading screen caused by some browser settings 2018-06-28 16:13:52 +02:00
yflory 470f404a24 temp 2018-06-28 15:31:30 +02:00
ansuz cfc81e8c96 allocate blockSeed as Uint8Array 2018-06-28 15:21:13 +02:00
yflory 554b4a978d Load shared folders in the store 2018-06-28 14:15:30 +02:00
ansuz 7aa7b82c60 merge staging 2018-06-28 13:33:54 +02:00
yflory 6dc7e7eff4 Disable WebWorkers by default 2018-06-26 14:15:25 +02:00
yflory bfb850554d Fix the contacts app with workers 2018-06-25 18:08:47 +02:00
yflory 87dc528a99 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-25 16:59:52 +02:00
yflory 6d8693ff8c Fix history mode UI 2018-06-25 16:59:40 +02:00
ansuz 7dc393a2d2 remove debug log 2018-06-25 15:33:54 +02:00