PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
6269 commits 1 branch 0 tags 338 MiB
Commit graph

6269 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
22bb635ff3 Merge pull request #1352 from matrix-org/fix_hide_rr_regression 
separate concepts of showing and managing RRs to fix regression
 2017-08-30 13:50:44 +01:00
Michael Telatynski
05c232c8c3
revert fancy indents 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-30 13:32:07 +01:00
Michael Telatynski
282618d5a1
separate concepts of showing and managing RRs to fix regression 2017-08-30 13:18:14 +01:00
Richard van der Hoff
e800c29e80 Update .eslintignore.errorfiles 
We seem to have fixed the lint in a bunch of files.
 2017-08-30 11:28:01 +01:00
Richard Lewis
84481f1a1e Merge pull request #1350 from matrix-org/rxl881/scalarTokenFix 
Make staging widgets work with live and vice versa.
 2017-08-30 11:04:50 +01:00
David Baker
52683625d6 Merge pull request #1349 from matrix-org/rav/avoid_sync_exception 
Avoid breaking /sync with uncaught exceptions
 2017-08-30 10:49:12 +01:00
Richard Lewis
2ff1888054 Make staging widgets work with live and vice versa. 2017-08-30 10:36:22 +01:00
Richard van der Hoff
b9e047f0ff Avoid breaking /sync with uncaught exceptions 
For reasons I don't fully understand, it appears that sometimes the
ReadReceiptMarker has no offsetParent. Rather than dying with an uncaught
exception when that happens (and taking out half of React as well as the /sync
handler), log a warning and suppress the animation.
 2017-08-30 10:01:45 +01:00
Luke Barnard
5e98aa4850 Merge pull request #1343 from matrix-org/t3chguy/fix_two_roomlist_regressions 
we need to pass whether it is an invite RoomSubList explicitly (i18n)
 2017-08-29 16:33:48 +01:00
Luke Barnard
3f11f9148f Merge pull request #1348 from matrix-org/dbkr/fix_forgot_password_percent_encode 
Percent encoding isn't a valid thing within _t
 2017-08-29 15:02:26 +01:00
Luke Barnard
890218fa96 Merge pull request #1339 from matrix-org/dbkr/fix_spurious_notifications 
Fix spurious notifications
 2017-08-29 14:57:11 +01:00
Luke Barnard
3fde35b16d Merge pull request #1347 from matrix-org/dbkr/unbreak_password_reset_alt_hs 
Unbreak password reset with a non-default HS
 2017-08-29 14:52:08 +01:00
David Baker
6d5b1b7a55 Percent encoding isn't a valid thing within _t 
Just use a plain apostrophe
 2017-08-29 14:18:24 +01:00
David Baker
ec983b838a Unbreak password reset with a non-default HS 
Broken by the change from onHsUrlChanged to onServerConfigChanged
in https://github.com/matrix-org/matrix-react-sdk/pull/811 where
ForgotPassword got missed.
 2017-08-29 14:07:43 +01:00
David Baker
3c149a11ae Merge pull request #1341 from matrix-org/dbkr/remove_audio_element_load 
Remove unnecessary 'load' on notif audio element
 2017-08-29 12:39:00 +01:00
Michael Telatynski
edb449dfe5
we need to pass whether it is an invite RoomSubList explicitly (i18n) 2017-08-27 23:38:25 +01:00
David Baker
6077693829 Merge pull request #1340 from matrix-org/t3chguy/fix_robot_error 
_tJsx returns a React Object, the sub fn must return a React Object
 2017-08-26 15:22:24 +01:00
David Baker
acbcc00016 Remove unnecessary 'load' on notif audio element 
It's not necessary to explicitly load and it throws an exception
if you call it while the element is playing, so better to just
remove it.
 2017-08-26 15:15:51 +01:00
Michael Telatynski
cd1e58cb61
_tJsx returns a React Object, the sub fn must return a React Object 
not a string
 2017-08-26 08:18:55 +01:00
David Baker
b15bbc8f9d copyright 2017-08-25 13:35:04 +01:00
David Baker
d63a0d30c8 Fix spurious notifications 
When loading new content whilst scrolling down the timeline .

Use the Event event which only fire for events received in a sync,
rather than Room.timeline which fires for events from pagination
too.
 2017-08-25 13:18:01 +01:00
Luke Barnard
006919cb44 Merge pull request #1292 from MTRNord/promiseDeprecationWarnings 
Fix deprecation warning about promise.defer()
 2017-08-24 16:20:48 +01:00
Marcel
d34ba57adb Add missing returns 2017-08-24 16:42:32 +02:00
David Baker
5cfec247f0 Merge pull request #1331 from matrix-org/luke/fix-completion-click-to-insert 
Fix click to insert completion
 2017-08-24 14:56:15 +01:00
David Baker
0e3ae2fa4f v0.10.2 2017-08-24 14:49:41 +01:00
David Baker
662e2b8b4c Prepare changelog for v0.10.2 2017-08-24 14:49:40 +01:00
David Baker
1b75470597 Released js-sdk 2017-08-24 14:48:22 +01:00
David Baker
db011e7065 Get variable name right 2017-08-24 14:42:38 +01:00
Marcel
88a0d34c2b Remove unused response_return variable 2017-08-24 15:40:52 +02:00
David Baker
939889705e Fix notifications for encrypted events (#1336) 
Remember events that we may need to notify for once decrypted and
evaluate them in an Event.decrypted listener.
 2017-08-24 14:27:38 +01:00
David Baker
814e08d843 Merge pull request #1334 from matrix-org/dbkr/update_on_event_decrypted 
Force update on timelinepanel when event decrypted
 2017-08-24 13:35:39 +01:00
David Baker
3e92380d79 Merge pull request #1337 from matrix-org/rav/handle_call_synchronously 
Dispatch incoming_call synchronously
 2017-08-24 13:31:13 +01:00
David Baker
9f0fda9d44 Merge pull request #1335 from matrix-org/t3chguy/unbrick_internetless 
Fix React crying on machines without internet due to return undefined
 2017-08-24 13:23:15 +01:00
Richard van der Hoff
b65e1769d7 Dispatch incoming_call synchronously 
- this should fix a race where if the 'hangup' arrives hard on the tail of the
Call.incoming, we don't ignore it.

(We still have a problem in that we blip the hangup tone and UI, but that is
arguably a separate problem)
 2017-08-24 13:05:17 +01:00
Michael Telatynski
ec6867dc8b
Fix React crying on machines without internet due to return undefined 2017-08-24 12:32:37 +01:00
David Baker
a2943ac348 Check room ID matches 2017-08-24 11:55:39 +01:00
David Baker
67824e9acc Force update on timelinepanel when event decrypted 
Partially fixes https://github.com/vector-im/riot-web/issues/4865
(the part about messages not appearing in the timeline until you
move the cursor over the window).

Requires https://github.com/matrix-org/matrix-js-sdk/pull/529
 2017-08-24 11:35:01 +01:00
David Baker
737a258944 Merge pull request #1333 from matrix-org/dbkr/fix_uncaught_exception_if_no_scalar 
Catch the promise rejection if scalar fails
 2017-08-24 09:45:51 +01:00
David Baker
c11432c3e3 Catch the promise rejection if scalar fails 
Otherwise this is incredibly annoying when developing if you don't
have a scalar that will allow you to register (ie. if you're
testing against an HS on your dev box)
 2017-08-23 19:35:33 +01:00
Luke Barnard
8ed5422a45 Fix click to insert completion 
And remedy weird API in the process. Autocomplete now exposes `onSelectionChange` to indicate that the user has selected another completion, rather than returning the chosen completion via onUpArrow etc.

Fixes vector-im/riot-web#4835
 2017-08-23 16:22:14 +01:00
David Baker
cc36304eb4 Merge branch 'master' into develop 2017-08-23 15:56:50 +01:00
David Baker
3581f6edaa v0.10.1 2017-08-23 15:56:09 +01:00
David Baker
878417d0e6 Prepare changelog for v0.10.1 2017-08-23 15:56:08 +01:00
David Baker
b8e351f489 Released js-sdk 2017-08-23 15:54:06 +01:00
David Baker
85b609608e v0.10.1-rc.1 2017-08-22 18:53:11 +01:00
David Baker
f4fb502fc3 Prepare changelog for v0.10.1-rc.1 2017-08-22 18:53:11 +01:00
David Baker
8312cf6ab2 Temporarily bump version 
so we compare to 0.10.0-rc.2 rather than 0.9.7
 2017-08-22 18:50:33 +01:00
David Baker
3939d948bf js-sdk v0.10.1-rc.1 2017-08-22 18:43:33 +01:00
David Baker
c203f417bc Merge pull request #1329 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-08-22 18:17:40 +01:00
strix aluco
ecaaee3b24 Translated using Weblate (Ukrainian) 
Currently translated at 20.5% (200 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2017-08-22 17:15:22 +00:00