55351927d7
Merge pull request #770 from matrix-org/luke/fix-read-receipt-offset
...
Read Receipt offset
2017-03-27 15:51:57 +02:00
a4b4c3feb8
Read Receipt offset
...
Read receipts were always one read receipt to the left further than they should have been. This fixes that and simplifies the logic.
2017-03-27 14:34:05 +01:00
d696196d72
fix https://github.com/vector-im/riot-web/issues/3348
2017-03-27 12:39:58 +01:00
dca02d916a
Merge branch 'develop' into luke/fix-people-section2
2017-03-27 09:45:14 +01:00
abc5b2d5f4
UI delay in UI
2017-03-27 09:44:33 +01:00
975a2db3e4
UI delay done in UI
2017-03-27 09:42:04 +01:00
f4134167a0
Merge pull request #3479 from t3chguy/t3chguy/dark-theme-invert-inconsistency-fix
...
dark theme invert inconsistent across browsers
2017-03-25 14:06:01 +00:00
a8d85ca2ad
Merge pull request #756 from matrix-org/dbkr/add_msisdn
...
Support adding phone numbers in UserSettings
2017-03-24 10:54:22 +00:00
bc67b1c87e
Merge pull request #3451 from vector-im/dbkr/add_msisdn
...
CSS for adding phone number in UserSettings
2017-03-24 10:53:25 +00:00
5e3b991ec2
PR feedback fixes
2017-03-24 10:45:38 +00:00
df15c9be55
Merge pull request #769 from matrix-org/dbkr/dont_crash_on_login
...
Prevent crash on login of no guest session
2017-03-23 14:20:10 +00:00
707fd60624
Prevent crash on login of no guest session
...
The bound functions are only set when the Notifier is started, so
if stop() was called without start() having been called, the
listener function would be null which would throw an exception.
2017-03-23 10:38:00 +00:00
d5272149f6
Another unmounted guard
2017-03-22 16:42:44 +00:00
b58d8bffe1
More PR feedback
...
Unmounted guards, extra semicolon, return early to lose indent
level, add keys.
2017-03-22 16:41:08 +00:00
3d71cb8325
Merge pull request #768 from matrix-org/kegan/memleaks-are-bad-mkay
...
Add canResetTimeline callback and thread it through to TimelinePanel
2017-03-22 16:39:07 +00:00
6b78440466
Unmounted guard
2017-03-22 16:36:42 +00:00
e39979a61f
Convert to old style react class
2017-03-22 16:15:45 +00:00
cca607d469
Make phone number form a bit more semantic
2017-03-22 15:39:09 +00:00
4cd24d15d4
Factor out AddPhoneNumber to a separate component
2017-03-22 15:18:27 +00:00
4cebded04f
Add canResetTimeline callback and thread it through to TimelinePanel
2017-03-22 15:06:52 +00:00
6a37fc4325
Comment typos
2017-03-22 12:00:16 +00:00
fc9928ce08
Merge pull request #767 from matrix-org/dbkr/recaptcha_show_busy
...
Show spinner whilst processing recaptcha response
2017-03-22 11:56:11 +00:00
6a56828974
Just return the promise if it's a bg request
...
This makes the code a bit neater.
2017-03-22 11:25:33 +00:00
5ae7d5e4b2
More comments
2017-03-22 11:13:00 +00:00
e5a5ca9efc
Don't set busy state at all for background request
2017-03-22 10:53:15 +00:00
ec63e18b42
Show spinner whilst processing recaptcha response
...
The fact that we showed no feedback whilst submitting the captcha
response was causing confusion on slower connections where this
took a nontrivial amount of time.
Takes a new flag from the js-sdk that indicates whether the
request being made is a background request, presenting a spinner
appropriately.
Requires https://github.com/matrix-org/matrix-js-sdk/pull/396
2017-03-21 18:40:41 +00:00
4326d7a182
Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn
2017-03-21 13:45:16 +00:00
d5f7b3983b
Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn
2017-03-21 13:44:55 +00:00
8e3a68dbdc
Merge pull request #3426 from vector-im/dbkr/msisdn_signin_2
...
Support for phone number registration/signin, mk2
2017-03-21 13:43:49 +00:00
4a29d674f8
Merge pull request #750 from matrix-org/dbkr/msisdn_signin_2
...
Login / registration with phone number, mark 2
2017-03-21 13:43:11 +00:00
fefaf66a81
Merge pull request #758 from matrix-org/dbkr/threepid_display
...
Display threepids slightly prettier
2017-03-21 11:22:56 +00:00
9ccda7ed81
Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display
2017-03-21 11:11:45 +00:00
05148b6e93
Add contributor to listing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-03-20 13:31:26 +00:00
89447b7bfc
Explicitly specify level of inversion to avoid inconsistent defaults with webkit-filter/filter
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-03-20 13:31:00 +00:00
69c3bd7f80
Escape closes UserSettings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-03-20 12:13:21 +00:00
f65cc940c3
Merge pull request #764 from lieuwex/fix-extraneous-space-emote
...
Fix extraneous leading space in sent emotes
2017-03-19 21:34:13 +00:00
bf8973ad33
avoid leading space in HTML /me too
2017-03-19 21:33:18 +00:00
c697b48f99
fix leading extraneous space in emotes
2017-03-19 21:52:24 +01:00
7891f9b246
UnknownBody: add explanatory title
2017-03-19 15:21:12 +05:30
af122172f1
Merge pull request #3470 from kfatehi/277-confirmredact
...
Confirm redactions with a dialog
2017-03-19 02:36:01 +00:00
68f66e9425
Merge pull request #763 from kfatehi/277-confirmredact
...
Add ConfirmRedactDialog component
2017-03-19 02:35:01 +00:00
df63c779dd
clarify that redact === delete
2017-03-19 02:34:25 +00:00
25a4f4e3b6
Add ConfirmRedactDialog component
...
Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com >
2017-03-18 18:58:28 -07:00
a9ed2e20cb
Confirm redactions with a dialog
...
Closes #277
Closes #1805
Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com >
2017-03-18 18:58:24 -07:00
b3fc1844e8
don't show link preview when link is inside of a quote
...
Signed-off-by: Lieuwe Rooijakkers <lieuwerooijakkers@gmail.com >
2017-03-18 11:50:49 +01:00
92d5f55a46
Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display
2017-03-17 13:55:07 +00:00
33f5c286bb
Merge pull request #760 from matrix-org/dbkr/fix_test_waitforcomponent
...
Fix password UI auth test
2017-03-17 13:54:34 +00:00
be02ac3bc6
Fix people section again
...
- Alter CSS due to removed mx_RoomDropTarget_avatar. The avatar was removed because it didn't particularly add anything and we needed space for "Drop here to tag as direct chat", which is quite long.
- Use guessAndSetDMRoom as a convenience method for guessing the DM member and setting the state.
- Do evil hacks to make DNDRoomTile do dragging of RoomTiles to and from the People section. Dragging a DM to and from Rooms/Favourites/Low Priority now works as one would expect. This is still not ideal however because edge cases exist where you have more than one tag set and then you drag a DM from "Favourites" to "Rooms" and the tile ends up in "People". This would require setting multiple tags, and breaks the 1-1 mapping between tags and sections even further. Ultimately the UI needs a rework.
2017-03-17 12:14:44 +00:00
7ecabe49d2
Fix people section DropTarget and refactor Rooms
...
- Set the verb for the people section to "tag as direct chat". This requires some CSS modifications to Riot because it's a long bit of text relative to, say, "demote".
- Because it's quite useful to be able to set the DM status of a room with just a boolean, add a convenience function for guessing a DM member and setting the DM flag on that room with the resulting member.
2017-03-17 11:59:22 +00:00
23c38bd8a3
Put back both done's
...
mocha takes the exception arg and does the right thing
2017-03-16 17:47:15 +00:00
Luke Barnard
Luke Barnard
Matthew Hodgson
Matthew Hodgson
David Baker
David Baker
Kegsay
Kegan Dougal
Michael Telatynski
Lieuwe Rooijakkers
Aviral Dasgupta
Keyvan Fatehi