Commit Graph
100 Commits
Author SHA1 Message Date
ansuz 8ee5e14a60 merge ui-integration 2017-08-16 10:20:05 +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
ansuz 05aa5ed347 hide new feature until it is finished 2017-08-04 18:07:47 +02:00
ansuz 244f436f6e resolve merge conflict 2017-08-04 16:01:20 +02:00
ansuz 2a8311396e lint compliance 2017-08-04 16:00:06 +02:00
ansuz 395f6e1b27 reset confirm text for alertify 2017-08-04 15:54:15 +02:00
ansuz dd6a057962 add 'msg' class for pierre 2017-08-04 15:45:30 +02:00
ansuz 96b12d55fb add a return 2017-08-04 14:37:21 +02:00
ansuz b79adf4177 redirect to drive if logged in 2017-08-04 14:35:47 +02:00
ansuz c895d06193 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-04 14:26:31 +02:00
ansuz 252f40748a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-04 14:21:26 +02:00
ansuz 9865359bb0 don't tell users about new versions 2017-08-04 14:05:00 +02:00
ansuz c8c44d3bfc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-04 11:22:22 +02:00
ansuz 11c72499a0 don't add duplicate messages to the history 2017-08-03 17:06:28 +02:00
ansuz fb13e656b7 get new messages when reconnecting 2017-08-03 15:06:06 +02:00
ansuz 52854c5a8e ignore history range responses 2017-08-03 15:05:04 +02:00
ansuz e786117110 get new messages when reconnecting and WIP get more history 2017-08-03 15:04:29 +02:00
ansuz 2ce341fed6 disable input field when disconnected 2017-08-03 14:12:07 +02:00
ansuz aba4e34e7f reuse inline styles as a mixin 2017-08-03 12:17:33 +02:00
ansuz 195cb01d72 better styles for messaging input 2017-08-03 12:15:06 +02:00
ansuz 1fac0b9bc4 make todo text bold 2017-08-03 11:53:48 +02:00
ansuz 66d81429bd integrate file embed into code editor 2017-08-03 11:47:54 +02:00
ansuz dc7db074e8 open pad links when clicking in readOnly mode 2017-08-03 11:04:38 +02:00
ansuz 35867001cb add missing messages 2017-08-02 17:38:34 +02:00
ansuz 71d88b156d make empty profiles for users on first visit 2017-08-02 17:32:09 +02:00
ansuz 8b0831ac5d save images drawn with whiteboard to your CryptDrive 2017-08-02 16:51:41 +02:00
ansuz fe826133b3 make some markdown styles reusable 2017-08-02 11:03:06 +02:00
ansuz 0602fabc41 Merge branch 'soon' into staging 2017-08-01 13:54:10 +02:00
ansuz d84487ab49 Merge branch 'master' into staging 2017-08-01 13:54:04 +02:00
ansuz ace31c952e clear tooltips when redrawing the userlist 2017-08-01 11:51:46 +02:00
ansuz 24436c2c51 clear tooltips when redrawing the userlist 2017-08-01 11:51:43 +02:00
ansuz 35cf23ce2c clear tooltips when redrawing the userlist 2017-08-01 11:50:43 +02:00
ansuz 4c6f8d71e1 don't invoke spinner if it does not exist 2017-08-01 11:08:25 +02:00
ansuz 0b69973c17 remove html 2017-08-01 10:32:04 +02:00
ansuz 85cfd4335d correct markdown syntax 2017-08-01 10:31:23 +02:00
ansuz 4614d6ae81 remove legacy max-width from usage bar 2017-08-01 10:05:54 +02:00
ansuz 9a733cca0e drop support for legacy iframe 2017-07-31 17:30:19 +02:00
ansuz 311f709dc4 lint compliance 2017-07-31 17:15:17 +02:00
ansuz 1ca00e7e01 resolve merge conflicts 2017-07-31 16:00:45 +02:00
ansuz c147d342a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-31 15:45:50 +02:00
ansuz eebe473f13 reenable same-origin CSP 2017-07-31 15:43:47 +02:00
ansuz 542d0cd17f drop support for legacy pad list 2017-07-31 15:34:56 +02:00
ansuz f6125415aa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-31 15:07:43 +02:00
ansuz 1c238100c8 don't throw alerts in the middle of someone's presentation 2017-07-31 15:07:34 +02:00
ansuz 7cd42d5ff1 use provided clearTooltips function 2017-07-31 14:52:33 +02:00
ansuz 3fa010027c implement clearTooltips 2017-07-31 12:29:41 +02:00
ansuz a68a225d79 fix read-only synchronization bug 2017-07-31 12:21:48 +02:00
ansuz 777dea2014 Merge branch 'staging' into todo 2017-07-31 11:43:56 +02:00
ansuz a458d7fa46 bump to latest version 2017-07-31 10:24:35 +02:00
ansuz 99d39514a2 turn uploads on by default 2017-07-31 10:20:42 +02:00
ansuz 9734a4db80 append new items to the top of the todo 2017-07-26 15:37:16 +02:00
ansuz 69eaccbdef don't create empty todo entries 2017-07-26 15:22:25 +02:00
ansuz e84edb2c2b disable problematic tooltips 2017-07-26 13:46:07 +02:00
ansuz 9c07793d0d remove tips on checkbox state change 2017-07-26 13:42:12 +02:00
ansuz ba9cab762c Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo 2017-07-26 13:29:33 +02:00
ansuz a5b19b1cdd add missing translations 2017-07-26 13:27:34 +02:00
ansuz d4ffa7903f better popup logic 2017-07-26 13:26:35 +02:00
ansuz 0b81781f35 make the input bold 2017-07-26 13:25:58 +02:00
ansuz 2af96d74fc automatically focus on the create todo form 2017-07-26 13:17:02 +02:00
ansuz 85366f2368 use new translations 2017-07-26 13:04:23 +02:00
ansuz d99d071716 WIP checkbox titles 2017-07-26 13:03:48 +02:00
ansuz e6031c2209 slightly better styles 2017-07-26 13:03:25 +02:00
ansuz 8cfd8d3270 add translations for todo 2017-07-26 13:02:14 +02:00
ansuz c390bdd518 resolve merge conflicts 2017-07-26 12:41:13 +02:00
ansuz 082632048b fix styles for very wide todos 2017-07-26 11:06:17 +02:00
ansuz a15ff9ba2a hide dates in todo 2017-07-26 11:05:54 +02:00
ansuz f0581f2cf4 also style the whole box 2017-07-26 10:43:37 +02:00
ansuz d7d7f212bb add classes to style fake checkboxes based on checkstate 2017-07-26 10:21:32 +02:00
ansuz 304d37a334 use styled checkboxes 2017-07-26 10:06:24 +02:00
ansuz b5603c89f0 add checkboxes to todos 2017-07-26 09:37:02 +02:00
ansuz 4f63921fc9 better width styling on list. lint compliance 2017-07-24 16:36:53 +02:00
ansuz 3efb9d21f5 pull in bootstrap. submit form on enter 2017-07-24 16:22:12 +02:00
ansuz 83f79a3883 slightly better styles 2017-07-24 16:14:49 +02:00
ansuz 56514d7e17 add val api 2017-07-24 15:10:15 +02:00
ansuz 522476a2a6 initialize data model and provide basic methods 2017-07-24 14:30:43 +02:00