da7a556629
More tests for the loading process:
Richard van der Hoff
2016-08-11 02:00:27 +01:00
c2cb4dff4c
Support for refactored login token handling
Richard van der Hoff
2016-08-11 01:55:51 +01:00
1fbddcf6af
Use the current HS for guest login
Richard van der Hoff
2016-08-11 01:30:43 +01:00
5b9d395234
Yet another fix to session saving
Richard van der Hoff
2016-08-11 00:58:48 +01:00
a85259c2b7
Fix session persistence
Richard van der Hoff
2016-08-10 23:52:09 +01:00
dd6868c255
Fix joining test
Richard van der Hoff
2016-08-10 22:39:53 +01:00
cab95f43ff
Show cancel button whilst inviting is in progress
David Baker
2016-08-10 18:58:36 +01:00
d6f7358f81
Make completionStates an object
David Baker
2016-08-10 18:50:56 +01:00
fa498eb8c6
Comment typo
David Baker
2016-08-10 18:37:21 +01:00
6b3b2e30fe
Don't reset completionStates
David Baker
2016-08-10 18:36:33 +01:00
b9f0b72ae1
Missing proptypes
David Baker
2016-08-10 18:35:59 +01:00
b411a2e489
Merge remote-tracking branch 'origin/develop' into dbkr/multi_invite
David Baker
2016-08-10 18:35:36 +01:00
020e4e14df
Factor out single-invite
David Baker
2016-08-10 18:32:42 +01:00
4a6a9bd95b
Remove redundant setState
David Baker
2016-08-10 18:28:20 +01:00
bb3a0ff08a
Merge pull request #404 from matrix-org/dbkr/fix_settings_persistence
Richard van der Hoff
2016-08-10 18:19:18 +01:00
92762eca74
Fix settings resetting on refresh
David Baker
2016-08-10 18:04:22 +01:00
28343aaa33
Aignment tweak for the room tag menu so the icons better align
wmwragg
2016-08-10 17:44:49 +01:00
3f615c6664
Basic CSS for multi-invite dialog
David Baker
2016-08-10 17:12:20 +01:00
54b3638a85
Better support for inviting multiple people
David Baker
2016-08-10 17:11:49 +01:00
6d1eebe6f2
Resized the avatar back to 24px, from 25px, as it has to be even so that the Text avatar aligns vertically correctly
wmwragg
2016-08-10 17:01:06 +01:00
804b17fbf1
Teaks to the CSS for the new ellipsis icon, and resizing the avatar back to 24px from 25px, as needs to be even number for the Text letter to align vertically
wmwragg
2016-08-10 17:00:06 +01:00
9798e14733
Menu colour now changeable, and leave room item hooked up. Some additional CSS tweaks to fit current design changes
wmwragg
2016-08-10 16:35:22 +01:00
e2d3631e7c
Menu colour now changeable, and leave room item hooked up
wmwragg
2016-08-10 16:34:49 +01:00
b742342062
Merge pull request #1938 from vector-im/rav/more_loading_tests
Richard van der Hoff
2016-08-10 16:02:01 +01:00
f08519a496
Merge pull request #401 from matrix-org/rav/avoid_login_for_guest
David Baker
2016-08-10 15:38:34 +01:00
839b985289
Merge pull request #400 from matrix-org/rav/cancel_rate_limited_funcs
David Baker
2016-08-10 15:37:02 +01:00
f8fa19ed47
Room tag menu dohickey on the avatar on hover
wmwragg
2016-08-10 15:04:02 +01:00
667264420c
hover state elements for the room tag menu, allong with CSS class updates
wmwragg
2016-08-10 14:46:05 +01:00
fe4bb3e413
More app-loading tests
Richard van der Hoff
2016-08-10 14:37:30 +01:00
68f8db3834
Avoid flashing up login screen during guest registration
Richard van der Hoff
2016-08-10 14:34:44 +01:00
8fe470bce1
Cancel calls to rate-limited funcs on unmount
Richard van der Hoff
2016-08-10 13:39:47 +01:00
6aa5e5a493
Merge pull request #399 from matrix-org/rav/refactor_session_rehydration
David Baker
2016-08-10 12:56:01 +01:00
0bcc4a6bad
Merge pull request #398 from matrix-org/dbkr/hide_integrations_header
Richard van der Hoff
2016-08-10 12:06:12 +01:00
ff13782ab5
Added set icons
wmwragg
2016-08-10 12:06:03 +01:00
3922f6a1b7
Move rehydration of MatrixClients from MatrixClientPeg to SessionLoader
Richard van der Hoff
2016-08-10 10:33:27 +01:00
b7b0991ae9
Don't show integrations header if setting not on
David Baker
2016-08-10 11:51:51 +01:00
b1dd7efed8
Fixed weird lightening of fonts on a refresh of page on safari
wmwragg
2016-08-10 11:51:23 +01:00
e0f71977b4
Merge pull request #397 from matrix-org/rav/factor_out_sessionloader
David Baker
2016-08-10 11:40:58 +01:00
699a58e0b3
Fix for historic and new undefined order issues
wmwragg
2016-08-10 11:39:10 +01:00
26c7c9e994
Make SessionLoader a function
Richard van der Hoff
2016-08-10 11:33:58 +01:00
6a19655886
Merge pull request #1936 from vector-im/rav/loading_tests
David Baker
2016-08-10 10:53:23 +01:00
13a4bfa8fe
Merge pull request #396 from matrix-org/rav/fix_react_warning
David Baker
2016-08-10 10:09:18 +01:00
afc889ff4d
Some tests of the application load process
Richard van der Hoff
2016-08-10 00:15:04 +01:00
b06c9f037e
gitignore copied olm.js
Richard van der Hoff
2016-08-10 00:09:26 +01:00
24841cc5c4
Start to factor out session-loading magic
Richard van der Hoff
2016-08-10 00:03:29 +01:00
a1d3db76e5
Hack around a react warning
Richard van der Hoff
2016-08-09 23:57:36 +01:00
1c812b340d
Initial pass at handling room tags that don't have an order element, but need one manual ordering
wmwragg
2016-08-09 19:20:27 +01:00
dbbea63227
Various fixes and improvements to emojification.
Aviral Dasgupta
2016-08-09 21:40:05 +05:30
bd9f5d3e06
Various fixes and improvements to emojification.
Aviral Dasgupta
2016-08-09 21:44:09 +05:30
cf8164bcc3
New icons
wmwragg
2016-08-08 18:11:18 +01:00
33612b7076
New dekete icon and ignoring olm.js
wmwragg
2016-08-08 17:11:08 +01:00
75e1277961
Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now
wmwragg
2016-08-08 16:55:27 +01:00
5a97786cc6
Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now
wmwragg
2016-08-08 16:55:02 +01:00
ee2329d236
make scrollbars bigger on hoverover
Matthew Hodgson
2016-08-07 21:35:41 +01:00
66f80b2239
let MemberInfo scroll if you have loads of E2E devices
Matthew Hodgson
2016-08-07 20:50:56 +01:00
62ebeb9fd8
Merge pull request #1930 from vector-im/dbkr/enable_labs
David Baker
2016-08-05 17:25:29 +01:00
4b8ad3c102
Merge pull request #393 from matrix-org/dbkr/enable_labs
David Baker
2016-08-05 17:25:25 +01:00
5e358b8cf6
Add comment
David Baker
2016-08-05 17:18:45 +01:00
f8d02c1551
pr feedback
David Baker
2016-08-05 16:36:35 +01:00
72ba708bfe
Menu separator styling
wmwragg
2016-08-05 16:35:59 +01:00
d0d7f2d2d2
Add 'enable labs' setting to sample config
David Baker
2016-08-05 16:14:03 +01:00
e8ee5c2f96
Add config to hide the labs section
David Baker
2016-08-05 16:13:06 +01:00
b3459be707
Initial RoomTagContextMenu wired in
wmwragg
2016-08-05 15:49:03 +01:00
5b812fead9
Initial RoomTagContextMenu wired in
wmwragg
2016-08-05 15:48:28 +01:00
d1e22d50f0
Merge pull request #1928 from vector-im/matthew/scalar
David Baker
2016-08-05 15:44:03 +01:00
98e89d4293
Merge pull request #392 from matrix-org/dbkr/scalar
David Baker
2016-08-05 15:43:57 +01:00
bf46c3cfab
Merge remote-tracking branch 'origin/develop' into matthew/scalar
David Baker
2016-08-05 15:37:38 +01:00
80e4a99477
Merge branch 'develop' into wmwragg/room-tag-menu
wmwragg
2016-08-05 15:27:14 +01:00
7880734d77
Merge branch 'develop' into wmwragg/room-tag-menu
wmwragg
2016-08-05 15:26:42 +01:00
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
wmwragg
2016-08-05 15:24:53 +01:00
5ce1aba493
Created initial RoomTagContextMenu component
wmwragg
2016-08-05 15:23:07 +01:00
c929076a83
Merge pull request #1929 from vector-im/dbkr/fix_unit_tests_replaceUsingCreds
Richard van der Hoff
2016-08-05 15:20:50 +01:00
99625067fe
Merge pull request #1926 from vector-im/wmwragg/mute-mention-state-fix
Matthew Hodgson
2016-08-05 14:44:48 +01:00
10aa201d33
Merge pull request #390 from matrix-org/wmwragg/mute-mention-state-fix
Matthew Hodgson
2016-08-05 14:44:27 +01:00
c9ab977d73
Fix unit tests
David Baker
2016-08-05 14:38:10 +01:00
ff02c21252
Merge pull request #391 from matrix-org/dbkr/fix_historical_freeze
Richard van der Hoff
2016-08-05 12:47:01 +01:00
e8dbf978c3
Merge pull request #388 from matrix-org/dbkr/refactor_field_errors
Richard van der Hoff
2016-08-05 12:34:56 +01:00
d0158f5812
fix merge conflict
Matthew Hodgson
2016-08-04 23:45:28 +01:00
e1fea24fd6
Merge pull request #389 from matrix-org/dbkr/room_published_check_controlled
Richard van der Hoff
2016-08-04 10:42:34 +01:00
a190862ed3
Merge pull request #1919 from vector-im/dbkr/deactivate_account
Richard van der Hoff
2016-08-04 10:32:41 +01:00
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
Matthew Hodgson
2016-08-03 22:54:01 +01:00
24cc4f52bf
Downgrade emojione to 2.2.3
Richard van der Hoff
2016-08-03 21:36:52 +01:00
f4e40696bc
Bump emojione to 2.2.3
Richard van der Hoff
2016-08-03 21:17:54 +01:00
6632322029
spell out that conference calling is hit and miss
Matthew Hodgson
2016-08-03 19:56:04 +01:00
Richard van der Hoff