 David Baker
|
ea6ed81517
|
Merge pull request #630 from vector-im/read_marker_position
Shift read marker down by 5px
|
2016-01-15 13:57:25 +00:00 |
|
|
David Baker
|
cae3ab410f
|
Merge pull request #603 from vector-im/read_marker_animate
New CSS for read markers
|
2016-01-12 17:58:36 +00:00 |
|
|
David Baker
|
5b4457d33c
|
Merge pull request #591 from vector-im/green_line
Add CSS for the green read-up-to marker.
|
2016-01-07 11:40:11 +00:00 |
|
|
David Baker
|
db5d9e2f6e
|
Merge pull request #465 from vector-im/file_uploads
Move upload bar CSS to new classes
|
2015-12-03 10:58:03 +00:00 |
|
|
David Baker
|
8df62e3b02
|
Merge pull request #454 from vector-im/require-css
Build CSS with webpack
|
2015-12-02 10:26:41 +00:00 |
|
|
David Baker
|
d2c6e2195e
|
Merge pull request #447 from vector-im/skindex-nextgen
Update skindexing for new world order
|
2015-12-01 18:12:47 +00:00 |
|
|
David Baker
|
1099892784
|
Merge pull request #379 from vector-im/read_receipts
Read receipts
|
2015-11-18 14:53:29 +00:00 |
|
|
David Baker
|
e0efb6862e
|
Merge pull request #354 from vector-im/ignore-non-mxc
Display some sensible UI for non-mxc content URLs.
|
2015-11-12 17:43:20 +00:00 |
|
|
David Baker
|
d462e0b21b
|
Merge pull request #335 from stevenhammerton/sh-cas-token-login
Replace CAS login with token login
|
2015-11-06 15:41:15 +00:00 |
|
|
David Baker
|
7598be684c
|
Merge pull request #198 from stevenhammerton/sh-cas-auth
Add support for CAS auth
|
2015-10-13 14:26:03 +01:00 |
|
|
David Baker
|
61f951a33e
|
Merge pull request #190 from vector-im/reactsdk-unfork
New vector using react-sdk
|
2015-10-05 10:31:39 +01:00 |
|
|
David Baker
|
616b4fe0f1
|
Merge pull request #175 from vector-im/matthew/userlist
Reskin the userlist as per the design
|
2015-09-22 15:27:21 +01:00 |
|
|
David Baker
|
81db1b2360
|
Merge pull request #160 from vector-im/conferencing
Add conferencing support
|
2015-09-18 10:03:02 +01:00 |
|
|
David Baker
|
ee4da24b84
|
Merge pull request #148 from vector-im/matthew/login
Fix up various login bugs and nastinesses
|
2015-09-07 10:47:25 +01:00 |
|
|
David Baker
|
7ac852d1fe
|
Merge pull request #2 from vector-im/timestamp_hover
Show timestamp when you hover over a message
|
2015-07-27 14:57:10 +01:00 |
|
|
David Baker
|
7ffd684a9e
|
Merge pull request #3 from vector-im/confirm_on_leave
Prompt if a user really wants to leave the room
|
2015-07-22 12:00:08 -07:00 |
|
|
David Baker
|
e03809b224
|
Merge pull request #16 from matrix-org/markjh/end-to-end
Add basic support for end-to-end crypto using olm.
|
2015-07-21 13:21:43 -07:00 |
|
|
David Baker
|
ed738b6398
|
Merge pull request #15 from matrix-org/erikj/room_editing
Show banned users in room settings
|
2015-07-21 08:14:25 -07:00 |
|
|
David Baker
|
4679e005bf
|
Merge pull request #14 from matrix-org/erikj/room_editing
Room Settings.
|
2015-07-21 07:38:10 -07:00 |
|
|
David Baker
|
0a3cddbd89
|
Merge pull request #13 from matrix-org/markjh/vector-cleanup-client-peg
Markjh/vector cleanup client peg
|
2015-07-20 10:12:16 -07:00 |
|
|
David Baker
|
6ceaee7fc0
|
Merge pull request #12 from matrix-org/markjh/cleanup-client-peg
Move all the calls to createClient inside the MatrixClientPeg
|
2015-07-20 10:11:24 -07:00 |
|
|
David Baker
|
70fce0989b
|
Merge pull request #11 from matrix-org/irc-style-commands
IRC-style commands
|
2015-07-17 12:06:32 +01:00 |
|
|
David Baker
|
8feeb93215
|
Merge pull request #10 from matrix-org/editable_room_name
Make room name editable
|
2015-07-16 19:29:49 +01:00 |
|
|
David Baker
|
03733e6a0f
|
Merge pull request #9 from matrix-org/create_room
Wire in create room.
|
2015-07-16 17:37:48 +01:00 |
|
|
David Baker
|
155dd74a6f
|
Merge pull request #8 from matrix-org/message-history-arrow-keys
Implement sent message history (up/down keys).
|
2015-07-16 15:41:57 +01:00 |
|
|
David Baker
|
41bab56133
|
Merge pull request #7 from matrix-org/nick-completion
Implement nick completion (tab-complete).
|
2015-07-16 14:52:46 +01:00 |
|
|
David Baker
|
a6f857e9d8
|
Merge pull request #6 from matrix-org/voip
VoIP addition
|
2015-07-16 12:31:36 +01:00 |
|
|
David Baker
|
73a1c2b581
|
Merge pull request #5 from matrix-org/user_settings
User settings
|
2015-07-16 10:56:28 +01:00 |
|
|
David Baker
|
e2757b3587
|
Merge pull request #4 from matrix-org/registration
Registration
|
2015-07-16 09:58:53 +01:00 |
|
|
David Baker
|
fe98d6ec69
|
Merge pull request #3 from matrix-org/editable_text
Add an editable text atom
|
2015-07-15 13:58:26 +01:00 |
|
|
David Baker
|
e0fae13b76
|
Merge pull request #2 from matrix-org/create_room
CreateRoom organism
|
2015-07-15 10:24:44 +01:00 |
|
|
David Baker
|
d49c10b3f5
|
Merge pull request #1 from ndarilek/master
Add aria-live=polite to message list, needed for accessibility.
|
2015-07-06 18:25:42 +01:00 |
|