3090 Commits

Author SHA1 Message Date
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
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
yflory
91ebbdfdb4 View contact status 2017-07-18 15:50:21 +02:00
yflory
221a3b4fed Fix duplicate leftside entries when disconnected in profile 2017-07-18 12:10:58 +02:00
yflory
22a28a8fd9 Fix undefined description in profile 2017-07-18 11:49:54 +02:00
yflory
26fa914982 Missing translation keys 2017-07-18 11:07:34 +02:00
ansuz
39fd0d0f5f notify if you're focused on a conversation in a bacgkrounded tab 2017-07-18 10:57:37 +02:00
ansuz
b2de6ac28e Merge pull request #156 from pbondoer/spanish
Spanish update
2017-07-18 10:55:03 +02:00
yflory
7540f12040 Fix profile creation button not centered 2017-07-18 10:45:36 +02:00
yflory
f719b34e09 Add tab notification in contacts 2017-07-18 10:42:23 +02:00
Pierre Bondoerffer
a2c2e98060
Spanish update 2017-07-18 10:30:28 +02:00
yflory
6aab1c94b2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-18 10:24:00 +02:00
yflory
baf439648e Add the contacts app in the dropdown menu 2017-07-18 10:22:51 +02:00
yflory
36d792874a Fix initial text not removed in /contacts 2017-07-18 10:13:29 +02:00
ansuz
5716f76c91 fix typo in translations 2017-07-18 10:04:02 +02:00
yflory
3545a66320 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-17 18:51:40 +02:00
yflory
743b87b70f Add initial text in /contacts 2017-07-17 18:51:23 +02:00
ansuz
df0442c2bf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-17 18:40:27 +02:00
ansuz
eb4b5ca77c stub history removal. coming soon 2017-07-17 18:39:44 +02:00
yflory
aa8181ab2b Contacts app translations 2017-07-17 18:34:46 +02:00
yflory
73e32f273e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-17 18:08:07 +02:00
yflory
009d01abde Fix friend removal and update user data 2017-07-17 18:07:58 +02:00