Commit Graph

62531 Commits

Author SHA1 Message Date
Krombel 8f5cb598f0 Translated using Weblate (German)
Currently translated at 99.3% (918 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 20:12:33 +00:00
Stefan Parviainen ad2f54f8ab Fix italics and parens
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-15 18:01:57 +02:00
Stefan Parviainen 15d1dc1f3b Fix indentation
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-15 16:57:22 +02:00
Stefan Parviainen 9a5cffb5eb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into departify 2017-10-15 16:49:27 +02:00
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
Jeff Huang da67a2c078 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2017-10-15 05:57:19 +00:00
Andrey f9186ae8fc Translated using Weblate (Russian)
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-10-15 05:31:08 +00:00
Travis Ralston 7307bc412f Respond to updates from presence context menu
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 23:16:12 -06:00
Travis Ralston deb50b2d43 Add presence context menu and styling
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 23:15:26 -06:00
Travis Ralston e2b02ad60d Merge branch 'develop' into travis/presence 2017-10-14 21:45:59 -06:00
Travis Ralston 1ca041c59c CSS for more positioning options on context menus
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 21:45:29 -06:00
Travis Ralston c483717282 Make onClick be a context menu for presence
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 21:44:07 -06:00
Travis Ralston 03800b7476 Support more positioning options on context menus
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 21:43:47 -06:00
Travis Ralston 788e16a716 Linting
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 20:23:50 -06:00
Travis Ralston 0b20681f6a Put presence management behind a labs setting
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 19:13:46 -06:00
Travis Ralston 854394cb2e Merge branch 'develop' into travis/presence 2017-10-14 18:49:58 -06: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 b71bcb4e9b Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:02:53 +00:00
Matthew Hodgson f143315618 Merge pull request #5142 from turt2live/travis/pinned_messages
Message/event pinning
2017-10-15 01:02:49 +01:00
Travis Ralston 6f968522f5 Merge branch 'develop' into travis/presence 2017-10-14 17:27:18 -06:00
Travis Ralston 49c19bc9b4 Merge branch 'develop' into travis/presence 2017-10-14 17:26:54 -06:00
Bamstam 4a5e2e347b Translated using Weblate (German)
Currently translated at 100.0% (210 of 210 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-10-14 23:11:20 +00: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
Travis Ralston 6926c96f36 Hide pinning messages behind a labs settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:41:44 -06: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
Matthew Hodgson 6f819606c1 Merge pull request #4054 from ollieh/issues/3771
Sorting of networks within a protocol based on name
2017-10-14 23:21:51 +01:00
Travis Ralston 3e066d3aef Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:11:17 -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