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

6494 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
a29e7da06b Merge branch 'develop' into luke/feature-sticky-date-separators 2017-08-30 14:06:06 +01:00
David Baker
32b33c66b9 Merge pull request #1346 from matrix-org/t3chguy/shouldHideEvent_RoomStatusBar 
apply shouldHideEvent fn to onRoomTimeline for RoomStatusBar
 2017-08-30 13:58:40 +01:00
David Baker
b13ae76cfc Merge pull request #1345 from matrix-org/t3chguy/text4event_modified_widget 
text4event widget modified, used to show widget added each time.
 2017-08-30 13:56:27 +01:00
Luke Barnard
d516906b36 Implement sticky date separators 
Use `react-sticky` to implement sticky date separators. This will pin a date separator to the top of the timeline panel when the separator scrolls out of the top of the view.

A known issue of this is that the spinner, which is in line with event tiles in the timeline, will appear to push the stuck date separator down. In reality the first date separator after the spinner is in line with event tiles and is not stuck because the spinner forces the timeline to be scrolled slightly further down than it would be otherwise. But also, date separators in the timeline (not "stuck") have a greater height.

Ideally the date separator would be suppressed whilst back paginating, but this will cause the stuck separator to flicker on and off. This is why the suppression has been removed.
 2017-08-30 13:52:46 +01:00
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
Iru Cai (vimacs)
511e5d2d23 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 63.6% (618 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2017-08-30 10:18:43 +00: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
Bamstam
fdfa33b603 Translated using Weblate (German) 
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-08-28 20:51:57 +00:00
Nathan van Beelen
4a55fcbc26 Translated using Weblate (Dutch) 
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2017-08-28 15:01:50 +00:00
Silke
e66c7bf623 Translated using Weblate (Dutch) 
Currently translated at 94.2% (915 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2017-08-28 13:53:12 +00:00
Michael Telatynski
315f7a3ae7
apply shouldHideEvent fn to onRoomTimeline for RoomStatusBar 
prevents N new message(s) when a hidden message comes in.
 2017-08-28 13:46:09 +01:00
Osoitz
ff498e4c3a Translated using Weblate (Basque) 
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2017-08-28 09:20:28 +00:00
Michael Telatynski
6127727267
text4event widget modified, used to show widget added each time. 2017-08-28 08:19:39 +01:00
Iru Cai (vimacs)
a9fed3a9e7 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 60.5% (588 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2017-08-28 02:08:13 +00: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
Jeff Huang
5de4e3d2bb Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2017-08-26 13:25:54 +00:00
Miloslav Nenadál
f670e0f66b Translated using Weblate (Czech) 
Currently translated at 7.1% (69 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2017-08-26 09:58:54 +00: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
Lauris Mierkalns
8a27fde38d Translated using Weblate (Latvian) 
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/
 2017-08-25 20:49:02 +00:00
Magorak
a05d7bb6cb Translated using Weblate (Czech) 
Currently translated at 7.0% (68 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2017-08-25 19:43:21 +00: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
Andrey
221935d894 Translated using Weblate (Russian) 
Currently translated at 100.0% (971 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-08-25 05:54:07 +00:00
Paul Tötterman
0927d2c943 Translated using Weblate (Swedish) 
Currently translated at 55.2% (536 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2017-08-25 05:32:21 +00:00
Iru Cai (vimacs)
2942caf6a2 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 51.4% (500 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2017-08-25 03:43:10 +00:00
cafade
5f85bc6d7d Translated using Weblate (Spanish) 
Currently translated at 80.7% (784 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-08-24 21:41:33 +00: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