Commit Graph
100 Commits
Author SHA1 Message Date
ansuz 6bb29e52e2 lint compliance 2017-08-31 18:45:18 +02:00
ansuz 1072e3e797 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-31 18:12:21 +02:00
ansuz ae60b5845f implement search-by-tag for filesData 2017-08-31 18:12:13 +02:00
ansuz 72ef730f23 implement tag-related functions 2017-08-31 18:06:26 +02:00
ansuz 0302c06d0e send feedback if client does not support symbols 2017-08-31 18:04:20 +02:00
ansuz 52019dc763 make get and set pad attribute return only cloned data 2017-08-31 18:02:44 +02:00
ansuz 9a23b77b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-30 11:31:59 +02:00
ansuz ba0e935add stub localStorage, and handle errors that might come from touching localStorage 2017-08-30 11:31:49 +02:00
ansuz be8ea4102e keep trying to parse the hash until it works 2017-08-30 11:26:51 +02:00
ansuz a34d1793e0 drop 'loading' text from loading screen 2017-08-29 18:15:40 +02:00
ansuz 2ef4ebc6ef two new tips for the loading screen 2017-08-29 17:56:34 +02:00
ansuz 595fa4c2e4 Merge branch 'soon' 2017-08-29 12:00:16 +02:00
ansuz ca8f05a16f bump package version 2017-08-29 11:53:50 +02:00
ansuz 181a19a9a0 polyfill for array.fill 2017-08-29 11:49:10 +02:00
ansuz 570ff75a6c update footer for latest version 2017-08-29 11:12:08 +02:00
ansuz 40f062abda restore app usage report in new pad 2017-08-29 10:50:02 +02:00
ansuz 8fb7fef3f5 regular expressions are never falsey 2017-08-29 10:37:19 +02:00
ansuz 24eac9b4a6 test for flakey tests 2017-08-28 18:42:04 +02:00
ansuz 7d2a76f4d6 delete dead code. fix off-by-one for messages. turn off history button when history is exhausted 2017-08-28 18:32:43 +02:00
ansuz 288c03bb41 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 17:52:01 +02:00
ansuz 430a6f7b77 lint compliance 2017-08-28 17:51:50 +02:00
ansuz 1280cd1659 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 14:49:01 +02:00
ansuz 536fe04790 emit notification when alert, confirm, or prompt are called 2017-08-28 13:46:28 +02:00
ansuz 5fbbaee2f5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 11:48:02 +02:00
ansuz 6314487d98 handle unfriends in ui 2017-08-28 11:47:54 +02:00
ansuz 5c2b58e703 log error synchronously so we get a trace when pinPads has no callback 2017-08-28 11:47:01 +02:00
ansuz 841e3af8da handle unfriends. clean up. better input validation 2017-08-28 11:46:05 +02:00
ansuz c66a0c55e0 ensure that function signatures are correct 2017-08-28 11:40:31 +02:00
ansuz 91f6e3e543 remove a lot of dead code 2017-08-28 11:28:45 +02:00
ansuz 54eefd3d94 replace contacts with contacts2 2017-08-25 16:07:53 +02:00
ansuz 57d0c6c973 Merge branch 'new-messaging' into staging 2017-08-25 14:42:34 +02:00
ansuz 9e04d039d7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-25 14:42:23 +02:00
ansuz 22d754d514 handle user renames 2017-08-25 14:42:05 +02:00
ansuz a99eb9365e correctly set indentation preferences when changing languages 2017-08-24 17:31:04 +02:00
ansuz f9cdbe66a0 add forgotten translation string 2017-08-24 17:20:59 +02:00
ansuz f58d4c941f clean up a bit 2017-08-24 17:19:57 +02:00
ansuz ea5f47f0f9 remove some TODOs and solve some wee bugs 2017-08-24 17:18:59 +02:00
ansuz b75a951a98 encode messages with 'author' field instead of 'channel' 2017-08-24 17:14:03 +02:00
ansuz 78404ce8b7 add npm sub-commands 2017-08-24 11:34:46 +02:00
ansuz 013b75ae67 implement history range requests 2017-08-24 11:34:05 +02:00
ansuz b71f1860db make uid function reusable 2017-08-24 11:31:20 +02:00
ansuz 443d8a8941 remove unnecessary files 2017-08-24 11:29:42 +02:00
ansuz 89a13d4b21 work on contacts2 until feature parity is reached 2017-08-22 15:55:49 +02:00
ansuz 002eed0d6f make most of the messenger api async 2017-08-22 15:55:00 +02:00
ansuz 253ab68d8d Merge branch 'staging' into new-messaging 2017-08-18 15:31:06 +02:00
ansuz 0693a98890 create a thumbnail when uploading images from whiteboard 2017-08-18 12:53:02 +02:00
ansuz b17044ad98 add support for thumbnails in metadata 2017-08-18 12:47:04 +02:00
ansuz a4dbf39c4a fix pdf display problems in chrome 2017-08-17 18:11:46 +02:00
ansuz bed7d95bf3 use latest compiled cryptpad media-tag 2017-08-17 17:31:52 +02:00
ansuz 4e62f79594 stop referring to deleted file as background image 2017-08-17 17:31:18 +02:00
ansuz 3a5526e247 infer pdfjs document title from iframe url 2017-08-17 17:30:28 +02:00
ansuz a125253cde lint compliance 2017-08-17 15:13:05 +02:00
ansuz 290763d6c5 don't complain about bad realtime state just because you disconnected 2017-08-17 15:07:34 +02:00
ansuz 3b20dcd435 add optional cache-busting to favicon 2017-08-17 14:34:22 +02:00
ansuz 48fe3ef841 add a tip about cryptdrive 2017-08-17 14:25:24 +02:00
ansuz 839c6df3bb remove invalid loading screen tips. create a new one 2017-08-17 14:16:37 +02:00
ansuz 52d344c3d1 Merge branch 'soon' 2017-08-17 12:53:04 +02:00
ansuz 95404992da Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-17 12:51:58 +02:00
ansuz ee874878dd clear tooltips when the userlist is redrawn 2017-08-17 12:50:40 +02:00
ansuz f207edfd28 handle errors when deriving keys. fix incorrect reference 2017-08-17 12:50:12 +02:00
ansuz 5b7d1cccd7 fix display and logic for tab setting checkbox 2017-08-16 15:32:42 +02:00
ansuz 1fd49d66f8 Merge branch 'soon' 2017-08-16 13:40:13 +02:00
ansuz 2874ccb5dc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 12:15:20 +02:00
ansuz 2a8abc2699 comment out splitter code 2017-08-16 12:15:08 +02:00
ansuz 46e47b454d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:34:54 +02:00
ansuz 127b6dbc6b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:34:35 +02:00
ansuz 8b5519ad29 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:31:09 +02:00
ansuz 2b7dcbe77c remove bs class that caused poor alignment sometimes 2017-08-16 11:30:56 +02:00
ansuz 9213aa7ee4 simplify example config 2017-08-16 11:02:03 +02:00
ansuz 7537caf8fe make footer translateable 2017-08-16 10:51:08 +02:00
ansuz bd45aeaa03 bump package.json version 2017-08-16 10:31:47 +02:00
ansuz d3a298d639 Merge branch 'ui-integration' into staging 2017-08-16 10:20:34 +02:00
ansuz 8ee5e14a60 merge ui-integration 2017-08-16 10:20:05 +02:00
ansuz 130b330ede refactor messaging 2017-08-16 10:04:50 +02:00
ansuz 9a6bf302b4 ignore ckeditor hacks 2017-08-14 18:12:05 +02:00
ansuz 5e6e76dfc1 make regex case insensitive 2017-08-14 14:41:23 +02:00
ansuz 736288a85b lint compliance 2017-08-14 14:02:57 +02:00
ansuz 5037f444e9 update markdown sanitization strategy 2017-08-14 13:12:43 +02:00
ansuz 9b86003722 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-11 15:22:43 +02:00
ansuz 66cacf08da allow users to write with tabs instead of spaces 2017-08-11 15:21:26 +02:00
ansuz 64849507b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-11 14:26:34 +02:00
ansuz 328107be4d translation key for using tabs 2017-08-11 14:26:08 +02:00
ansuz 958294f109 put code settings in their own tab 2017-08-11 13:00:50 +02:00
ansuz ae0b2ca1a8 add label for code indentation 2017-08-11 12:55:10 +02:00
ansuz 7f2b7fc287 show Your CryptDrive, if logged in. fix typos 2017-08-11 11:32:21 +02:00
ansuz f4e5e67a68 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-11 11:00:06 +02:00
ansuz 284124a32d WIP 2017-08-11 10:59:54 +02:00
ansuz 1c526feffb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-10 18:06:58 +02:00
ansuz fbb880f277 implement customizable indentation widths 2017-08-10 18:06:47 +02:00
ansuz 844967a880 continued refactoring 2017-08-09 14:20:37 +02:00
ansuz 34a5a32c44 lint compliance 2017-08-08 20:29:02 +02:00
ansuz cdf3cee9c8 split out message rendering into ui 2017-08-08 18:21:03 +02:00
ansuz fcdfa52aa9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-08 17:13:38 +02:00
ansuz 58b3b32cc3 big messaging refactor. split UI from logic 2017-08-08 17:13:10 +02:00
ansuz fc95f1b6a8 lint compliance 2017-08-08 10:32:25 +02:00
ansuz ba9696ba33 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-08 10:03:54 +02:00
ansuz c63807fd2b implement channel.send 2017-08-07 17:24:16 +02:00
ansuz d835005905 simplify in-memory message format 2017-08-07 17:22:56 +02:00
ansuz 797cc2b105 handle messages which fail to decrypt 2017-08-07 17:21:23 +02:00
ansuz bad5160885 fix bad reference 2017-08-05 09:14:36 +02:00