Commit graph

7035 commits

Author SHA1 Message Date
Luke Barnard
bafa2c6be0 Fix typo 2017-10-19 12:03:59 +01:00
Luke Barnard
c3f143acc3 Merge branch 'develop' into luke/groups-are-communities 2017-10-19 11:31:00 +01:00
Luke Barnard
2db0eab5c5 s/Groups/Communities 2017-10-19 11:29:03 +01:00
David Baker
17c610559f Merge pull request #1499 from matrix-org/dbkr/i18n_script
Add i18n script to package.json
2017-10-19 11:18:29 +01:00
David Baker
027a70ffe7 Add gen-i18n as a 'binary'
and add appropriate shebang
2017-10-19 10:51:54 +01:00
David Baker
61b05e7ec3 Add i18n script to package.json 2017-10-19 10:19:43 +01:00
Luke Barnard
e56f9ec63b Merge pull request #1498 from matrix-org/dbkr/geni18n-html
Make gen-i18n support 'HTML'
2017-10-19 09:23:20 +01:00
Luke Barnard
1c8c393a44 Merge pull request #1497 from matrix-org/matthew/cosmetics2
fix editing visuals on groupview header
2017-10-19 09:20:25 +01:00
Matthew Hodgson
7fe8c9cb01 fix lint 2017-10-19 01:48:49 +02:00
David Baker
1bada070ca Make gen-i18n support 'HTML'
Where by 'HTML' I mean just run the same regex as riot does over
some text.

Also make it walk multiple paths.

This mostly means it can be used for riot-web.
2017-10-18 19:36:07 +01:00
Matthew Hodgson
1087b36597 fix editing visuals on groupview header 2017-10-18 17:49:49 +01:00
Luke Barnard
a40704f085 Merge branch 'develop' into luke/groups-are-communities 2017-10-18 15:57:37 +01:00
David Baker
9160b70e12 Merge pull request #1493 from matrix-org/dbkr/geni18n
Script to generate the translations base file
2017-10-18 15:54:21 +01:00
David Baker
12d6722265 Re-run the fun 2017-10-18 15:48:33 +01:00
David Baker
e6ff09a99b Merge remote-tracking branch 'origin/develop' into dbkr/geni18n 2017-10-18 15:47:42 +01:00
David Baker
474b0c96ad Merge pull request #1495 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-10-18 15:19:24 +01:00
David Baker
577d68f628 Merge pull request #1494 from matrix-org/luke/groups-auto-relate-group-to-added-room
Attempt to relate a group to a room when adding it
2017-10-18 15:18:21 +01:00
Luke Barnard
96cc74ab62 Attempt to relate a group to a room when adding it
So as to remove another step on "The Route To Flair" (the steps taken for a user to get flair to appear on their SenderProfile in a room).
2017-10-18 15:00:54 +01:00
David Baker
2bbac903f1 'base file' is a bit overloaded by weblate 2017-10-18 14:45:04 +01:00
David Baker
caa4979e37 Comment ignoring getTKey returning null 2017-10-18 14:43:18 +01:00
David Baker
63a7d37f5a commented logging 2017-10-18 14:41:54 +01:00
David Baker
a2bfdd8925 missing saemi 2017-10-18 14:33:21 +01:00
David Baker
f759467193 Get English plural strings from an input file 2017-10-18 14:30:55 +01:00
David Baker
f5a4dcd201 Merge remote-tracking branch 'origin/develop' into dbkr/geni18n 2017-10-18 14:07:45 +01:00
David Baker
11761f535d Copyright 2017-10-18 13:39:04 +01:00
Weblate
47dcf4849e Merge remote-tracking branch 'origin/develop' into develop 2017-10-18 09:13:05 +00:00
Walter
b211b9d344 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-18 09:13:04 +00:00
Luke Barnard
8c162766fe Merge pull request #1490 from matrix-org/luke/groups-move-buttons
Shuffle GroupView UI
2017-10-18 11:12:58 +02:00
Luke Barnard
677c8e95ee Merge branch 'develop' into luke/groups-move-buttons 2017-10-18 10:31:54 +02:00
Weblate
dd33092985 Merge remote-tracking branch 'origin/develop' into develop 2017-10-17 18:30:54 +00:00
David Baker
62a79d823d Merge pull request #1491 from matrix-org/luke/groups-fix-optional-profile-properties
Fix bug preventing partial group profile
2017-10-17 19:30:50 +01:00
David Baker
8370c823b6 Script to generate the translations base file
Also replaces the translations base file with the output of the
script.
2017-10-17 19:19:01 +01:00
Weblate
dc6f10ee7f Merge remote-tracking branch 'origin/develop' into develop 2017-10-17 17:11:14 +00:00
Ramon Vilar
2b3a8cd365 Translated using Weblate (Catalan)
Currently translated at 4.5% (42 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2017-10-17 17:11:13 +00:00
Luke Barnard
df9e037bfc Default values when GETing instead of when POSTing 2017-10-17 18:11:00 +01:00
David Baker
c9576c9065 Merge pull request #1492 from matrix-org/luke/fix-room-address-tile-no-room-id
Don't show room IDs when picking rooms
2017-10-17 18:10:58 +01:00
Luke Barnard
1b8c5b50db Don't show room IDs when picking rooms 2017-10-17 18:02:35 +01:00
Luke Barnard
3bbff627fc Fix bug preventing partial group profile
When updating the group profile, send empty strings instead of `null` as synapse does not expect `null`.
2017-10-17 17:26:34 +01:00
Luke Barnard
49b7525a67 Actually move the buttons in GroupView
- The "Leave" button is now in the top-right
 - The "Publish" button is not a checkbox
2017-10-17 16:10:34 +01:00
Luke Barnard
0415869b8c Add useful functions to GroupView to inspect user flags 2017-10-17 16:08:19 +01:00
Luke Barnard
626f007f4e Move membership section above long description textarea 2017-10-17 12:00:31 +01:00
Luke Barnard
7df3335570 Only show membership settings when editing 2017-10-17 11:59:52 +01:00
Luke Barnard
495465e865 Put invite accept/decline buttons in correct div to align them to the right 2017-10-17 11:59:16 +01:00
Weblate
68c02cad33 Merge remote-tracking branch 'origin/develop' into develop 2017-10-17 10:33:45 +00:00
Bamstam
ba160ffbd0 Translated using Weblate (German)
Currently translated at 99.8% (924 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-17 10:33:44 +00:00
Luke Barnard
24c4c1edc7 Merge pull request #1489 from matrix-org/luke/groups-invited-users-hide-if-empty
Only show invited section if there are invited group members
2017-10-17 12:33:39 +02:00
Luke Barnard
85d99d429d Use correct logic operator 2017-10-17 09:49:39 +01:00
Szimszon
5686d8204a Translated using Weblate (Hungarian)
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/hu/
2017-10-16 20:16:58 +00:00
Krombel
09070a7747 Translated using Weblate (German)
Currently translated at 99.8% (924 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-16 19:05:05 +00:00
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