Richard van der Hoff
bb1854814c
Merge pull request #1951 from vector-im/dbkr/dont_redirect_email_verify
...
Don't redirect to mobile app if verifying 3pid
2016-08-11 12:50:06 +01:00
Richard van der Hoff
9e15bda803
comment typo
2016-08-11 12:49:57 +01:00
David Baker
e7ac66ad04
Don't redirect to mobile app if verifying 3pid
...
Fixes https://github.com/vector-im/vector-web/issues/1933
2016-08-11 12:44:49 +01:00
David Baker
4a0a911f3b
Merge pull request #1950 from vector-im/rav/clear_test_localstorage
...
Make sure that we clear localstorage before *all* tests
2016-08-11 12:34:37 +01:00
David Baker
7286aeb013
Merge pull request #1942 from vector-im/dbkr/multi_invite
...
Basic CSS for multi-invite dialog
2016-08-11 12:34:13 +01:00
Richard van der Hoff
244265d52b
Make sure that we clear localstorage before *all* tests
...
This was causing flaky tests, as sometimes the joining test would inherit an
"mx_is_guest" setting from a previous test run.
2016-08-11 11:42:29 +01:00
David Baker
ab93e96a1f
Merge pull request #1947 from vector-im/rav/token_login_tests
...
More tests for the loading process:
2016-08-11 11:16:27 +01:00
David Baker
5a17d8b450
Merge pull request #1946 from vector-im/rav/rav/refactor_token_login
...
Support for refactored login token handling
2016-08-11 10:52:32 +01:00
David Baker
43e3662e60
Merge pull request #1935 from aviraldg/fix-emoji
...
Various fixes and improvements to emojification.
2016-08-11 10:22:46 +01:00
Aviral Dasgupta
19d5063814
Merge branch 'develop' into fix-emoji
2016-08-11 14:51:17 +05:30
Richard van der Hoff
da7a556629
More tests for the loading process:
...
1. Check that localstorage is correctly updated on successful login (test for
https://github.com/matrix-org/matrix-react-sdk/pull/404 )
2. Check that the saved HS isused for guest registration (test for
https://github.com/matrix-org/matrix-react-sdk/pull/405 )
3. Test loginToken handling (test for
https://github.com/matrix-org/matrix-react-sdk/pull/406 /
https://github.com/vector-im/vector-web/pull/1946 )
2016-08-11 02:00:27 +01:00
Richard van der Hoff
c2cb4dff4c
Support for refactored login token handling
...
loginToken handling is now done by the session loader, so we need to pass in
the queryparams to MatrixChat.
Also, MatrixChat no longer automatically reloads the page to drop the
querystring, so we have to do that ourselves (doing it in index.js allows
tokenlogin to be tested).
2016-08-11 01:55:51 +01:00
Richard van der Hoff
dd6868c255
Fix joining test
...
This had been broken by
https://github.com/matrix-org/matrix-react-sdk/pull/399 . Change the way we
populate the matrixclient used for the joining tests.
2016-08-10 22:39:53 +01:00
David Baker
b411a2e489
Merge remote-tracking branch 'origin/develop' into dbkr/multi_invite
2016-08-10 18:35:36 +01:00
wmwragg
28343aaa33
Aignment tweak for the room tag menu so the icons better align
2016-08-10 17:44:49 +01:00
David Baker
3f615c6664
Basic CSS for multi-invite dialog
2016-08-10 17:12:20 +01:00
wmwragg
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
2016-08-10 17:00:06 +01:00
wmwragg
9798e14733
Menu colour now changeable, and leave room item hooked up. Some additional CSS tweaks to fit current design changes
2016-08-10 16:35:22 +01:00
Richard van der Hoff
b742342062
Merge pull request #1938 from vector-im/rav/more_loading_tests
...
More app-loading tests
2016-08-10 16:02:01 +01:00
wmwragg
f8fa19ed47
Room tag menu dohickey on the avatar on hover
2016-08-10 15:04:02 +01:00
Richard van der Hoff
fe4bb3e413
More app-loading tests
...
1. fix the 'Clean load' tests which had been broken by
https://github.com/matrix-org/matrix-react-sdk/pull/399 : make sure we clear
localStorage between tests.
2. Test the session rehydration properly by setting the localStorage rather
than setting up the MatrixClientPeg before loading the app.
3. Add some tests for the auto-guest-registration flows.
2016-08-10 14:37:30 +01:00
wmwragg
ff13782ab5
Added set icons
2016-08-10 12:06:03 +01:00
wmwragg
b1dd7efed8
Fixed weird lightening of fonts on a refresh of page on safari
2016-08-10 11:51:23 +01:00
wmwragg
699a58e0b3
Fix for historic and new undefined order issues
2016-08-10 11:39:10 +01:00
David Baker
6a19655886
Merge pull request #1936 from vector-im/rav/loading_tests
...
Some tests of the application load process
2016-08-10 10:53:23 +01:00
Richard van der Hoff
afc889ff4d
Some tests of the application load process
2016-08-10 00:15:04 +01:00
Richard van der Hoff
b06c9f037e
gitignore copied olm.js
2016-08-10 00:09:26 +01:00
wmwragg
1c812b340d
Initial pass at handling room tags that don't have an order element, but need one manual ordering
2016-08-09 19:20:27 +01:00
Aviral Dasgupta
bd9f5d3e06
Various fixes and improvements to emojification.
...
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Fix emoji spacing
2016-08-09 21:44:09 +05:30
wmwragg
cf8164bcc3
New icons
2016-08-08 18:11:18 +01:00
wmwragg
33612b7076
New dekete icon and ignoring olm.js
2016-08-08 17:11:08 +01:00
wmwragg
5a97786cc6
Initial pass of the tag menu, still lots of tweaking and bugfixing to do, but most of the mechanics are there now
2016-08-08 16:55:02 +01:00
Matthew Hodgson
ee2329d236
make scrollbars bigger on hoverover
2016-08-07 21:35:41 +01:00
Matthew Hodgson
66f80b2239
let MemberInfo scroll if you have loads of E2E devices
2016-08-07 20:50:56 +01:00
David Baker
62ebeb9fd8
Merge pull request #1930 from vector-im/dbkr/enable_labs
...
Add 'enable labs' setting to sample config
2016-08-05 17:25:29 +01:00
wmwragg
72ba708bfe
Menu separator styling
2016-08-05 16:35:59 +01:00
David Baker
d0d7f2d2d2
Add 'enable labs' setting to sample config
2016-08-05 16:14:03 +01:00
wmwragg
b3459be707
Initial RoomTagContextMenu wired in
2016-08-05 15:49:03 +01:00
David Baker
d1e22d50f0
Merge pull request #1928 from vector-im/matthew/scalar
...
Matthew/scalar
2016-08-05 15:44:03 +01:00
David Baker
bf46c3cfab
Merge remote-tracking branch 'origin/develop' into matthew/scalar
2016-08-05 15:37:38 +01:00
wmwragg
7880734d77
Merge branch 'develop' into wmwragg/room-tag-menu
2016-08-05 15:26:42 +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
David Baker
c9ab977d73
Fix unit tests
...
ReplaceUsingAccessToken was, uh, replaced with replacedUsingCreds
2016-08-05 14:38:10 +01:00
wmwragg
b99e7598f9
notification menu now has cickable radio buttons
2016-08-04 17:05:19 +01:00
wmwragg
b9e06bcf66
Moved mute state to mentions only
2016-08-04 16:17:47 +01:00
Matthew Hodgson
eb108c7866
Merge branch 'develop' into matthew/scalar
2016-08-04 13:41:04 +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
