Commit Graph

4906 Commits

Author SHA1 Message Date
David Baker
8d9f06cc47 Merge branch 'master' into develop 2017-09-20 15:24:11 +01:00
David Baker
2ea9fc3f9a v0.12.4 2017-09-20 15:19:10 +01:00
David Baker
d96759b8ad Prepare changelog for v0.12.4 2017-09-20 15:19:10 +01:00
David Baker
e814eb4555 v0.12.4 2017-09-20 15:18:17 +01:00
David Baker
d957f0cdd7 released js-sdk & react-sdk 2017-09-20 15:16:42 +01:00
David Baker
be938ac0f4 Accept globs for the config location
and make the default config*.sjon so we'll automatically symlink
any config files in the current dir.
2017-09-20 14:38:41 +01:00
David Baker
e4082d4f45 Support multiple configs on the command line 2017-09-20 14:25:33 +01:00
Akcja Demokracja Open-Source
7f4695bba2 Translated using Weblate (Polish)
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
2017-09-20 10:30:04 +00:00
Szimszon
72bb08b99f Translated using Weblate (Hungarian)
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2017-09-20 06:40:44 +00:00
Andrey
e8c3c2bc20 Translated using Weblate (Russian)
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-09-20 05:40:09 +00:00
Jeff Huang
8561e43cb5 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2017-09-20 00:01:38 +00:00
Weblate
16123ff5db Merge remote-tracking branch 'origin/develop' into develop 2017-09-19 21:14:56 +00:00
Silke
546397e676 Translated using Weblate (Dutch)
Currently translated at 97.2% (214 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
2017-09-19 21:14:55 +00:00
Matthew Hodgson
fbe1c82dfa Merge pull request #5074 from vector-im/t3chguy/devtools-1
T3chguy/devtools 1
2017-09-19 22:14:52 +01:00
Szimszon
37ccf3b93f Translated using Weblate (Hungarian)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2017-09-19 18:53:28 +00:00
Andrey
86d8a95e32 Translated using Weblate (Russian)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-09-19 16:45:19 +00:00
Weblate
0b7ebf8764 Merge remote-tracking branch 'origin/develop' into develop 2017-09-19 16:22:01 +00:00
David Baker
8fc69198b1 Merge pull request #5085 from vector-im/luke/fix-separate-sender-profile
Alter opacity for flair
2017-09-19 17:21:57 +01:00
Weblate
ecbd42c71c Merge remote-tracking branch 'origin/develop' into develop 2017-09-19 16:21:52 +00:00
Kevin Németh
0b0e74cd63 Translated using Weblate (Hungarian)
Currently translated at 96.8% (213 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2017-09-19 16:21:51 +00:00
David Baker
283829cb0c Merge pull request #5082 from vector-im/luke/fix-ugly-integ-button
Fix ugly integ button
2017-09-19 17:21:47 +01:00
Luke Barnard
0d6b09a5f6 Merge branch 'develop' into luke/fix-ugly-integ-button 2017-09-19 17:03:06 +01:00
Luke Barnard
7469ab5ed9 Alter opacity for flair
Apply 0.7 opacity to flair, but keep name and aux at 0.5
2017-09-19 16:56:46 +01:00
carlos-am
b6a183aa5b Translated using Weblate (Portuguese)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt/
2017-09-19 15:31:19 +00:00
Krombel
49f85703da Translated using Weblate (German)
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-09-19 12:52:05 +00:00
Jeff Huang
3cf641d281 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2017-09-19 12:32:45 +00:00
Weblate
d409e96e2a Merge remote-tracking branch 'origin/develop' into develop 2017-09-19 12:26:08 +00:00
Luke Barnard
fbcccd8be0 Merge pull request #4830 from vector-im/dbkr/group_userlist
Group Membership UI
2017-09-19 13:26:02 +01:00
Luke Barnard
d25c3be627 CSS to fix ugly integrations button
See matrix-org/matrix-react-sdk#1399
2017-09-19 11:59:51 +01:00
David Baker
ca50d1f04a v0.12.4-rc.1 2017-09-19 10:57:02 +01:00
David Baker
ab66833c45 Prepare changelog for v0.12.4-rc.1 2017-09-19 10:57:01 +01:00
David Baker
8a4710b270 v0.12.4-rc.1 2017-09-19 10:55:28 +01:00
David Baker
57851cd508 js-sdk & react-sdk rc.1 2017-09-19 10:54:35 +01:00
Luke Barnard
38c0d62478 Fix typo for integs error button error 2017-09-19 10:46:00 +01:00
Weblate
e8ff3ca7ed Merge remote-tracking branch 'origin/develop' into develop 2017-09-19 09:34:35 +00:00
David Baker
ff8bc1ca68 Merge pull request #5053 from vector-im/dbkr/3pid_invite_update_when_joined
Fix test for new behaviour of 'joining' flag
2017-09-19 10:34:31 +01:00
David Baker
c32e736754 Comment why we don't expect joining flag to reset 2017-09-19 10:23:12 +01:00
Weblate
ca13e35413 Merge remote-tracking branch 'origin/develop' into develop 2017-09-19 07:13:31 +00:00
Jan Kudrik
8ab0caaf0c Translated using Weblate (Czech)
Currently translated at 96.8% (212 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
2017-09-19 07:13:30 +00:00
Matthew Hodgson
26c8d23c21 Merge pull request #5080 from vector-im/t3chguy/fix-powersave-typo
fix really dumb blunder/typo preventing system from going to sleep.
2017-09-19 08:13:26 +01:00
Michael Telatynski
d97224e69e
fix really dumb blunder/typo preventing system from going to sleep.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-19 00:53:44 +01:00
Krombel
51069a370e Translated using Weblate (German)
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-09-18 11:45:55 +00:00
Michael Telatynski
00976d9338
i18n new DevTools strings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-18 12:04:11 +01:00
Michael Telatynski
dccee6d419
add ability to filter room state types/results
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-18 12:03:11 +01:00
Michael Telatynski
af450df513
add ability to jump from RSE to Send Custom State Event prefilled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-18 11:27:31 +01:00
Michael Telatynski
821ab6c13e
switch to controlled inputs and require eventType !== ''
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-18 11:06:46 +01:00
Jeff Huang
cca7b239ee Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2017-09-18 01:12:54 +00:00
Weblate
5ad860f186 Merge remote-tracking branch 'origin/develop' into develop 2017-09-17 22:15:32 +00:00
Matthew Hodgson
828e9d5eb4 Merge pull request #4735 from vector-im/t3chguy/devtools
T3chguy/devtools
2017-09-17 23:15:28 +01:00
Weblate
aa6e68776c Merge remote-tracking branch 'origin/develop' into develop 2017-09-17 21:38:35 +00:00