Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,870 Commits 3 Branches 492 Tags 100 MiB
9e15bda803
Commit Graph

1870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
David Baker
d0d7f2d2d2 Add 'enable labs' setting to sample config 2016-08-05 16:14: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
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
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
Matthew Hodgson
ee9f78d156 slightly better volume labels 2016-08-03 15:49:32 +01:00
Matthew Hodgson
70754db27a Merge pull request #1900 from vector-im/wmwragg/mention-state-menu 
Wmwragg/mention state menu
 2016-08-03 15:22:49 +01:00
wmwragg
16f8143f3e synced prefix flex with flex 2016-08-03 14:45:31 +01:00
wmwragg
be1f014294 Speech bubble tail shifted slightly, as the badge is now larger 2016-08-03 14:22:47 +01:00
wmwragg
f53f9af1c5 Badge width fixed, and hover state for badge now only on badge itself. 2016-08-03 14:11:17 +01:00
David Baker
58b1d62976 CSS for deactivate account dialog 
(Inc some generic CSS for error & danger fields)
 2016-08-03 11:38:19 +01:00
wmwragg
8e0f7f18a0 Design update to match the new Zeplin designs 2016-08-03 11:21:00 +01:00
Matthew Hodgson
75ea62f351 Merge pull request #1913 from Half-Shot/develop 
Fix UnknownBody styling for #1901
 2016-08-02 16:21:29 +01:00
wmwragg
ee8572559f Fixed small collapsed state hover issue with badges 2016-08-02 15:45:11 +01:00
wmwragg
f640be90ad Container height shrunk, so it doesn't bump the avatars when collapsed. Also search box gutters fixed 2016-08-02 15:00:47 +01:00
wmwragg
472acd4792 New design for long names 2016-08-02 14:46:31 +01:00
David Baker
8087e99808 Merge pull request #1914 from vector-im/rav/no_webpack_olm 
Exclude olm from the webpack
 2016-08-02 13:07:56 +01:00
Richard van der Hoff
51b74251f9 Exclude olm from the webpack 
Olm takes *ages* to webpack, and it doesn't compress well. So, serve it as a
separate asset to the browser.
 2016-08-02 12:44:23 +01:00
Will Hunt
8c7aede0cc Style UnknownBody with `white-space: pre-wrap;` 2016-08-02 11:13:46 +01:00
Matthew Hodgson
2829d95705 Merge pull request #1912 from vector-im/wmwragg/button-updates 
Wmwragg/button updates
 2016-08-01 20:37:15 +01:00
Matthew Hodgson
28057fd086 improve upgrade-to-app warning on mobile app 2016-08-01 18:36:08 +01:00
wmwragg
2e3ad3206c New video call icon 2016-08-01 16:46:13 +01:00
wmwragg
4f94cf5dfb New voice and video call icons 2016-08-01 16:44:58 +01:00
Matthew Hodgson
51e8c28ab6 Merge pull request #1828 from vector-im/wmwragg/button-updates 
Wmwragg/button updates
 2016-08-01 15:42:33 +01:00
David Baker
0f73228d55 Merge pull request #1909 from vector-im/rav/devices_panel 
CSS for device management UI
 2016-08-01 14:28:08 +01:00