Commit Graph

62585 Commits

Author SHA1 Message Date
Ange des ténèbres
b23838804e Translated using Weblate (French)
Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-08-30 15:40:44 +00:00
Weblate
676ce6aec1 Merge remote-tracking branch 'origin/develop' into develop 2017-08-30 15:16:28 +00:00
Luke Barnard
8874c4dd43 Merge pull request #4910 from vector-im/t3chguy/success_bug_report
lets let people know that the bug report actually sent properly :)
2017-08-30 16:16:24 +01:00
Weblate
9471ff87c4 Merge remote-tracking branch 'origin/develop' into develop 2017-08-30 15:11:29 +00:00
Herodotus
2c954d42ce Translated using Weblate (Tamil)
Currently translated at 70.0% (145 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ta/
2017-08-30 15:11:29 +00:00
Luke Barnard
679836aa08 Merge pull request #4934 from vector-im/docfix
another s/vector/riot/ in README
2017-08-30 16:11:24 +01:00
Eric Newport
c3fc366039 Translated using Weblate (French)
Currently translated at 98.8% (960 of 971 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-08-30 15:01:10 +00:00
Luke Barnard
88228a5a3f Implement sticky date separators
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1353
2017-08-30 14:06:50 +01:00
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
Luke Barnard
ebc1993530 Implement Flair
Add 14x14 group avatars next to sender profiles.
2017-08-30 11:10:49 +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
David Baker
e5912b996d copyright 2017-08-30 09:23:20 +01:00
David Baker
824b29dc1f PR feedback 2017-08-30 09:22:26 +01:00
Hubert Chathi
dd73aeec70 another s/vector/riot/
Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
2017-08-29 23:06:50 -04: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
Weblate
6f6ac46156 Merge remote-tracking branch 'origin/develop' into develop 2017-08-29 15:33:41 +00:00
Herodotus
0e16f095a0 Translated using Weblate (Tamil)
Currently translated at 59.9% (124 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ta/
2017-08-29 15:33:41 +00:00
Rupus Reinefjord
8cb76be414 Translated using Weblate (Swedish)
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/
2017-08-29 15:33:41 +00:00
Andrey
c8a22d31cd Translated using Weblate (Russian)
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-08-29 15:33:40 +00:00
anmcp
0b84873b92 Translated using Weblate (Portuguese)
Currently translated at 81.6% (169 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt/
2017-08-29 15:33:40 +00:00
Stefan Parviainen
106adfe9ed Translated using Weblate (Finnish)
Currently translated at 95.1% (197 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/
2017-08-29 15:33:40 +00:00
Jan Kudrik
7fd3e4133b Translated using Weblate (Czech)
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
2017-08-29 15:33:40 +00:00
Luke Barnard
2ad24a0c0f Merge pull request #4907 from vector-im/t3chguy/fix_two_roomlist_regressions
fix two room list regressions
2017-08-29 16:33:35 +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
Michael Telatynski
f560dc4c11 add useful comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-29 14:58:30 +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
d86fe0df6e Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist 2017-08-29 13:29:55 +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
Mohamed Aamir
a499efc8cf Translated using Weblate (Tamil)
Currently translated at 44.4% (92 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ta/
2017-08-29 10:59:59 +00: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