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

10645 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
5523c1e50a
Merge pull request #1964 from matrix-org/t3chguy/tag_panel_a11y 
fix styling of clearButton when its not there
 2018-06-14 11:47:44 +01:00
Szimszon
68e2ee4e51 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1194 of 1194 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-06-14 10:45:36 +00:00
Michael Telatynski
3b501137a5
change cursor:pointer iff clicking TagPanel background does something 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 11:42:21 +01:00
Michael Telatynski
c811c30c0d
fix styling of clearButton when its not there 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 11:36:04 +01:00
Weblate
5c80c4fd2f Merge remote-tracking branch 'origin/develop' into develop 2018-06-14 10:17:20 +00:00
Luke Barnard
7029e9ac74
Merge pull request #1912 from matrix-org/luke/kill-mimage-fixupheight 
Implement slightly magical CSS soln. to thumbnail sizing
 2018-06-14 11:17:15 +01:00
Michael Telatynski
384c974589
tidy up if statements and fix up comments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 11:16:57 +01:00
Weblate
aed948ad51 Merge remote-tracking branch 'origin/develop' into develop 2018-06-14 10:11:58 +00:00
Andrey
f6d75f8654 Translated using Weblate (Russian) 
Currently translated at 99.8% (1190 of 1192 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-06-14 10:11:58 +00:00
Michael Telatynski
3165a99f52
Merge pull request #1932 from matrix-org/t3chguy/audio_output 
Select audio output for WebRTC
 2018-06-14 11:11:53 +01:00
Michael Telatynski
2454540bc0
Merge branch 'develop' into t3chguy/audio_output 2018-06-14 11:03:59 +01:00
Szimszon
ebee8a8b5d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1192 of 1192 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-06-14 09:58:30 +00:00
Weblate
f8ca3674ac Merge remote-tracking branch 'origin/develop' into develop 2018-06-14 09:58:05 +00:00
David Baker
742a2d0111
Merge pull request #1962 from matrix-org/t3chguy/codeblock_notice 
move css rule to be more generic; remove overriden rule
 2018-06-14 10:57:58 +01:00
Weblate
b9f69d6893 Merge remote-tracking branch 'origin/develop' into develop 2018-06-14 09:56:09 +00:00
David Baker
84a9c6a824
Merge pull request #1960 from matrix-org/t3chguy/tag_panel_a11y 
improve tag panel accessibility and remove a no-op dispatch
 2018-06-14 10:56:03 +01:00
Weblate
15e4255db6 Merge remote-tracking branch 'origin/develop' into develop 2018-06-14 09:52:58 +00:00
David Baker
2e53baaaff
Merge pull request #1963 from matrix-org/revert-1961-dbkr/fix_devtools_exception 
Revert "Fix exception when opening dev tools"
 2018-06-14 10:52:53 +01:00
David Baker
666d469222
Revert "Fix exception when opening dev tools" 2018-06-14 10:52:39 +01:00
Weblate
2c0c97057f Merge remote-tracking branch 'origin/develop' into develop 2018-06-14 09:49:20 +00:00
David Baker
5804040a9b
Merge pull request #1959 from matrix-org/t3chguy/faded_encrypting_padlock 
fix message appears unencrypted while encrypting and not_sent
 2018-06-14 10:49:14 +01:00
Weblate
438dd00fe7 Merge remote-tracking branch 'origin/develop' into develop 2018-06-14 08:45:24 +00:00
Марко М. Костић
05e1dd55f0 Translated using Weblate (Serbian) 
Currently translated at 99.6% (1186 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-06-14 08:45:24 +00:00
Sotiris Papatheodorou
5dced2f699 Translated using Weblate (Greek) 
Currently translated at 71.8% (855 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
 2018-06-14 08:45:23 +00:00
David Baker
bb99950216
Merge pull request #1961 from matrix-org/dbkr/fix_devtools_exception 
Fix exception when opening dev tools
 2018-06-14 09:45:19 +01:00
Szimszon
3c4d62ddf8 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-06-14 08:36:04 +00:00
Michael Telatynski
a257dc27c5
move css rule to be more generic; remove overriden rule 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 19:08:24 +01:00
Michael Telatynski
d4578783ef
apply pr review feedback 
fix copyright headers
fix user settings link accessibility
fix typo and add noopener

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 18:46:02 +01:00
Weblate
c650acee48 Merge remote-tracking branch 'origin/develop' into develop 2018-06-13 16:28:29 +00:00
Osoitz
77708d5b65 Translated using Weblate (Basque) 
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-06-13 16:28:27 +00:00
David Baker
038b43aabd
Merge pull request #1956 from matrix-org/t3chguy/show_redacted_sticker 
show redacted stickers like other redacted messages
 2018-06-13 17:28:22 +01:00
David Baker
b81e12e4cc Fix exception when opening dev tools 
Apparently draft sometimes gets unhappy when you try to move to the
end of an empty state, so only move to the end if we actually
created a non-empty state.

This will be irrelevant once https://github.com/matrix-org/matrix-react-sdk/pull/1890
is merged, but I have the fix now, and this is probably otherwise
going to annoy me now I'm doing things where devtools is very useful.

Fixes https://github.com/vector-im/riot-web/issues/6436
 2018-06-13 16:55:16 +01:00
Michael Telatynski
75abb415d4
improve tag panel accessibility and remove a no-op dispatch 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 16:17:26 +01:00
Michael Telatynski
ac77b2d9ec
run gen-i18n and prune-i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 16:00:57 +01:00
Michael Telatynski
5cc2361737
change not_sent e2e lock to match colour of text 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 15:52:50 +01:00
David Baker
94125fb566 Fix widgets re-appearing after being deleted 
Widgets would sometimes briefly re-appear after having been deleted.
This was because of the following race:
 * User presses delete, send POST req, we set `deleting`. Widget hides.
 * POST request completes, we unset `deleting` so widget unhides.
 * State event comes down sync so widget hides again.

This fixes this by introducing `waitForRoomWidget` and using it to
wait until the state event comes down the sync until clearing the
`deleting` flag.

Since we now have `waitForRoomWidget`, this also uses it when adding
a widget so the 'widget saved' appears at the same time the widget
does.
 2018-06-13 15:50:19 +01:00
Michael Telatynski
d4b2f06a63
fix message appears unencrypted while in flight 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 13:51:04 +01:00
Luke Barnard
3cadbd3974 Include decryption error in decryption failure metrics 2018-06-13 11:21:26 +01:00
Akihiko Odaki
e98112254d Update lolex to 2.7.0 
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
 2018-06-13 19:08:07 +09:00
David Baker
1cb794753e Simplify & refactor some widget stuff 
* ScalarMessaging onMessage was getting the current room ID by listening
  for view_and remembering the room id or alias, and so having to look up
  the alias if it was alias. We have RoomViewStore for this.
 * Move waitForUserWidget into WidgetUtils
 * s/require/import/
 2018-06-13 10:39:52 +01:00
Weblate
229f43db5f Merge remote-tracking branch 'origin/develop' into develop 2018-06-13 09:04:28 +00:00
Luke Barnard
bfb535d05c
Merge pull request #1951 from matrix-org/t3chguy/theme_memberinfo_close_btn 
add mx_filterFlipColor to mx_MemberInfo_cancel img
 2018-06-13 10:04:23 +01:00
Weblate
d996e7eebd Merge remote-tracking branch 'origin/develop' into develop 2018-06-13 09:03:41 +00:00
Luke Barnard
5a275fcfef
Merge pull request #1953 from matrix-org/t3chguy/skip_set_displayname 
don't set the displayname on registration as Synapse now does it
 2018-06-13 10:03:35 +01:00
Michael Telatynski
41be46a712
apply roomlist searchFilter to aliases if it begins with a # 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 09:51:35 +01:00
Weblate
4ac8b7747c Merge remote-tracking branch 'origin/develop' into develop 2018-06-13 08:45:35 +00:00
Osoitz
8136069046 Translated using Weblate (Basque) 
Currently translated at 100.0% (1190 of 1190 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-06-13 08:45:32 +00:00
Luke Barnard
791784399a
Merge pull request #1955 from matrix-org/t3chguy/create_room_dialog_scaling 
allow CreateRoom to scale properly horizontally
 2018-06-13 09:45:29 +01:00
Luke Barnard
230de44071 Adjust comment 2018-06-13 09:38:57 +01:00
Luke Barnard
64b86108d0 Only track decryption failures 2018-06-13 09:38:23 +01:00