OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,010 Commits
221 Branches
563 Tags
477 MiB
Commit Graph

7010 Commits (15cadd864c9bcb91b4308e297abe1673c5c6cc6b)

Author SHA1 Message Date
Andrey bee1623ddc Translated using Weblate (Russian) 
Currently translated at 100.0% (924 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-15 06:03:47 +00:00
Weblate 407233757e Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:47:19 +00:00
Matthew Hodgson 1d75d9e90d yet more horrifically strict linting :/ 2017-10-15 01:47:11 +01:00
Weblate 69881c4455 Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:19:14 +00:00
Matthew Hodgson 635996c083 more bizarrely strict linting :/ 2017-10-15 01:19:06 +01:00
Weblate 2f9e3104de Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:14:00 +00:00
Matthew Hodgson 247e32115f bizarrely strict linting :/ 2017-10-15 01:13:52 +01:00
Weblate 10019fb890 Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:03:23 +00:00
Bamstam b171636e1b Translated using Weblate (German) 
Currently translated at 99.5% (917 of 921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-15 00:03:22 +00:00
Matthew Hodgson 2b367edccf Merge pull request #1439 from turt2live/travis/pinned_messages 
Message/event pinning
 2017-10-15 01:03:18 +01:00
Weblate dd948272c5 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:49:39 +00:00
Matthew Hodgson 40c682008b Merge pull request #1483 from turt2live/travis/fix-oct14 
Remove duplicate declaration that breaks the build
 2017-10-14 23:49:35 +01:00
Weblate 57296d03e8 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:48:47 +00:00
Matthew Hodgson 67ba0e59a2 Merge pull request #1301 from zeroware/develop 
Include magnet scheme in sanitize HTML params
 2017-10-14 23:48:43 +01:00
Weblate 8f86a58261 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:45:53 +00:00
Matthew Hodgson b552b45a96 Merge pull request #1454 from matrix-org/t3chguy/jump_to_rr 
Add a way to jump to a user's Read Receipt from MemberInfo
 2017-10-14 23:45:49 +01:00
Matthew Hodgson e57d9e686b Merge branch 'develop' into t3chguy/jump_to_rr 2017-10-14 23:45:17 +01:00
Weblate a6a0fbfc91 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:43:16 +00:00
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