mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-13 11:46:34 +03:00
Code Issues Projects Releases Packages Wiki Activity
6253 commits 219 branches 562 tags 474 MiB
Commit graph

6253 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
1ad4a8170f
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/devtools 2017-08-26 18:28:56 +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
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
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
lazz0
56219dd649 Translated using Weblate (Spanish) 
Currently translated at 74.9% (728 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-08-22 17:09:29 +00:00
Andrey
ce4abc6bcc Translated using Weblate (Russian) 
Currently translated at 94.9% (922 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-08-22 17:09:29 +00:00
Krombel
ca0061f7a1 Translated using Weblate (German) 
Currently translated at 99.1% (963 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-08-22 17:09:28 +00:00
kaiyou
e427df4133 Translated using Weblate (French) 
Currently translated at 98.6% (958 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-08-22 17:09:28 +00:00
Weblate
729d3f7608 Merge remote-tracking branch 'origin/develop' into develop 2017-08-22 16:47:01 +00:00
strix aluco
eeadf63b6f Translated using Weblate (Ukrainian) 
Currently translated at 20.7% (200 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2017-08-22 16:46:58 +00:00
lazz0
9f762db59f Translated using Weblate (Spanish) 
Currently translated at 75.7% (729 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-08-22 16:46:58 +00:00
kaiyou
3c34c141c2 Translated using Weblate (French) 
Currently translated at 99.5% (959 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-08-22 16:46:58 +00:00
Jan Kudrik
630c405728 Translated using Weblate (Czech) 
Currently translated at 5.5% (53 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2017-08-22 16:46:57 +00:00
Richard Lewis
502a0480a0 Merge pull request #1327 from matrix-org/matthew/multiple-widgets 
Matthew/multiple widgets
 2017-08-22 10:53:51 +01:00
Richard Lewis
a69cc9169f lint fix. 2017-08-22 10:04:57 +01:00
Richard Lewis
74ab7c9bb3 Fix encoding 2017-08-22 09:59:27 +01:00
Szimszon
5648a7488a Translated using Weblate (Hungarian) 
Currently translated at 100.0% (963 of 963 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-08-21 19:55:31 +00:00
David Baker
a0fe3d1cb0 Merge pull request #1326 from matrix-org/rav/userpicker_proptypes 
Fix proptypes on UserPickerDialog
 2017-08-21 16:43:15 +01:00
Richard van der Hoff
764d5891ad Fix proptypes on UserPickerDialog 
... so that it doesn't log an error
 2017-08-21 16:30:49 +01:00
Richard Lewis
b7569a9831 Revert auxPanel changes (this should already have been fixed in a separate PR). 2017-08-21 15:29:11 +01:00
Robert Swain
bfb6f8f273 Merge pull request #1325 from matrix-org/rob/appdrawer-bind 
AppsDrawer: Remove unnecessary bind
 2017-08-21 15:59:47 +02:00
Robert Swain
385205471b AppsDrawer: Remove unnecessary bind 2017-08-21 15:34:13 +02:00