Commit Graph

2339 Commits (958294f1092a4c6028ffe55238f85abb81cb4bdb)

Author SHA1 Message Date
ansuz c8c44d3bfc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-04 11:22:22 +02:00
Caleb James DeLisle 0d1f19f5d4 Big manual merge 2017-08-04 11:20:17 +02:00
Pierre Bondoerffer f6d45d05f6
use logo in toolbar 2017-08-04 11:01:26 +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 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 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 311f709dc4 lint compliance 2017-07-31 17:15:17 +02:00
ansuz c147d342a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-31 15:45:50 +02:00
ansuz 542d0cd17f drop support for legacy pad list 2017-07-31 15:34:56 +02:00
Pierre Bondoerffer 93e007b52a
reduce png sizes 2017-07-31 15:11:35 +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 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
yflory 8e83501c72 Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo 2017-07-26 13:31:02 +02:00
yflory 459e0b3b16 CSS and bug fixes for todo 2017-07-26 13:30:39 +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
yflory 77d6da841f Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo 2017-07-26 13:07:41 +02:00
yflory 3da76e3ae8 Update style for the todo app 2017-07-26 13:07:35 +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
yflory 0612a50ab4 Add fadein/fadeout when adding or removing a task 2017-07-26 11:40:24 +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
CatalinScr 796bf89491 Update of the front-page 2017-07-24 17:56:54 +03:00
ansuz 4f63921fc9 better width styling on list. lint compliance 2017-07-24 16:36:53 +02:00
yflory 35635c3e2f CSS fix for the todo app 2017-07-24 16:27:35 +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
Nicolas Lemoine 180e643af9 Style of Todo App 2017-07-24 16:29:39 +03:00
Nicolas Lemoine 5083299e8a Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo 2017-07-24 16:23:59 +03:00
Nicolas Lemoine f67fb32bf1 Add, delete, display a task in Todo 2017-07-24 16:23:53 +03:00
ansuz 56514d7e17 add val api 2017-07-24 15:10:15 +02:00
Nicolas Lemoine ac718b6dfa Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo 2017-07-24 15:35:45 +03:00
Nicolas Lemoine a61faebb2b App Todo - Init and HTML 2017-07-24 15:35:29 +03:00
ansuz 522476a2a6 initialize data model and provide basic methods 2017-07-24 14:30:43 +02:00
yflory 4345fc0662 Todo app 2017-07-24 14:13:47 +02:00
Nicolas Lemoine e3b9c03fc0 TodoApp - Init 2017-07-23 16:28:49 +03:00
Nicolas Lemoine 658b00814b TodoApp - Style and translations 2017-07-23 16:08:49 +03:00
ansuz a9a65e4ca9 remove unused code 2017-07-23 14:36:41 +02:00
ansuz 4b53e02f6c oups 2017-07-23 14:32:13 +02:00
ansuz 2e3be27278 resolve merge 2017-07-23 14:31:13 +02:00
ansuz dcf5719eaf handle most of the boilerplate stuff 2017-07-23 14:27:47 +02:00
ansuz 0d43a84c2b move example into another folder 2017-07-23 14:19:43 +02:00
Nicolas Lemoine 5c07eac4de Change title and footer 2017-07-23 15:08:27 +03:00
ansuz f5454f232a pull in todomvc vanillajs example 2017-07-23 13:46:41 +02:00
ansuz ae693ff5a7 lint compliance 2017-07-23 09:01:12 +02:00
ansuz 6622735db0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-22 14:15:15 +02:00
ansuz 55cb0734e2 make bad state timeout configurable 2017-07-22 10:56:39 +02:00
yflory 469f49fc0a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-20 18:32:12 +02:00
yflory a80b00a765 Move the file picker in common 2017-07-20 18:32:03 +02:00
ansuz d44f0696af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-20 18:24:53 +02:00
ansuz 2d0635a409 use custom version of tippy 2017-07-20 18:23:51 +02:00
yflory 09793e0d7d jshint 2017-07-20 18:21:10 +02:00
yflory 683769f30a Fix tooltips 2017-07-20 18:19:59 +02:00
yflory 9633025afe CSS for the removeHistory button in contacts 2017-07-20 17:26:33 +02:00
yflory 97f1bbedc5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-20 17:08:28 +02:00
yflory b9bba76b4e Make the delay for tooltips configurable 2017-07-20 17:08:11 +02:00
ansuz dd98e2222a WIP erase chat history button 2017-07-20 17:04:11 +02:00
ansuz 128d5b2c6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-20 15:55:17 +02:00
ansuz b22127f10c add history removal 2017-07-20 15:55:04 +02:00
yflory a5a73ce326 Fix print button in slide 2017-07-20 14:41:51 +02:00
yflory 3bd5f01e53 Fix slide ratio in preview mode 2017-07-20 09:55:18 +02:00
yflory 140964478e Enter + shift key to add a new line in chat 2017-07-20 09:54:44 +02:00
yflory 331b4dddea Clean debugging code 2017-07-19 17:50:08 +02:00
yflory e26e041a5b fix jshint errors 2017-07-19 17:24:35 +02:00
yflory c33d2a2db0 New tooltips 2017-07-19 17:14:10 +02:00
yflory 88813aee02 Show that only html can be imported in pads 2017-07-19 16:36:10 +02:00
yflory b56a782f01 Store the userlist state when it is closed using the icon 2017-07-19 14:38:46 +02:00
yflory 82c87144cb Remove the friend request button when the request is sent 2017-07-19 14:14:34 +02:00
yflory 5ce49af57b Make CryptDrive fast again 2017-07-19 11:36:00 +02:00
yflory 1dc98dcff1 CSS for the contacts input field 2017-07-19 10:30:38 +02:00
yflory e2d031c76a Add support for markdown syntax in contacts 2017-07-19 10:29:59 +02:00
yflory cba113a2b0 Lint 2017-07-18 15:52:46 +02:00