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

10606 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Michael Telatynski
abd37d141e
clear up if statement to make it more readable 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 07:54:38 +01:00
Michael Telatynski
f5519c21b9
Merge branches 'develop' and 't3chguy/hide_empty_sublist' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_empty_sublist 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
 2018-06-26 07:51:16 +01:00
Michael Telatynski
cdf7101222
run gen-i18n and prune-i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 07:46:48 +01:00
Michael Telatynski
9b50daa748
give Historical an emptyContent to make it look more consistent 
and also to unbreak it since now !emptyContent get hidden

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-26 07:46:33 +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
Luke Barnard
e292ee942f Fix RoomSubList headers by re-commiting 1faecfd 
The original got reverted in ebfafb36 somehow.
 2018-06-25 16:37:45 +01: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