Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 06:35:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,194 Commits 206 Branches 552 Tags 519 MiB
a52bb9d603
Commit Graph

7194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Hodgson
f32ba0b54c Merge pull request #1462 from pafcu/translation-fixes 
Use standard subsitution syntax in _tJsx
 2017-10-14 23:43:12 +01:00
Weblate
463e17b223 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:41:36 +00:00
Matthew Hodgson
71d25bf787 Merge pull request #1442 from turt2live/travis/no_grey 
Don't suggest grey as a color scheme for a room
 2017-10-14 23:41:32 +01:00
Travis Ralston
c55ffe1be7 Remove duplicate declaration that breaks the build 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:41:02 -06:00
Travis Ralston
8a641c7173 Hide message pinning behind a labs setting 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:40:10 -06:00
Travis Ralston
838b9957da Merge remote-tracking branch 'matrix-org/develop' into travis/pinned_messages 2017-10-14 16:33:46 -06:00
Weblate
3428c1c3d3 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:10:39 +00:00
Matthew Hodgson
a5c8d061a8 Merge pull request #1362 from matrix-org/t3chguy/hide_notification_body 
allow hiding of notification body for privacy reasons
 2017-10-14 23:10:35 +01:00
Travis Ralston
c34b55c6c7 Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:10:32 -06:00
Matthew Hodgson
d63a25a183 Merge branch 'develop' into t3chguy/hide_notification_body 2017-10-14 23:10:01 +01:00
Weblate
9051efeecf Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:44:35 +00:00
Matthew Hodgson
dfc3dcff9d Merge pull request #1466 from turt2live/travis/alone_warning 
Suggest to invite people when speaking in an empty room
 2017-10-14 22:44:31 +01:00
Matthew Hodgson
9f64261707 Merge branch 'develop' into travis/alone_warning 2017-10-14 22:43:36 +01:00
Weblate
dde0cc1baa Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:13:35 +00:00
Matthew Hodgson
3efa0d2a76 Merge pull request #1478 from turt2live/travis/unset-avatar 
Buttons to remove room/self avatar
 2017-10-14 22:13:32 +01:00
Matthew Hodgson
8d6f0db3e2 be explicit in remove button height 2017-10-14 22:13:00 +01:00
Weblate
538e0251ed Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:09:59 +00:00
Matthew Hodgson
0284a582a1 Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist 
T3chguy/fix memberlist
 2017-10-14 22:09:55 +01:00
Weblate
fd6d1f0a75 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:06:20 +00:00
Andrey
6dad6da66e Translated using Weblate (Russian) 
Currently translated at 94.8% (870 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-14 21:06:20 +00:00
Carlos Marques
8efeab924a Translated using Weblate (Portuguese) 
Currently translated at 93.0% (853 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
 2017-10-14 21:06:19 +00:00
Bamstam
329e258122 Translated using Weblate (German) 
Currently translated at 99.8% (916 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-14 21:06:19 +00:00
Matthew Hodgson
20ca318543 Merge pull request #1481 from matrix-org/t3chguy/disable_big_emoji 
add option to disable BigEmoji
 2017-10-14 22:06:15 +01:00
Michael Telatynski
c7c28c7ad2
make linter happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 19:53:08 +01:00
Michael Telatynski
c1edc0c32e
add option to disable BigEmoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 19:40:45 +01:00
Michael Telatynski
b0b7472901
undo bad merge 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:14:57 +01:00
Michael Telatynski
e79f9ef011
=== > == 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:10:51 +01:00
Michael Telatynski
6ad8532bed
lowerCase query so that searching for Erik will actually find Erik.. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:09:58 +01:00
Michael Telatynski
a000439948
pass search query to filter fn in _updateList 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:09:30 +01:00
Travis Ralston
97ebd27175 Add missing translation 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 23:08:41 -06:00
Travis Ralston
6e7f0d649b Add option to unset your own avatar 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 21:13:47 -06:00
Travis Ralston
e5c8e3e7ad Add option to unset room avatar 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 20:57:15 -06:00
Luke Barnard
6f20445a42 Explain topic click stopPropagation 2017-10-13 17:57:28 +01:00
Luke Barnard
3468abc975 Use GeminiScrollbar instead of ScrollPanel 2017-10-13 17:49:52 +01:00
Szimszon
34e9b10e95 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (917 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-10-13 16:44:09 +00:00
Luke Barnard
4b24eab8fd Merge branch 'luke/groups-room-directory-esque' of github.com:matrix-org/matrix-react-sdk into luke/groups-room-directory-esque 2017-10-13 17:19:58 +01:00
Luke Barnard
aaf32ac9a0 Lint 2017-10-13 16:57:52 +01:00
Luke Barnard
83e7fc242a Merge branch 'develop' into luke/groups-room-directory-esque 2017-10-13 17:48:35 +02:00
Luke Barnard
77418f535e Modify GroupView UI 
- Remove featured users/rooms
 - Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode.
 - Make the group view body scrollable
 2017-10-13 16:46:33 +01:00
David Baker
3b515cdebe v0.10.7-rc.3 2017-10-13 16:31:35 +01:00
David Baker
8470a03530 Prepare changelog for v0.10.7-rc.3 2017-10-13 16:31:34 +01:00
David Baker
ae2908ed65 Merge remote-tracking branch 'origin/develop' into release-v0.10.7 2017-10-13 16:29:36 +01:00
Weblate
a4cdbd5fd4 Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 15:14:45 +00:00
Szimszon
f5abd1c2c8 Translated using Weblate (Hungarian) 
Currently translated at 93.5% (858 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-10-13 15:14:44 +00:00
Luke Barnard
d7c3fc9adb Merge pull request #1474 from matrix-org/dbkr/fix_enablelabs_again 
Fix the enableLabs flag, again
 2017-10-13 17:14:40 +02:00
David Baker
d0759a537b Fix the enableLabs flag, again 
We were showing the options but ignoring them
 2017-10-13 16:06:17 +01:00
David Baker
b95c2368a6 v0.10.7-rc.2 2017-10-13 15:02:37 +01:00
David Baker
56825efc72 Prepare changelog for v0.10.7-rc.2 2017-10-13 15:02:36 +01:00
David Baker
705254ac55 Merge remote-tracking branch 'origin/develop' into release-v0.10.7 2017-10-13 15:00:49 +01:00
Weblate
98a5669eb1 Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 13:43:44 +00:00