wmwragg
|
7880734d77
|
Merge branch 'develop' into wmwragg/room-tag-menu
|
2016-08-05 15:26:42 +01:00 |
|
wmwragg
|
4a46aba0c2
|
Added new onClick function for the avatar, but not wired in yet, waitin go pull up from develop once previous commits have been merged
|
2016-08-05 15:24:53 +01:00 |
|
wmwragg
|
5ce1aba493
|
Created initial RoomTagContextMenu component
|
2016-08-05 15:23:07 +01:00 |
|
Richard van der Hoff
|
c929076a83
|
Merge pull request #1929 from vector-im/dbkr/fix_unit_tests_replaceUsingCreds
Fix unit tests
|
2016-08-05 15:20:50 +01:00 |
|
Matthew Hodgson
|
99625067fe
|
Merge pull request #1926 from vector-im/wmwragg/mute-mention-state-fix
Wmwragg/mute mention state fix
|
2016-08-05 14:44:48 +01:00 |
|
Matthew Hodgson
|
10aa201d33
|
Merge pull request #390 from matrix-org/wmwragg/mute-mention-state-fix
Wmwragg/mute mention state fix
|
2016-08-05 14:44:27 +01:00 |
|
David Baker
|
c9ab977d73
|
Fix unit tests
ReplaceUsingAccessToken was, uh, replaced with replacedUsingCreds
|
2016-08-05 14:38:10 +01:00 |
|
Richard van der Hoff
|
ff02c21252
|
Merge pull request #391 from matrix-org/dbkr/fix_historical_freeze
Fix long freeze when opening 'historical' section
|
2016-08-05 12:47:01 +01:00 |
|
Richard van der Hoff
|
e8dbf978c3
|
Merge pull request #388 from matrix-org/dbkr/refactor_field_errors
Refactor UI error effects
|
2016-08-05 12:34:56 +01:00 |
|
Matthew Hodgson
|
d0158f5812
|
fix merge conflict
|
2016-08-04 23:45:28 +01:00 |
|
Matthew Hodgson
|
cf70f1731e
|
hide integration management behind labs checkbox
|
2016-08-04 23:26:27 +01:00 |
|
David Baker
|
9d958ab508
|
Fix long freeze when opening 'historical' section
By rate limiting the list update in InviteMemberList as it seems the sync this triggers causes a load of member events.
Fixes https://github.com/vector-im/vector-web/issues/1845
|
2016-08-04 17:54:00 +01:00 |
|
David Baker
|
1f2b023885
|
Make sure error message never lies
Make sure we don't say 'login incorrect' unless the user is actually trying to log in
|
2016-08-04 17:37:07 +01:00 |
|
wmwragg
|
b99e7598f9
|
notification menu now has cickable radio buttons
|
2016-08-04 17:05:19 +01:00 |
|
wmwragg
|
5305cb6785
|
Copy change to better describe the function
|
2016-08-04 16:55:52 +01:00 |
|
wmwragg
|
990da61a61
|
Fixed regression of click propogation
|
2016-08-04 16:25:09 +01:00 |
|
wmwragg
|
b9e06bcf66
|
Moved mute state to mentions only
|
2016-08-04 16:17:47 +01:00 |
|
wmwragg
|
d204b043e5
|
Changed state from mute to mentions only
|
2016-08-04 16:17:21 +01:00 |
|
Richard van der Hoff
|
0351ab0a3d
|
Merge pull request #381 from matrix-org/dbkr/deactivate_account
Implement account deactivation
|
2016-08-04 15:38:29 +01:00 |
|
Matthew Hodgson
|
eb108c7866
|
Merge branch 'develop' into matthew/scalar
|
2016-08-04 13:41:04 +01:00 |
|
Matthew Hodgson
|
90e5ab2ca3
|
merge in develop
|
2016-08-04 13:39:47 +01:00 |
|
David Baker
|
f7fda68e26
|
Use p tags instead of brs
|
2016-08-04 10:53:07 +01:00 |
|
David Baker
|
c017e8dcf4
|
Initialise _passwordField & delete stale comment
|
2016-08-04 10:51:31 +01:00 |
|
David Baker
|
e144da75e3
|
Comment onLoggedOut & consistent comment style
|
2016-08-04 10:49:34 +01:00 |
|
Richard van der Hoff
|
e1fea24fd6
|
Merge pull request #389 from matrix-org/dbkr/room_published_check_controlled
Don't leave isRoomPublished as undefined
|
2016-08-04 10:42:34 +01:00 |
|
Richard van der Hoff
|
a190862ed3
|
Merge pull request #1919 from vector-im/dbkr/deactivate_account
CSS for deactivate account dialog
|
2016-08-04 10:32:41 +01:00 |
|
Matthew Hodgson
|
34a31a71fd
|
increase weight of unread rooms as it's the only way to tell if you have unread messages, and the weight difference is currently too subtle
|
2016-08-03 22:54:01 +01:00 |
|
Richard van der Hoff
|
24cc4f52bf
|
Downgrade emojione to 2.2.3
... because @aviraldg says > 2.2.3 is broken :/
|
2016-08-03 21:36:52 +01:00 |
|
Richard van der Hoff
|
f4e40696bc
|
Bump emojione to 2.2.3
Because @aviraldg says it's better.
|
2016-08-03 21:17:54 +01:00 |
|
Matthew Hodgson
|
6632322029
|
spell out that conference calling is hit and miss
|
2016-08-03 19:56:13 +01:00 |
|
David Baker
|
2d936a2850
|
Don't leave isRoomPublished as undefined
As this causes react to consider the component uncontrolled and then
warn when we change it to controlled
|
2016-08-03 18:23:38 +01:00 |
|
David Baker
|
afa46a855b
|
Merge remote-tracking branch 'origin/develop' into dbkr/deactivate_account
|
2016-08-03 17:52:35 +01:00 |
|
David Baker
|
498ad7fa4c
|
Merge branch 'develop' into dbkr/deactivate_account
|
2016-08-03 17:52:18 +01:00 |
|
David Baker
|
cbfb0ad998
|
Merge pull request #377 from matrix-org/dbkr/use_logout_api
Call the logout API when we log out
|
2016-08-03 17:51:42 +01:00 |
|
David Baker
|
bb3a7725db
|
Shift loginIncorrect into state
and consequently make setErrorTextFromError into setStateFromError
|
2016-08-03 17:49:29 +01:00 |
|
David Baker
|
476f69cbec
|
Unused ref
|
2016-08-03 17:38:13 +01:00 |
|
David Baker
|
b32a19a0f1
|
Comments
|
2016-08-03 17:23:09 +01:00 |
|
Matthew Hodgson
|
7774756ed1
|
fix lightbox on chrome 52: https://github.com/vector-im/vector-web/issues/1706
|
2016-08-03 17:19:36 +01:00 |
|
David Baker
|
0919e41469
|
Fix MatrixClientPeg.start()
Move import & use `this`
|
2016-08-03 16:45:23 +01:00 |
|
David Baker
|
009c768b72
|
Comma fail
|
2016-08-03 16:41:22 +01:00 |
|
David Baker
|
9bf45fb556
|
Add start wrapper in MatrixClientPeg
to handle the opts dictionary
|
2016-08-03 16:39:47 +01:00 |
|
David Baker
|
b95a1c4a4b
|
Just doc with the MatrixClientCreds object
|
2016-08-03 16:31:42 +01:00 |
|
David Baker
|
a5384d32e2
|
Copy opts to set pendingEventOrdering
|
2016-08-03 16:28:37 +01:00 |
|
David Baker
|
1b39f02141
|
Merge pull request #335 from aviraldg/feature-composer-emoji
feat: code cleanup & emoji replacement in composer
|
2016-08-03 16:18:56 +01:00 |
|
David Baker
|
03dbdd8c59
|
Merge pull request #387 from matrix-org/rav/react_test_debug
Add more logging to TimelinePanel-test
|
2016-08-03 16:13:23 +01:00 |
|
David Baker
|
3780d82f6f
|
Merge pull request #386 from matrix-org/rav/default_to_device_id
DevicesPanel: use device_id as a placeholder
|
2016-08-03 16:12:46 +01:00 |
|
David Baker
|
f469bbbb64
|
Refactor UI error effects
And add error effects to the login page to be consistent with the registration page
|
2016-08-03 15:59:17 +01:00 |
|
Matthew Hodgson
|
ee9f78d156
|
slightly better volume labels
|
2016-08-03 15:49:32 +01:00 |
|
Richard van der Hoff
|
42f6703112
|
Merge pull request #385 from matrix-org/rav/device_name_for_e2e_keys
MemberDeviceInfo: Use the device name, where available
|
2016-08-03 15:26:37 +01:00 |
|
Richard van der Hoff
|
8a57881618
|
Add more logging to TimelinePanel-test
In an attempt to figure out why this is timing out sometimes, add even more
debugging.
|
2016-08-03 15:24:56 +01:00 |
|