Commit graph

5408 commits

Author SHA1 Message Date
MTRNord
2ef397a483
improve item color picker logic and UX 2018-09-13 16:08:27 +02:00
yflory
d2c1ed5eff Implement reconnect function in the messenger 2018-09-13 15:44:48 +02:00
MTRNord
3c2417b479
fix more whitespace in jkanban.js 2018-09-13 14:46:41 +02:00
MTRNord
7e686a065e
Merge remote-tracking branch 'origin/fix-#254' into fix-#254 2018-09-13 14:40:12 +02:00
MTRNord
57ed2636ac
jkanban.js fix whitespace changes 2018-09-13 14:39:49 +02:00
MTRNord
cd927aa507
Add jscolor.js to .jshintignore 2018-09-13 14:32:14 +02:00
yflory
1b2f47c0c0 Try a new status indicator in messaging 2018-09-13 11:49:01 +02:00
yflory
1cd1542d19 Update messaging info displayed before entering a room 2018-09-13 11:45:32 +02:00
yflory
f79a70df65 Disable 'Import recent pads' by default on login 2018-09-13 10:26:23 +02:00
yflory
10823fc124 Add toolbar notification when the messenger is closed 2018-09-12 15:07:50 +02:00
yflory
5276dc0bf6 lint compliance 2018-09-12 14:53:55 +02:00
yflory
621fc9a897 Ability to disable messenger at a global level 2018-09-12 14:51:37 +02:00
yflory
82cca49aef French translation for the messenger 2018-09-12 14:42:34 +02:00
yflory
c38eb6588e Fix small issues with the messenger 2018-09-12 11:55:26 +02:00
Paul Libbrecht
ba112c3f8c
Merge pull request #274 from jedie/patch-1
Update messages.de.js: typo: Markdwon -> Markdown
2018-09-11 21:41:22 +02:00
yflory
8b05b1acaf Fix scrolling issue in pad when the userlist or the messenger was too big 2018-09-11 18:16:36 +02:00
yflory
42ffe0ee30 Fix initial history rules 2018-09-11 17:57:15 +02:00
yflory
6c6ce7b7a8 Fix messenger bugs 2018-09-11 17:42:00 +02:00
Jens Diemer
64a1f888ac
Update messages.de.js
typo
2018-09-11 17:41:35 +02:00
yflory
19da04664a other typo 2018-09-11 17:17:59 +02:00
yflory
b62aa9224e Fix typo 2018-09-11 17:11:13 +02:00
yflory
ac989a1e73 lint compliance 2018-09-11 16:48:44 +02:00
yflory
f3c36bfd57 Improve messenger initial history 2018-09-11 16:47:52 +02:00
yflory
26055e5e55 Messenger messages UI 2018-09-11 15:19:47 +02:00
ansuz
a28193c4d0
Merge pull request #273 from b3yond/master
Changed the description for autostore settings (en/de)
2018-09-10 18:50:38 -04:00
yflory
40c7cdd7c8 Fix an issue with messenger while opening the same tab twice 2018-09-10 18:16:24 +02:00
yflory
216c94b1f0 Fix messenger notifications 2018-09-10 17:50:36 +02:00
yflory
382690e5c8 Don't open other pads' chat in the current pad's messenger 2018-09-10 17:43:19 +02:00
yflory
826b217c55 Fix 1px error 2018-09-10 17:06:14 +02:00
yflory
3acf202830 Test UI 2018-09-10 17:04:23 +02:00
yflory
56c30fc02e lint compliance 2018-09-10 15:33:24 +02:00
yflory
8f6d0b1c3a Merge branch 'staging' into chat 2018-09-10 15:32:39 +02:00
yflory
9eb4e2e0dc Reorder the chat rooms in the list based on the time of the last message 2018-09-10 15:32:07 +02:00
yflory
cdce69e677 Improve messenger UI in apps 2018-09-10 13:20:01 +02:00
yflory
d4dd58e7df Add a pad room when the messenger is active in a pad 2018-09-07 19:35:06 +02:00
b3yond
45097dfe69
German strings for automatic pad storage settings 2018-09-07 00:58:33 +02:00
b3yond
d49cccd740
Changed strings for automatic pad storage settings 2018-09-07 00:37:56 +02:00
yflory
9e27f111cb lint compliance 2018-09-06 18:45:53 +02:00
yflory
e6743887fc Refactor contacts/messenger so that it is usable directly in the apps 2018-09-06 18:41:22 +02:00
ansuz
e83b225295 update changelogs 2018-09-04 10:28:01 -04:00
ansuz
8dec54d550 WIP Changelog 2018-09-04 09:38:26 -04:00
yflory
ac85b3e238 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-09-04 15:28:34 +02:00
yflory
4a2fa77bb7 French translation 2018-09-04 15:28:20 +02:00
ansuz
0e70961074 password-protected shared folders aren't urgent. dropping the XXX 2018-09-04 09:14:13 -04:00
ansuz
a203a67a53 update another translation 2018-09-04 09:06:32 -04:00
ansuz
2b2995d2c0 update a few english translations 2018-09-04 09:00:32 -04:00
ansuz
2bd02ca69e bump version to 2.7.0 2018-09-04 08:59:38 -04:00
yflory
5b6aa4ba0a Reorder autostore options in Settings 2018-09-04 14:49:22 +02:00
yflory
2f3576f90e Fix image preview not resized correctly in the mediatag dialog 2018-09-04 10:50:34 +02:00
yflory
ab07554d0b Fix initial size of the image preview in the mediatag dialog 2018-09-04 10:45:18 +02:00