Commit Graph
100 Commits
Author SHA1 Message Date
ansuz 7b37146034 don't let spacebar keyups propagate outside of the title 2017-06-26 18:32:29 +02:00
ansuz 9195c0cd12 is isOverPinLimit in toolbar 2017-06-26 18:13:06 +02:00
ansuz fce0a37f50 cache pin data once retrieved from the server 2017-06-26 17:32:31 +02:00
ansuz 51e06e68a7 don't change slides when navigating through history 2017-06-26 14:40:48 +02:00
ansuz ffcbde4325 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-26 14:32:42 +02:00
ansuz 48ece55ed5 style fixes, and dynamic less compilation 2017-06-26 14:32:37 +02:00
ansuz f181e8db60 correct parentheses 2017-06-26 10:45:27 +02:00
ansuz b4b851959f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-22 17:42:32 +02:00
ansuz 61a891267f more feedback 2017-06-22 17:42:24 +02:00
ansuz bd1db735dd jshint compliance 2017-06-22 16:02:20 +02:00
ansuz 35bfa1dce4 test client-side templates in whiteboard app 2017-06-22 16:01:33 +02:00
ansuz 852c028822 don't allow editing if pad type is wrong 2017-06-22 14:31:55 +02:00
ansuz eddfb936f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-22 11:12:51 +02:00
ansuz 115813c191 Merge branch 'new-templates' into staging 2017-06-22 11:11:32 +02:00
ansuz 3657e978fd give main2.js a more sensible name 2017-06-22 11:06:11 +02:00
ansuz e86ef209a8 define loading screen markup in js 2017-06-22 11:04:21 +02:00
ansuz 118b83c420 make register and login user clientside templates 2017-06-22 10:04:46 +02:00
ansuz ab54dcf84d make libs pass jshint 2017-06-22 10:03:58 +02:00
ansuz 48f9745619 clientside templating 2017-06-21 18:02:38 +02:00
ansuz 9be23be5eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 18:09:57 +02:00
ansuz b80d7513aa skip over the terms of service link 2017-06-19 18:03:39 +02:00
ansuz e2ff88e4c4 tooltips for file upload 2017-06-19 17:56:19 +02:00
ansuz d822dfe37a add forget button to file app 2017-06-19 17:44:30 +02:00
ansuz 7fd36a72f3 re-add download button for file app 2017-06-19 17:36:22 +02:00
ansuz f02a381e32 avoid horizontal scrollbars 2017-06-19 16:30:03 +02:00
ansuz cc5d5d4f1d make pdfs in file app big 2017-06-19 16:13:11 +02:00
ansuz 17838f1d70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 14:55:45 +02:00
ansuz 1b66383bac don't create color-picker if readonly 2017-06-19 14:55:34 +02:00
ansuz b2a70f86d3 disallow concurrent logins 2017-06-19 14:22:21 +02:00
ansuz 35e0de463b disallow concurrent scrypt cycles 2017-06-19 14:18:10 +02:00
ansuz 06ca70d11e lint compliance 2017-06-19 14:05:40 +02:00
ansuz f29f430e7c better handling of non-rpc messages 2017-06-19 12:38:24 +02:00
ansuz 44b8bc7b7d make context menus unselectable 2017-06-19 11:43:24 +02:00
ansuz 335db9b4c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 11:30:25 +02:00
ansuz e4dccd7ea8 cache blobs for a year unless you're in dev mode 2017-06-19 11:29:13 +02:00
ansuz 0e9ebddf11 fix the things 2017-06-15 18:13:24 +02:00
ansuz c0e2c1060e don't reload when slide hash changes 2017-06-15 17:54:35 +02:00
ansuz 3f85471ab3 update footer and package.json for upcoming version 2017-06-15 16:13:33 +02:00
ansuz 06eceed8b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 15:34:22 +02:00
ansuz 17146d7af9 send feedback for uploads 2017-06-15 15:34:13 +02:00
ansuz 2a262555ed add suggested CSP types for media tags 2017-06-15 14:42:27 +02:00
ansuz 5ce453afa0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 13:51:11 +02:00
ansuz e73e32ab3a fix too-tall download button 2017-06-15 13:43:32 +02:00
ansuz c2e5ef7048 better sizing for videos 2017-06-15 12:11:39 +02:00
ansuz c717d01714 fix pdf height 2017-06-15 12:06:53 +02:00
ansuz b480346f5b more efficient media-tag 2017-06-15 12:05:25 +02:00
ansuz 0d47e68d3e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-15 11:19:24 +02:00
ansuz 0eb50b8b6c drop pdf.js dependency 2017-06-15 11:19:06 +02:00
ansuz 20874c76f1 prevent code blocks from overflowing slides 2017-06-14 18:56:44 +02:00
ansuz d25a0893cf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-14 17:24:49 +02:00
ansuz 3184e5d235 don't reload page on hash mode change 2017-06-14 17:24:44 +02:00
ansuz 9870169e03 remove a few elements from CKEditor config 2017-06-14 15:39:33 +02:00
ansuz 295f9c00a6 send feedback on buttons 2017-06-14 15:36:46 +02:00
ansuz d5c7eb49a4 send feedback on toolbar hide and CKE buttons 2017-06-14 15:33:12 +02:00
ansuz 687b4d8307 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-14 11:10:26 +02:00
ansuz 69c3bd392f update built media tag to latest XWiki version 2017-06-14 11:09:51 +02:00
ansuz e631818268 format probable server URL when printing to the console at launch 2017-06-14 10:27:29 +02:00
ansuz 802146e2af don't put download buttons in a div 2017-06-13 17:54:15 +02:00
ansuz 17e4e9be27 download anything that isn't an image in media-tag 2017-06-13 16:12:13 +02:00
ansuz 1b574da053 fix typo 2017-06-13 12:24:32 +02:00
ansuz 7ad89bd9af don't interrupt boot because of localStorage failure 2017-06-13 12:02:36 +02:00
ansuz 3337e2133a more thorough tests for localStorage presence 2017-06-13 11:57:21 +02:00
ansuz 100cc1792a non-existent files have size 0 2017-06-13 11:47:22 +02:00
ansuz c779e328e8 warn users if their browser does not support localStorage 2017-06-13 11:33:25 +02:00
ansuz d367f71760 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 11:24:57 +02:00
ansuz c70eb73d52 Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 11:24:20 +02:00
ansuz 278125747c only log errors if there is an error 2017-06-13 11:18:14 +02:00
ansuz 12f581bb1c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 11:14:32 +02:00
ansuz 977faee40b expose more debugging information from rpc errors 2017-06-13 11:14:01 +02:00
ansuz c9725af508 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-12 14:34:01 +02:00
ansuz db9b9547d9 don't complain about missing callbacks for messages which are not our responsibility 2017-06-12 14:33:50 +02:00
ansuz b3221c0fb4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-12 12:32:48 +02:00
ansuz 0c957989d2 add link to upload table when complete 2017-06-12 12:31:52 +02:00
ansuz 4bcad3e154 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-09 16:26:36 +02:00
ansuz 47857ec382 use cached pinned usage data 2017-06-09 16:17:20 +02:00
ansuz 08902c0910 drop extraneous argument 2017-06-09 15:33:28 +02:00
ansuz 23318357a6 make fewer RPC calls for usageBar 2017-06-09 15:33:03 +02:00
ansuz df586a223c update limits, usage, plan, and note whenever they are checked 2017-06-09 15:31:43 +02:00
ansuz 8bad0c556e change log to error 2017-06-09 15:29:55 +02:00
ansuz b0e00d337e more careful validation 2017-06-09 15:28:53 +02:00
ansuz c4e5741ae0 update upgrade button logic 2017-06-09 12:12:39 +02:00
ansuz f1a9002417 use upgradeURL with usage bar 2017-06-09 10:46:11 +02:00
ansuz fe2fef5e4c support dragging and dropping multiple files 2017-06-08 18:12:17 +02:00
ansuz 8bee45d0f4 don't try to replace undefined 2017-06-08 15:27:28 +02:00
ansuz 52975a2f09 allow users to pin the first time, even if they are over their limit 2017-06-08 15:26:51 +02:00
ansuz fe42f5e88c ask for new cookies and resend commands on NO_COOKIE errors 2017-06-08 14:19:14 +02:00
ansuz e723228060 always show upgrade button in drive 2017-06-08 14:03:01 +02:00
ansuz 192a517e64 handle nonexistent files in getUploadSize 2017-06-08 14:02:26 +02:00
ansuz 5bd7e19ddd guard against invalid channels, make session expiration time configurable 2017-06-08 14:02:06 +02:00
ansuz aa296eadff pass correct argument into getFileSize 2017-06-08 14:00:48 +02:00
ansuz da533b106a improve type checking in getFileSize 2017-06-08 11:24:20 +02:00
ansuz 5cbfc1a23c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-07 10:14:51 +02:00
ansuz 2f851ab97e fix lint errors 2017-06-07 10:13:51 +02:00
ansuz d25477e8c6 don't let tooltips interfere with DOM interaction 2017-06-06 18:08:23 +02:00
ansuz f43132a63b bump version in footer and package.json 2017-06-06 10:01:07 +02:00
ansuz ec9a4dec5e Merge branch 'soon' into staging 2017-06-05 11:43:26 +02:00
ansuz cc85e674f1 Merge branch 'master' into soon 2017-06-05 11:43:02 +02:00
ansuz 8d4017b79e fix parse error 2017-06-05 11:35:05 +02:00
ansuz 77d4ffba86 animate preview mode sidebar 2017-06-02 17:39:45 +02:00
ansuz 65233c2464 remove unused variable 2017-06-02 16:16:17 +02:00