OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
10,544 Commits
218 Branches
563 Tags
448 MiB
Commit Graph

10544 Commits (ea016a280b1ded930452437d39fbc5155a5bdf59)

Author SHA1 Message Date
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
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
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
David Baker ca8a4a0c3f Remove unused function 2018-06-26 12:08:33 +01:00
David Baker 6cf11a15e6 Move WidgetUtils to utils dir 2018-06-26 11:59:16 +01:00
David Baker 0f2c47937c Merge the two different widget utils files 2018-06-26 11:52:21 +01:00
David Baker 069080e7ed lint 2018-06-26 09:41:20 +01:00
Osoitz e2edf78abb Translated using Weblate (Basque) 
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/eu/
 2018-06-26 04:44:14 +00:00
Jeff Huang f88d26d71c Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2018-06-26 00:20:06 +00:00
Szimszon c23bb39203 Translated using Weblate (Hungarian) 
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/hu/
 2018-06-25 17:43:22 +00:00
Kévin C 95728e73bb Translated using Weblate (French) 
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/fr/
 2018-06-25 16:12:33 +00:00
Michael Telatynski f7dfba417c
Revert "affix copyButton so that it doesn't get scrolled horizontally" 2018-06-25 16:31:43 +01:00
David Baker 5c8eeff08a Refactor widgets code 
Split logic out of setWidget & re-use it when we add jitsi widgets.

Also fix the detection of existing jitsi widgets and make that use
getRoomWidgets() too.

Add error message when a jitsi call is already in process.
 2018-06-25 15:30:04 +01:00
Weblate bc7858193b Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 13:29:14 +00:00
Luke Barnard e67e1e8c0d
Merge pull request #2009 from matrix-org/t3chguy/login_local_error 
Login local errors for blank fields
 2018-06-25 14:29:09 +01:00
Weblate 5c721fb773 Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 12:38:06 +00:00
Luke Barnard 4594b045d2
Merge pull request #1917 from akihikodaki/lolex 
Update lolex to 2.7.0
 2018-06-25 13:37:59 +01:00
Michael Telatynski de316134a9
Merge branch 'develop' into t3chguy/login_local_error 2018-06-25 13:35:14 +01:00
Weblate 9a2c838ae2 Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 12:24:34 +00:00
David Baker 6577671cf0
Merge pull request #2011 from matrix-org/t3chguy/improve_linkifier 
Improve Linkifier
 2018-06-25 13:24:28 +01:00
Weblate 67e150aea1 Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 12:23:09 +00:00
David Baker 317c38ccdf
Merge pull request #2010 from matrix-org/t3chguy/message_context_menu 
use enum constants for EventStatus and correct isSent check
 2018-06-25 13:23:02 +01:00
Kévin C 24a48daad8 Translated using Weblate (French) 
Currently translated at 100.0% (1200 of 1200 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-06-25 11:48:27 +00:00
Weblate ff655a6bdd Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 11:13:26 +00:00
David Baker 7ef4377e57
Merge pull request #2007 from matrix-org/t3chguy/accent_insensitive_userprovider 
accent insensitive autocomplete
 2018-06-25 12:13:20 +01:00
Osoitz f941587d01 Translated using Weblate (Basque) 
Currently translated at 100.0% (1200 of 1200 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-06-25 10:56:39 +00:00
Weblate fb7c26d21c Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 10:50:21 +00:00
David Baker 553111b6e2
Merge pull request #2001 from matrix-org/t3chguy/default_url_previews_off_e2ee 
default to not showing url previews in e2ee rooms.
 2018-06-25 11:50:14 +01:00
Weblate b38149e74d Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 10:34:16 +00:00
David Baker e29e106efc
Merge pull request #1999 from matrix-org/t3chguy/chain_contextmenu 
allow chaining right click contextmenus
 2018-06-25 11:34:10 +01:00
Weblate 4d85d0ab53 Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 10:30:12 +00:00
Michael Telatynski 301b8b8c56
Merge pull request #1954 from matrix-org/t3chguy/hide_empty_sublist 
hide empty roomsublists when filtering via search/tagpanel
 2018-06-25 11:30:03 +01:00