Kegan Dougal
|
6235d88b55
|
Missing return
|
2016-08-24 14:10:21 +01:00 |
|
Kegsay
|
82a822820f
|
Merge pull request #427 from matrix-org/kegan/postmessage-bot-options
Add ability to query and set bot options
|
2016-08-24 13:51:31 +01:00 |
|
Kegan Dougal
|
73ba55abad
|
s/then/done/ to throw uncaught exceptions if the error function throws
|
2016-08-24 13:47:35 +01:00 |
|
Kegan Dougal
|
dbff5f671e
|
Add ability to query and set bot options
- Also standardise on 'success' as the key name for successes.
- Also return the entire `content` on get state event requests.
|
2016-08-24 13:23:06 +01:00 |
|
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 |
|
Mark Haines
|
fb4d3a9729
|
Merge pull request #425 from matrix-org/markjh/travis
Add .travis.yml
|
2016-08-23 17:20:30 +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 |
|
Matthew Hodgson
|
08c0d7e298
|
Merge pull request #426 from matrix-org/wmwragg/chat-message-presentation
Added event/info message avatars back in
|
2016-08-23 17:14:11 +01:00 |
|
wmwragg
|
ae8234ffe3
|
Added event/info message avatars back in
|
2016-08-23 15:58:27 +01:00 |
|
wmwragg
|
3ea62eb73a
|
Added event/info message avatars back in
|
2016-08-23 15:57:53 +01:00 |
|
Mark Haines
|
763d3bf9e7
|
Add .travis.yml
|
2016-08-23 15:05:50 +01:00 |
|
Kegsay
|
c10208a203
|
Merge pull request #423 from matrix-org/kegan/scalar-postmessage-api
Add postMessage API required for integration provisioning
|
2016-08-23 15:00:44 +01:00 |
|
Richard van der Hoff
|
0dbc3ce344
|
Merge pull request #424 from matrix-org/rav/fix_react_test
Fix TimelinePanel test
|
2016-08-23 14:56:21 +01:00 |
|
Kegan Dougal
|
ecc7850e13
|
Trailing )
|
2016-08-23 14:50:52 +01:00 |
|
Kegan Dougal
|
1c649303e3
|
Consistency with sendResponse
|
2016-08-23 14:50:29 +01:00 |
|
Kegan Dougal
|
e96a40004b
|
Review comments
|
2016-08-23 14:41:47 +01:00 |
|
Richard van der Hoff
|
70c0290aec
|
Fix TimelinePanel test
https://github.com/matrix-org/matrix-react-sdk/pull/422 made events take up
less vertical space, so we now need more of them to allow us to scroll back.
|
2016-08-23 14:39:44 +01:00 |
|
Matthew Hodgson
|
2fae966884
|
notification panel WIP
|
2016-08-23 14:28:10 +01:00 |
|
Matthew Hodgson
|
f888ec6e81
|
notification panel WIP
|
2016-08-23 14:27:58 +01:00 |
|
Kegan Dougal
|
f6b008350d
|
Spaces not tabs
|
2016-08-23 13:31:55 +01:00 |
|
wmwragg
|
d2e8201d79
|
Making sure that the sub list count always stays up to date, including when people read the outstanding notifications
|
2016-08-23 13:24:02 +01:00 |
|
wmwragg
|
65d7d01dfa
|
Merge branch 'develop' into wmwragg/direct-chat-sublist
|
2016-08-23 12:49:43 +01:00 |
|
wmwragg
|
6a4d02ffc5
|
Merge branch 'develop' into wmwragg/direct-chat-sublist
|
2016-08-23 12:49:21 +01:00 |
|
wmwragg
|
c362d4ff01
|
Added updating of count when room tile notification state changed
|
2016-08-23 12:40:28 +01:00 |
|
wmwragg
|
2cf2df20f6
|
Added updating of count when room tile notification state changed
|
2016-08-23 12:40:15 +01:00 |
|
Matthew Hodgson
|
1a2475ebba
|
Merge pull request #422 from matrix-org/wmwragg/chat-message-presentation
Wmwragg/chat message presentation
|
2016-08-23 12:20:03 +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 |
|
Kegan Dougal
|
9162a0ff01
|
Add postMessage API required for integration provisioning
Supports querying member state and creating invites only.
|
2016-08-23 12:00:11 +01:00 |
|
wmwragg
|
ee73bc3aa4
|
Refactor of the badge logic, and also added no badges when zero notifications
|
2016-08-23 11:35:03 +01:00 |
|
wmwragg
|
d3fa680373
|
Added all the notification states to the sub list count logic
|
2016-08-23 11:14:45 +01:00 |
|
wmwragg
|
ef9d6d45b6
|
Merge branch 'develop' into wmwragg/direct-chat-sublist
|
2016-08-23 10:54:05 +01:00 |
|
wmwragg
|
6d1f9003e2
|
Merge branch 'develop' into wmwragg/direct-chat-sublist
|
2016-08-23 10:52:50 +01:00 |
|
wmwragg
|
a980864886
|
Initial sub list notifications count. Still needs propagation of muting/unmuting etc. events from room tile up to sub list
|
2016-08-23 10:47:17 +01:00 |
|
wmwragg
|
ca4d506391
|
Header wording for capped truncation count updated
|
2016-08-22 22:47:00 +01:00 |
|
Aviral Dasgupta
|
884abbd7e9
|
Cleanup autocomplete
|
2016-08-23 00:36:31 +05:30 |
|
Aviral Dasgupta
|
554c33a883
|
Extract autocomplete styling to CSS
|
2016-08-23 00:36:01 +05:30 |
|
Aviral Dasgupta
|
56813eb11e
|
remove whatwg-fetch and use browser-request
|
2016-08-22 23:59:32 +05:30 |
|
wmwragg
|
4d5e3bc22b
|
Initial tag section header badge
|
2016-08-22 17:25:43 +01:00 |
|
wmwragg
|
ff55a951c9
|
Number of rooms added to header of sections
|
2016-08-22 17:02:52 +01:00 |
|
wmwragg
|
895172d498
|
Added catch to help get the Historical and any other weird sections into a sound state, so the states can then change correctly from then on
|
2016-08-22 16:42:08 +01:00 |
|
wmwragg
|
71f73d8df2
|
Collapsing and truncation initial state and onClick event logic
|
2016-08-22 15:50:36 +01:00 |
|
wmwragg
|
edb7301b37
|
Moving the drirect messages above rooms
|
2016-08-22 14:10:51 +01:00 |
|
wmwragg
|
97daca4b31
|
Initial restyle of the sub lists and room lists
|
2016-08-22 14:10:06 +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 |
|