nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
62,959 Commits 258 Branches 582 Tags
f52d7a8e207301ac62497ca7cd25bf64b6834d81
Commit Graph

62959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
10e41d7a26 changelog 2016-08-12 10:04:35 +01:00
David Baker
fc0c5a5c58 Tidy up fix to multi-invite 2016-08-12 10:02:55 +01:00
David Baker
678393e2bd Add note about file table overflows 2016-08-12 09:59:56 +01:00
Richard van der Hoff
df22768f1b Use server-generated deviceId 2016-08-12 07:31:15 +01:00
Richard van der Hoff
5440fd7504 Fix tests 
MatrixClientPeg no longer has a replaceUsingUrls method, so don't try to stub
it out.
 2016-08-12 07:27:53 +01:00
Matthew Hodgson
d1eec57118 fix inviting some more 2016-08-11 17:11:51 -05:00
Matthew Hodgson
3bedad69cd unbreak inviting :( 2016-08-11 17:08:17 -05:00
David Baker
25d8a7999f 0.7.4 v0.7.4 2016-08-11 17:47:17 +01:00
David Baker
014f7ade86 Prepare changelog for v0.7.4 2016-08-11 17:47:16 +01:00
David Baker
2b671fcafc js-sdk & react sdk released 2016-08-11 17:45:10 +01:00
wmwragg
434115ccda Bugifx: 'background-color' in react should be 'backgroundColor' 2016-08-11 17:34:05 +01:00
wmwragg
7713f0d587 refactoring out the direct message section 2016-08-11 17:32:39 +01:00
David Baker
ec9243d4b0 0.6.4 2016-08-11 17:29:10 +01:00
David Baker
028c652f49 Prepare changelog for v0.6.4 2016-08-11 17:29:10 +01:00
David Baker
e4dd387376 JS SDK 0.5.5 released 2016-08-11 17:28:09 +01:00
wmwragg
cc1cec8431 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-11 16:48:31 +01:00
wmwragg
a07833e7fc Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-11 16:47:19 +01:00
David Baker
109184aab7 Merge pull request #411 from matrix-org/dbkr/fix_messagecomposer_style 
Only show Autocomplete if autocomplete is enabled
 2016-08-11 16:47:07 +01:00
David Baker
df5b243e75 Merge pull request #1954 from vector-im/dbkr/fix_messagecomposer_style 
Don't show border on composer when not in RTE mode
 2016-08-11 16:47:00 +01:00
wmwragg
4aea2caefc Initial pass at creating a direct message section 2016-08-11 16:45:19 +01:00
David Baker
5e43f2752a Don't show border on composer when not in RTE mode 
This breaks the opacity animation (so remove the transition) but the extra border was making the border on the composer too thick.
 2016-08-11 16:30:53 +01:00
David Baker
7cb663d39d Only show Autocomplete if autocomplete is enabled 
It was just never used, but it has 1px top border which makes the top border on chat look too big
 2016-08-11 16:28:32 +01:00
Richard van der Hoff
55a28564b9 Add device_id to devices display 
(it turns out to be quite useful)
 2016-08-11 16:24:09 +01:00
Richard van der Hoff
e32c325863 Don't use MatrixClientPeg for temporary clients 
Get rid of MatrixClientPeg.replaceUsingUrls, and instead create local,
temporary MatrixClients for the unauthed steps; we therefore only use
MatrixClientPeg for logged-in clients.
 2016-08-11 16:23:03 +01:00
David Baker
0cb14ba5ec Don't force scrollbar on multi-invite 2016-08-11 15:11:31 +01:00
Matthew Hodgson
d65477891e Merge pull request #1941 from vector-im/wmwragg/room-tag-menu 
Wmwragg/room tag menu
 2016-08-11 09:00:48 -05:00
Matthew Hodgson
3704e2c648 Merge pull request #402 from matrix-org/wmwragg/room-tag-menu 
Wmwragg/room tag menu
 2016-08-11 08:59:32 -05:00
David Baker
4f76398b29 Merge pull request #407 from matrix-org/rav/refactor_guest_registration 
Move guest registration into the login logic
 2016-08-11 13:13:51 +01:00
Richard van der Hoff
e06763d421 Move guest registration into the login logic 2016-08-11 13:05:16 +01:00
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
4780f9000d Merge pull request #403 from matrix-org/dbkr/multi_invite 
Better support for inviting multiple people
 2016-08-11 12:34:16 +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
David Baker
f42d619e7d Missing comma 2016-08-11 12:30:37 +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
5b71b28dcf Fix member info 2016-08-11 11:34:14 +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
3b317eb15d Merge pull request #406 from matrix-org/rav/refactor_token_login 
Refactor login token
 2016-08-11 11:09:05 +01:00
Richard van der Hoff
bbfb9291f8 Refactor login token 
move the logic for handling login tokens into Lifecycle.loadSession

This means it needs access to the (real) query parmeters, so it depends on
corresponding changes in vector-web.
 2016-08-11 11:02:52 +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
6802db05bd Merge pull request #405 from matrix-org/rav/use_right_hs_for_guest_login 
Use the current HS for guest login
 2016-08-11 10:32:37 +01:00
David Baker
46899a0086 Merge pull request #395 from aviraldg/fix-emoji 
Various fixes and improvements to emojification.
 2016-08-11 10:23:00 +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
David Baker
806477dcce s/then/done/ 2016-08-11 10:08:14 +01:00
David Baker
a58a6275e5 Just use _canceled 
Instead of both that and _unmounted
 2016-08-11 10:06:22 +01:00
Aviral Dasgupta
4c1dcb924b reskindex and use sdk.getComponent for EmojiText 2016-08-11 07:55:12 +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