Commit Graph

10870 Commits (f655e2eb8665f00011b13037828fde12335dc728)

Author SHA1 Message Date
Luke Barnard 4c575bb1ca
Merge pull request #2018 from matrix-org/luke/fix-piwik-path-reporting
Redact pathnames with origin `file://`
2018-06-27 10:40:17 +01:00
Weblate 680b0fdd0e Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 09:33:45 +00:00
Luke Barnard cf24427d12
Merge pull request #2022 from matrix-org/dbkr/update_package_lock
Update package-lock.json
2018-06-27 10:33:41 +01:00
Luke Barnard 483edb8211 `pathname` is not constant 2018-06-27 10:31:51 +01:00
Weblate 2c9dd9469e Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 09:29:26 +00:00
David Baker 6fb57c0c66
Merge pull request #2021 from matrix-org/t3chguy/room_sub_list_badge_click
on room sub list badge click goto first relevant room
2018-06-27 10:29:22 +01:00
Weblate fd40e21175 Merge remote-tracking branch 'origin/develop' into develop 2018-06-27 09:27:38 +00:00
Peter Vágner 7ab229cd4d Translated using Weblate (Slovak)
Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-27 09:27:38 +00:00
David Baker 2bc1679b97
Merge pull request #2020 from matrix-org/t3chguy/improve_linkifier2
improve linkifier AGAIN
2018-06-27 10:27:30 +01:00
David Baker ee729233c8 Update package-lock.json 2018-06-27 10:17:25 +01:00
Michael Telatynski a6ab51cd73
change GroupInviteTile from RoomSubList css so new :hover won't apply
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-27 09:50:32 +01:00
Michael Telatynski 613e83edb4
on roomsublist invite badge click goto first room/group
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-27 09:49:58 +01:00
Michael Telatynski b3341e6664
on click roomsublist notif badge, goto first room with notif
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-27 09:49:25 +01:00
Szimszon 0c2240a1f2 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-06-27 08:49:00 +00:00
Osoitz 13d26d0d58 Translated using Weblate (Basque)
Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-06-27 08:31:41 +00:00
Slavi Pantaleev 2782b2ff9d Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-06-27 05:52:57 +00:00
Michael Telatynski 96163d1402
prevent multiple ports (🔢1234:1234)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 23:41:46 +01:00
Michael Telatynski 9f3a121abc
optimize linkify-matrix by skipping an intermediary state
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 23:36:01 +01:00
Michael Telatynski 09b09846cf
allow `:port` specifiers in roomalias,groupid and userid as per spec
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 23:33:35 +01:00
Peter Vágner 5c7f2cc32f Translated using Weblate (Slovak)
Currently translated at 100.0% (1207 of 1207 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-26 19:58:27 +00:00
Weblate 12d020909e Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 17:26:34 +00:00
David Baker 67dc8f2a8e
Merge pull request #2016 from matrix-org/t3chguy/hide_empty_sublist
fix historical section
2018-06-26 18:26:29 +01:00
Weblate a1b32d865d Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 17:23:42 +00:00
David Baker fddb576c3a
Merge pull request #2014 from matrix-org/luke/fix-roomlist-headers-on-resize
Fix RoomSubList headers by re-commiting 1faecfd
2018-06-26 18:23:38 +01:00
Weblate 45c31c0b24 Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 16:46:57 +00:00
Peter Vágner fc593d7359 Translated using Weblate (Slovak)
Currently translated at 99.8% (1204 of 1206 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-26 16:46:57 +00:00
Michael Telatynski f40802e9d8
Merge pull request #2017 from matrix-org/t3chguy/timestamp_share_dialog_stop
don't fire share dialog when clicking timestamp of event,
2018-06-26 17:46:52 +01:00
Weblate ea016a280b Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 16:18:27 +00:00
David Baker 166ec68a9a
Merge pull request #2013 from matrix-org/revert-1980-t3chguy/fix_copy-code-block_hscroll
Revert "affix copyButton so that it doesn't get scrolled horizontally"
2018-06-26 17:18:21 +01:00
Weblate 0724a033a6 Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 16:15:25 +00:00
Peter Vágner d91730d930 Translated using Weblate (Slovak)
Currently translated at 99.7% (1203 of 1206 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-26 16:15:24 +00:00
David Baker 10e39d5a5d
Merge pull request #2019 from matrix-org/t3chguy/room_settings_leave_room
when the user switches room, close room settings
2018-06-26 17:15:19 +01:00
Michael Telatynski a548c83647
when the user switches room, close room settings
this is especially annoying if they choose Leave Room
which indirectly switches room

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 17:07:39 +01:00
Luke Barnard 19e948155c Redact pathnames with origin `file://` 2018-06-26 17:06:45 +01:00
Weblate 12e5eb5f78 Merge remote-tracking branch 'origin/develop' into develop 2018-06-26 16:00:07 +00:00
Peter Vágner cef624d6be Translated using Weblate (Slovak)
Currently translated at 99.8% (1202 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-26 16:00:06 +00:00
Andrey e1afe2a469 Translated using Weblate (Russian)
Currently translated at 99.6% (1200 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-06-26 16:00:06 +00:00
Marek Lach b1b140d7aa Translated using Weblate (Czech)
Currently translated at 89.8% (1082 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2018-06-26 16:00:05 +00:00
David Baker 1c6e5e1cc1
Merge pull request #2015 from matrix-org/dbkr/widgets_refactor
Refactor widgets code
2018-06-26 16:59:58 +01:00
Michael Telatynski 67f803bc5f
don't fire share dialog when clicking timestamp of event,
it was tripping people up and broke search permalinks

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-26 16:59:49 +01:00
Marek Lach 4fb4589ebd Translated using Weblate (Slovak)
Currently translated at 99.7% (1201 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-06-26 15:52:27 +00:00
David Baker 0ee8d18f5a More code de-duping 2018-06-26 16:41:44 +01:00
David Baker c780cd05a8 Change argument order of setRoomWidget
So when deleting a widget we can just omit the ones we don't need
2018-06-26 16:33:28 +01:00
David Baker a88297d7a6 More code reuse 2018-06-26 16:27:17 +01:00
David Baker 9539a749e5 More refactoring 2018-06-26 16:03:58 +01:00
David Baker cb89406d3e Indent 2018-06-26 15:42:29 +01:00
David Baker 4a39297e65 PR feedback 2018-06-26 15:41:43 +01:00
Krombel c971b685ad Translated using Weblate (German)
Currently translated at 100.0% (1204 of 1204 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-06-26 14:35:54 +00:00
David Baker 0a6450507e Bits of PR feedback 2018-06-26 15:21:22 +01:00
David Baker b6f3b2f594 More code re-use 2018-06-26 12:28:59 +01:00