OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,188 Commits
211 Branches
549 Tags
667 MiB
Commit Graph

7188 Commits (b421fd05ef77ad355b7064400b8d7337eaf50097)

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

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-16 17:28:06 +00:00
Luke Barnard 14eee9a37a Only show invited section if there are invited group members 2017-10-16 17:59:53 +01:00
Luke Barnard 0c34e943fb Merge branch 'develop' into luke/groups-are-communities 2017-10-16 17:34:06 +01:00
Weblate 8921eb903f Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 16:29:19 +00:00
Luke Barnard 760b3cc60a Merge pull request #1488 from matrix-org/luke/groups-invited-users 
Show "Invited" section in the user list
 2017-10-16 18:29:15 +02:00
Luke Barnard 9b08f4d11f Separate fetching indicator state 2017-10-16 17:21:05 +01:00
Weblate 88cc53f770 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 15:42:28 +00:00
David Baker 9d2f5b0a8a Merge pull request #1487 from matrix-org/luke/fix-overflow-entity-tile 
Refactor class names for an entity tile being hovered over
 2017-10-16 16:42:23 +01:00
Luke Barnard 008e8d4f54 Show "Invited" section in the user list 2017-10-16 16:38:32 +01:00
Luke Barnard 47ac0988ba Refactor class names for an entity tile being hovered over 2017-10-16 16:31:13 +01:00
Weblate 598a9a6cf3 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 13:46:40 +00:00
Stefan Parviainen 9edcd0a9e5 Translated using Weblate (Finnish) 
Currently translated at 78.8% (729 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2017-10-16 13:46:39 +00:00
David Baker bbf3550865 Merge branch 'master' into develop 2017-10-16 14:46:11 +01:00
David Baker f58d89ef80 v0.10.7 2017-10-16 14:45:14 +01:00
David Baker bb623ca0a7 Prepare changelog for v0.10.7 2017-10-16 14:45:13 +01:00
David Baker bcb792a412 Released js-sdk 2017-10-16 14:41:23 +01:00
Luke Barnard eaa5dd5f22 Groups -> Communities in the UI 
Translation files still need updating, and this would be much simpler with a script that could automate the tedium
 2017-10-16 13:18:39 +01:00
Weblate 09b381bc82 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 09:17:50 +00:00
André Breda b8aa9e8bc1 Translated using Weblate (Portuguese) 
Currently translated at 94.3% (872 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
 2017-10-16 09:17:50 +00:00
Bamstam 62897457fa Translated using Weblate (German) 
Currently translated at 99.8% (923 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-16 09:17:50 +00:00
David Baker e4a3309752 Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque 
Modify GroupView UI
 2017-10-16 10:17:44 +01:00
Krombel b230bb02b3 Translated using Weblate (German) 
Currently translated at 99.8% (923 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 21:08:30 +00:00
Bamstam b483b4f3a0 Translated using Weblate (German) 
Currently translated at 99.7% (922 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:15:27 +00:00
Krombel 9a6bbf373b Translated using Weblate (German) 
Currently translated at 99.6% (921 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:14:44 +00:00
Bamstam 851e278295 Translated using Weblate (German) 
Currently translated at 99.4% (919 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:13:25 +00:00
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
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