Richard van der Hoff
bc7948d75f
Merge remote-tracking branch 'origin/master' into develop
2016-08-24 10:24:35 +01:00
Richard van der Hoff
5348b8a980
Merge pull request #2001 from vector-im/rav/fix_readme_lies
...
Update encryption info in README
2016-08-24 10:22:38 +01:00
Richard van der Hoff
f2936dc15c
Update encryption info in README
2016-08-23 18:07:07 +01:00
Matthew Hodgson
864f9747f0
Merge pull request #2000 from vector-im/wmwragg/chat-message-presentation
...
Added event/info message avatars back in
2016-08-23 17:14:21 +01:00
wmwragg
3ea62eb73a
Added event/info message avatars back in
2016-08-23 15:57:53 +01:00
Matthew Hodgson
1d1f89e0de
Merge pull request #1987 from vector-im/wmwragg/chat-message-presentation
...
Wmwragg/chat message presentation
2016-08-23 12:19:58 +01:00
wmwragg
e9eafc3380
Further tweak
2016-08-22 11:15:49 +01:00
wmwragg
600a1cae79
Read avatars position tweaked, now that the spacing has changed
2016-08-22 11:13:42 +01:00
wmwragg
0b1fc1b925
Avatar and Sender Profile alignment, along with reducing the distance between initial messages and the previous one
2016-08-22 10:45:00 +01:00
wmwragg
bdaa9faea0
Added the font-size back in, as the textarea gets overidden otherwise
2016-08-19 18:03:12 +01:00
wmwragg
dbadb07adf
Moved the font-size into the .mx_MessageComposer_input so that it sets the size for RTE as well as normal composer
2016-08-19 17:57:24 +01:00
wmwragg
4a2c899d05
Merge branch 'develop' into wmwragg/chat-message-presentation
2016-08-19 17:22:26 +01:00
wmwragg
85084f5fd7
Fixed spacing on multiline messages
2016-08-19 16:46:15 +01:00
wmwragg
78692c83a6
Removal of the mini avatars for action (info) messages
2016-08-19 16:37:45 +01:00
wmwragg
173e6011e8
Alignment tweak to the readAvatars
2016-08-19 11:12:06 +01:00
wmwragg
9e542ba232
Alignment adjustment so that the readAvatars sit in the center of the top line in a new message
2016-08-19 10:58:51 +01:00
wmwragg
5005675561
Some CSS tidy-up, and fix for readAvatars when the message is not classed as a continuation, but is an info message
2016-08-18 22:50:40 +01:00
wmwragg
29759ca71e
Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message
2016-08-18 21:54:07 +01:00
Matthew Hodgson
9b5e5c9acb
squidge video icon a bit
2016-08-18 16:48:28 +01:00
David Baker
fbbbd44dc3
Merge pull request #1982 from vector-im/dbkr/make_notif_silder_work
...
Make the notification slider work
2016-08-18 15:24:14 +01:00
David Baker
0bb3eaaf67
Use constants
2016-08-18 13:46:47 +01:00
David Baker
e48d68a449
PR feedback
2016-08-18 13:11:57 +01:00
wmwragg
67175c5a72
Positional tweaks, and font standardisation, so all browser now use ttf, so sizing is the same across all browsers
2016-08-18 11:15:42 +01:00
David Baker
6b0aeefc66
RoomNotifs.js moved to react-sdk
...
Since it's now used in RoomTile. Remove the vector prefix since it's no longer really a 'vector' thing
2016-08-17 18:29:38 +01:00
wmwragg
d1649771cc
Images now slighlty set in so they don't appear under the context button, and give a margin to the right of the image
2016-08-16 17:41:54 +01:00
wmwragg
08e5f61b10
Image button now has cursor set to pointer
2016-08-16 17:41:09 +01:00
wmwragg
012f085f33
alignment tweaks and persistent highlight when meni clicked, plus menu button no longer an input item
2016-08-16 17:33:37 +01:00
wmwragg
9f570152e5
Altered message composer size to match that of the message timeline messages
2016-08-16 16:20:38 +01:00
wmwragg
3099ef68a9
Added linked message styling
2016-08-16 16:17:15 +01:00
wmwragg
f0bac3a3b0
Design tweaks
2016-08-16 16:03:10 +01:00
David Baker
cd0ed879e3
Make the slider work
...
Still WIP though: need to make vector work with the 'contains display name' rule being an override
2016-08-16 15:54:28 +01:00
wmwragg
95418089f3
Updating timestamp format
2016-08-16 15:01:25 +01:00
wmwragg
650a0f1c1f
Added context button, and initial highlighting and readReceipts positioning
2016-08-16 11:58:52 +01:00
wmwragg
757e885abc
Initial reposition of the read avatars
2016-08-16 10:59:04 +01:00
wmwragg
2c8e7782c5
Initial reposition of the timestamp
2016-08-16 10:26:14 +01:00
Matthew Hodgson
d3eccc1d6f
add rel='noopener' wherever we do target='_blank' because https://mathiasbynens.github.io/rel-noopener/
2016-08-15 21:38:21 +01:00
David Baker
40aee5b03d
Merge pull request #1966 from vector-im/rav/use_cpx_to_copy_olm
...
Use cpx to copy olm.js, and add watcher
2016-08-15 13:10:27 +01:00
Richard van der Hoff
4c9ade5ecb
Use cpx to copy olm.js, and add watcher
...
We are now using `cpx` to copy the emojione files, so we might as well use it
for olm.js, rather than rolling our own - particularly since that makes it easy
to add a watcher for `npm start`.
We have to add a `-L` to the `cpx` invocation, otherwise, if olm is a
symlink (as is useful for development), cpx ends up watching the symlink, which
obviously never changes.
2016-08-15 12:16:08 +01:00
Richard van der Hoff
1d435890af
Unpin react-sdk and js-sdk
2016-08-15 12:15:24 +01:00
Richard van der Hoff
8a2b2daad7
Revert "Unpin react-sdk and js-sdk"
...
I messed this up and removed staticfiles.js by accident
This reverts commit 21334cab28
2016-08-15 12:13:58 +01:00
Richard van der Hoff
21334cab28
Unpin react-sdk and js-sdk
2016-08-15 12:11:35 +01:00
David Baker
a17df609f3
Read all 4 different notif states
...
Can't yet set loud / mute
2016-08-12 15:19:34 +01:00
David Baker
0afdf5d8e4
Merge pull request #1959 from vector-im/rav/device_display_name
...
Make up a device display name
2016-08-12 11:48:12 +01:00
Richard van der Hoff
17733a66f9
rename MatrixChat defaultDeviceDisplayName prop
2016-08-12 11:40:25 +01:00
Richard van der Hoff
3a819a29b7
Make up a device display name
...
Pass a default device name into react-sdk
2016-08-12 11:01:39 +01:00
David Baker
9d77fab18f
0.7.4-r1
2016-08-12 10:11:40 +01:00
David Baker
3650c3f08b
Prepare changelog for v0.7.4-r1
2016-08-12 10:11:39 +01:00
David Baker
5512fd4220
Bump to matrix-react-sdk 0.6.4-r1
2016-08-12 10:09:53 +01:00
David Baker
678393e2bd
Add note about file table overflows
2016-08-12 09:59:56 +01:00
David Baker
25d8a7999f
0.7.4
2016-08-11 17:47:17 +01:00
