OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
10,825 Commits
202 Branches
546 Tags
420 MiB
Commit Graph

10825 Commits (22bde9fd50db11105e801c9a174a63c1e05ee698)

Author SHA1 Message Date
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
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
Weblate 7f8f6910ef Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 10:18:24 +00:00
Luke Barnard fc816369da
Merge pull request #2012 from matrix-org/t3chguy/autocomplete_mid_word 
prevent user,room,group autocomplete firing mid-word
 2018-06-25 11:18:16 +01:00
Kenneth Larsson 6addfdbcbb Translated using Weblate (Swedish) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2018-06-25 10:12:30 +00:00
Weblate 0bf4fbdfa9 Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 09:22:36 +00:00
Luke Barnard a24cb8e678
Merge pull request #2008 from matrix-org/t3chguy/focus_composer 
fix instances of composer not getting/regaining focus
 2018-06-25 10:22:29 +01:00
Michael Telatynski fabdf22aad
delint RoomSubList and generate eslintignore file 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-25 09:54:33 +01:00
Weblate c518d0df9a Merge remote-tracking branch 'origin/develop' into develop 2018-06-25 08:53:31 +00:00
strix aluco 06f55b51b8 Translated using Weblate (Ukrainian) 
Currently translated at 27.5% (330 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2018-06-25 08:53:30 +00:00
Марко М. Костић 0ccca7972e Translated using Weblate (Serbian) 
Currently translated at 100.0% (1198 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-06-25 08:53:30 +00:00
Paweł Kozioł e1f82f4120 Translated using Weblate (Polish) 
Currently translated at 93.8% (1124 of 1198 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-06-25 08:53:30 +00:00
Luke Barnard 383dccebb4
Merge pull request #2006 from matrix-org/t3chguy/notif_panel_fixes 
notif panel fixes
 2018-06-25 09:53:24 +01:00