OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
4,183 Commits
217 Branches
561 Tags
468 MiB
Commit Graph

4183 Commits (ad2c84375d150ed386d2b73634630794abec5643)

Author SHA1 Message Date
David Baker a38a954fb5 Merge pull request #772 from matrix-org/dbkr/disinvite_is_not_kick 
Correct confirm prompt for disinvite
 2017-03-27 17:42:39 +01:00
Luke Barnard aa486b605d Merge pull request #773 from matrix-org/luke/fix-login-flash-new-state 
Add state loggingIn to MatrixChat to fix flashing login
 2017-03-27 18:24:49 +02:00
David Baker c743663f7d Merge pull request #771 from matrix-org/dbkr/invite_always_show_valid_mxid 
Fix bug where you can't invite a valid address
 2017-03-27 17:20:51 +01:00
Luke Barnard c650cfffac logged_in -> loggedIn 
Also added `loggingIn` to `initialState` and removed some commented code.
 2017-03-27 17:14:39 +01:00
David Baker db3339de33 I still can't type 2017-03-27 17:03:59 +01:00
David Baker 9125c1b2cc I can't type 2017-03-27 17:00:05 +01:00
David Baker a3efa45795 Correct confirm prompt for disinvite 
It should be 'disinvite' not 'kick', and probably doesn't really
need a reason.
 2017-03-27 16:53:00 +01:00
David Baker a230354dbe Fix bug where you can't invite a valid address 
Always show the entered text as an option if it's a valid address,
otherwise there's no way to invite an address that is valid and
also returns other mxids in the search results.

Fixes https://github.com/vector-im/riot-web/issues/3496
 2017-03-27 16:40:01 +01:00
Luke Barnard 30c5af35e5 Add state loggingIn to MatrixChat to fix flashing login 
To prevent the login screen from flashing when refreshing the app, use some state to indicate that a login is in progress, and OR that with the existing `loading` boolean to show the `<Spinner>` instead of the default `<Login>`.

This might be too invasive, and a default spinner may be better.
 2017-03-27 16:39:04 +01:00
Luke Barnard 7eb3a776dc Merge pull request #761 from matrix-org/luke/fix-people-section2 
Fix people section DropTarget and refactor Rooms
 2017-03-27 15:52:28 +02:00
Luke Barnard 55351927d7 Merge pull request #770 from matrix-org/luke/fix-read-receipt-offset 
Read Receipt offset
 2017-03-27 15:51:57 +02:00
Luke Barnard 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
Luke Barnard dca02d916a Merge branch 'develop' into luke/fix-people-section2 2017-03-27 09:45:14 +01:00
Luke Barnard 975a2db3e4 UI delay done in UI 2017-03-27 09:42:04 +01:00
David Baker 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
David Baker 5e3b991ec2 PR feedback fixes 2017-03-24 10:45:38 +00:00
David Baker 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
David Baker 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
David Baker d5272149f6 Another unmounted guard 2017-03-22 16:42:44 +00:00
David Baker b58d8bffe1 More PR feedback 
Unmounted guards, extra semicolon, return early to lose indent
level, add keys.
 2017-03-22 16:41:08 +00:00
Kegsay 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
David Baker 6b78440466 Unmounted guard 2017-03-22 16:36:42 +00:00
David Baker e39979a61f Convert to old style react class 2017-03-22 16:15:45 +00:00
David Baker cca607d469 Make phone number form a bit more semantic 2017-03-22 15:39:09 +00:00
David Baker 4cd24d15d4 Factor out AddPhoneNumber to a separate component 2017-03-22 15:18:27 +00:00
Kegan Dougal 4cebded04f Add canResetTimeline callback and thread it through to TimelinePanel 2017-03-22 15:06:52 +00:00
David Baker 6a37fc4325 Comment typos 2017-03-22 12:00:16 +00:00
David Baker 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
David Baker 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
David Baker 5ae7d5e4b2 More comments 2017-03-22 11:13:00 +00:00
David Baker e5a5ca9efc Don't set busy state at all for background request 2017-03-22 10:53:15 +00:00
David Baker 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
David Baker d5f7b3983b Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn 2017-03-21 13:44:55 +00:00
David Baker 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
David Baker fefaf66a81 Merge pull request #758 from matrix-org/dbkr/threepid_display 
Display threepids slightly prettier
 2017-03-21 11:22:56 +00:00
David Baker 9ccda7ed81 Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display 2017-03-21 11:11:45 +00:00
Michael Telatynski 69c3bd7f80 Escape closes UserSettings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-03-20 12:13:21 +00:00
Matthew Hodgson 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
Matthew Hodgson bf8973ad33 avoid leading space in HTML /me too 2017-03-19 21:33:18 +00:00
Lieuwe Rooijakkers c697b48f99 fix leading extraneous space in emotes 2017-03-19 21:52:24 +01:00
Aviral Dasgupta 7891f9b246
UnknownBody: add explanatory title 2017-03-19 15:21:12 +05:30
Matthew Hodgson 68f66e9425 Merge pull request #763 from kfatehi/277-confirmredact 
Add ConfirmRedactDialog component
 2017-03-19 02:35:01 +00:00
Matthew Hodgson df63c779dd clarify that redact === delete 2017-03-19 02:34:25 +00:00
Keyvan Fatehi 25a4f4e3b6 Add ConfirmRedactDialog component 
Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com>
 2017-03-18 18:58:28 -07:00
Lieuwe Rooijakkers 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
David Baker 92d5f55a46 Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display 2017-03-17 13:55:07 +00:00
David Baker 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
Luke Barnard 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
David Baker 23c38bd8a3 Put back both done's 
mocha takes the exception arg and does the right thing
 2017-03-16 17:47:15 +00:00
David Baker 375ae8fb04 Fix password UI auth test 
By adding a way to wait a short time for a component to appear in
the DOM, so we don't get flakey failures like this when we change
something to returning a promise that needs to resolve before the
component actually appears.
 2017-03-16 17:26:42 +00:00