Commit Graph
100 Commits
Author SHA1 Message Date
ansuz fa06f9d413 fix minor bugs in poll 2017-07-04 15:09:09 +02:00
ansuz 90bcadd87b Merge branch 'soon' into staging 2017-07-04 14:58:45 +02:00
ansuz be7e7fec43 don't bypass warnings when registering 2017-07-04 14:56:07 +02:00
ansuz 42375190e6 style buttons for long titles 2017-07-04 14:24:07 +02:00
ansuz 43d4597f38 merge to master 2017-07-04 14:19:08 +02:00
ansuz 34fd6f4285 new version 2017-07-04 14:11:56 +02:00
ansuz c27c140130 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-04 12:37:50 +02:00
ansuz ac8da0d52d load codemirror in the correct context. fix selection events 2017-07-04 12:37:24 +02:00
ansuz 7377d39b39 hide print button 2017-07-04 10:35:55 +02:00
ansuz 43b877ad27 fix styling on media tag download button 2017-07-04 10:28:50 +02:00
ansuz 1fd0ba488a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-04 10:21:35 +02:00
ansuz 04a28433ae replace inner content of media tag download buttons 2017-07-04 10:21:29 +02:00
ansuz f85af7ef4c hide useless messages 2017-07-04 10:19:18 +02:00
ansuz a59853f9c2 use new media tag 2017-07-04 10:15:45 +02:00
ansuz 92d88d1644 don't change allowed media types until we have media-tag scoping 2017-07-03 16:45:40 +02:00
ansuz 678986dac4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 16:43:57 +02:00
ansuz 708d5ae35f remove noisy log calls 2017-07-03 16:43:49 +02:00
ansuz efedfe0667 show preview pane by default in /slide/ 2017-07-03 14:53:50 +02:00
ansuz 8b0210baf1 hide useless error 2017-07-03 12:26:34 +02:00
ansuz bf414c15ee fix logout button on home page 2017-07-03 12:26:08 +02:00
ansuz f09ae9b19c jshint compliance 2017-07-03 11:51:47 +02:00
ansuz 4a9a564913 don't try to handle error thta never happens anymore 2017-07-03 11:40:52 +02:00
ansuz b15aa3360a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 11:39:21 +02:00
ansuz 6ac056e314 make explicit file size RPCs unauthenticated 2017-07-03 11:38:39 +02:00
ansuz e52eda42df Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 11:21:06 +02:00
ansuz a91dbb67e3 more restrictive semver for external dependencies 2017-07-03 10:28:49 +02:00
ansuz c2e153e8ed more fouc fixes 2017-06-30 16:20:10 +02:00
ansuz 73cfecdf08 note which node version we use 2017-06-30 16:12:03 +02:00
ansuz 8ffad5ece6 FOUC fixes 2017-06-30 16:10:42 +02:00
ansuz 9e91739044 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 11:21:27 +02:00
ansuz ecff05425f feedback for slide printing 2017-06-30 11:21:19 +02:00
ansuz 75c2a1fd73 jshint compliance 2017-06-30 11:20:56 +02:00
ansuz b8934c0b97 smarter redraws of drive/settings usage bar 2017-06-30 11:20:40 +02:00
ansuz d2085c1269 enable logging of rpc calls 2017-06-30 11:19:12 +02:00
ansuz b7cb1a8d5f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 17:54:29 +02:00
ansuz b037cfbfdb set usage tips relative to bottom of screen, not top 2017-06-29 17:25:06 +02:00
ansuz 0b9d7d6c0b fix color of links in poll and whiteboard 2017-06-29 16:51:44 +02:00
ansuz 1763cf72d1 tell anonymous users they can't upload 2017-06-29 16:28:58 +02:00
ansuz 45f180955b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 15:20:46 +02:00
ansuz 1179992a90 update feedback key name 2017-06-29 14:48:33 +02:00
ansuz 4a5f5de78c restore missing stylesheet for poll 2017-06-29 14:35:23 +02:00
ansuz bbf9916a91 fixes for file app 2017-06-29 14:21:48 +02:00
ansuz 39149a052b add new feedback keys 2017-06-29 14:16:20 +02:00
ansuz 7a5c5ce0a3 load scripts asynchronously 2017-06-29 12:17:08 +02:00
ansuz 9b8866ed72 handle RPC_NOT_READY error for logged out users 2017-06-29 11:13:48 +02:00
ansuz a9f8f42e3c use minified less compiler 2017-06-29 10:50:21 +02:00
ansuz fca1ef4d36 hide unstyled content until the loading screen is displayed 2017-06-29 10:49:35 +02:00
ansuz c53ebe3598 bring upload status container to the front 2017-06-28 16:33:00 +02:00
ansuz 5e56ad912e remove the last bit of compiled css 2017-06-28 14:51:49 +02:00
ansuz 7a7307d560 fix logging when resetting 2017-06-28 12:08:16 +02:00
ansuz 9d83214158 forbid cache poisoning via botched reset calls 2017-06-28 11:36:34 +02:00
ansuz 7439bbaba2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-28 10:58:24 +02:00
ansuz ed45814020 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-28 10:57:49 +02:00
ansuz cfc5907237 remove unnecessary style rules 2017-06-28 10:41:08 +02:00
ansuz 1c1869a22c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-27 18:26:10 +02:00
ansuz 7de2683169 make all apps use clientside templates 2017-06-27 18:17:52 +02:00
ansuz f232675cc9 create a favicon if it does not already exist 2017-06-27 18:07:03 +02:00
ansuz 3be6433fdf send feedback on name changes 2017-06-27 18:06:32 +02:00
ansuz bdca6b10c2 use templates in poll.js 2017-06-27 15:38:12 +02:00
ansuz bb74935b08 allow pin limit caching to occur at api level 2017-06-27 15:37:42 +02:00
ansuz 3a9b480e4e resolve merge conflicts in template.js 2017-06-27 14:28:28 +02:00
ansuz 9b6790534f remove grey text from ckeditor initialState 2017-06-27 14:26:09 +02:00
ansuz e9bfaa9a60 compile less clientside. remove compiled css 2017-06-27 14:25:02 +02:00
ansuz 67a096a8a4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-27 09:57:32 +02:00
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