Commit Graph

4816 Commits (fcd4a1c7c631ac7334cba6618c9b4ce8518a27c9)

Author SHA1 Message Date
Weblate 83acdee013 Merge remote-tracking branch 'origin/develop' into develop 2017-09-07 15:01:08 +00:00
David Baker 941f92530d Merge pull request #4623 from MurzNN/patch-1
Fix menu on change keyboard language issue #4345
2017-09-07 16:01:04 +01:00
Weblate 942021e4bb Merge remote-tracking branch 'origin/develop' into develop 2017-09-07 13:35:39 +00:00
Ramon Vilar 7a62b058c9 Translated using Weblate (Catalan)
Currently translated at 54.5% (114 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
2017-09-07 13:35:38 +00:00
David Baker ff8527c819 Merge pull request #4999 from vector-im/dbkr/fix_missing_isinvite_warning
Make isInvite default to false
2017-09-07 14:35:35 +01:00
David Baker 76be54b2be Make isInvite default to false
as things are assuming it's optional but it isn't which is causing
a ton of warnings.
2017-09-07 13:35:13 +01:00
Ramon Vilar 5511fdd0c3 Added translation using Weblate (Catalan) 2017-09-07 09:12:30 +00:00
Weblate 3c82e61567 Merge remote-tracking branch 'origin/develop' into develop 2017-09-06 17:07:01 +00:00
David Baker d374425a20 Merge pull request #4991 from vector-im/revert-4939-luke/feature-sticky-date-separators
Revert "Implement sticky date separators"
2017-09-06 18:06:57 +01:00
Kevin Németh 95947323a2 Translated using Weblate (Hungarian)
Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2017-09-06 16:43:33 +00:00
David Baker 38575a653d Revert "Implement sticky date separators" 2017-09-06 17:36:43 +01:00
Weblate dba05488bf Merge remote-tracking branch 'origin/develop' into develop 2017-09-06 13:38:24 +00:00
David Baker 7202556f45 Don't delete dist dir after putting stuff in it 2017-09-06 14:37:57 +01:00
Michael Telatynski 32ea675c92
fix (C) header
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-06 14:20:12 +01:00
Weblate 6a5da1011c Merge remote-tracking branch 'origin/develop' into develop 2017-09-06 12:38:46 +00:00
David Baker 8b250bda64 Merge branch 'master' into develop 2017-09-06 13:36:11 +01:00
David Baker 92d31a8890 v0.12.3 2017-09-06 13:32:33 +01:00
David Baker 1b3ffb150b Prepare changelog for v0.12.3 2017-09-06 13:32:32 +01:00
David Baker 2ab9dc4270 v0.12.3 2017-09-06 13:31:31 +01:00
David Baker e8dd7be8a3 matrix-react-sdk v0.10.3 2017-09-06 13:31:00 +01:00
Weblate ba6b35ad84 Merge remote-tracking branch 'origin/develop' into develop 2017-09-06 12:29:15 +00:00
Iru Cai (vimacs) b6a20f6441 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2017-09-06 12:29:14 +00:00
David Baker e6d43f9d77 Edit electron build script fior signed win builds
Don't copy them to pub: let the signing process do that
2017-09-06 13:28:21 +01:00
Silke 2e5a79e76c Translated using Weblate (Dutch)
Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
2017-09-06 10:51:17 +00:00
Michael Telatynski 60c2338543
generic contextual menu for tooltip/responses
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-06 11:27:04 +01:00
Weblate 8a8aea0927 Merge remote-tracking branch 'origin/develop' into develop 2017-09-05 13:16:25 +00:00
David Baker b8d9276f29 Merge pull request #4939 from vector-im/luke/feature-sticky-date-separators
Implement sticky date separators
2017-09-05 14:16:21 +01:00
Weblate 89e9a6f583 Merge remote-tracking branch 'origin/develop' into develop 2017-09-05 12:54:55 +00:00
uppps 4327b264bc Translated using Weblate (Spanish)
Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
2017-09-05 12:54:55 +00:00
David Baker 4ff9131e61 Redeploy script: don't bail if bundle exists (#4977)
Just don't bother replacing that bundle. Continue redeploying the
rest as other assets (eg translation files) may have changed.
2017-09-05 13:54:51 +01:00
David Baker c1e2ee8123 v0.12.3-rc.3 2017-09-05 13:43:40 +01:00
David Baker 308bcc4ab9 Prepare changelog for v0.12.3-rc.3 2017-09-05 13:43:39 +01:00
David Baker 0ced816505 v0.12.3-rc.3 2017-09-05 13:42:47 +01:00
David Baker ac3c664385 Merge remote-tracking branch 'origin/develop' into release-v0.12.3 2017-09-05 13:42:07 +01:00
David Baker 17bf8cb4ab v0.12.3-rc.2 2017-09-05 13:15:56 +01:00
David Baker 6f5054f645 Prepare changelog for v0.12.3-rc.2 2017-09-05 13:15:55 +01:00
David Baker 0c04df88cd v0.12.3-rc.2 2017-09-05 13:14:33 +01:00
David Baker 32423654b4 new react-sdk rc 2017-09-05 13:13:58 +01:00
Weblate f3a9f95477 Merge remote-tracking branch 'origin/develop' into develop 2017-09-05 10:14:05 +00:00
uppps 3615ba2bdb Translated using Weblate (Spanish)
Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
2017-09-05 10:14:05 +00:00
David Baker a94710a9a5 Merge pull request #4971 from vector-im/dbkr/fix_weblate_plurals
Fix plurals in translations
2017-09-05 11:13:58 +01:00
uppps ae287dfc00 Translated using Weblate (Spanish)
Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
2017-09-05 10:09:21 +00:00
Jerzy Kołosowski c39df96b1d Translated using Weblate (Polish)
Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
2017-09-04 20:23:21 +00:00
Stefan Parviainen b15b4735bb Translated using Weblate (Swedish)
Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sv/
2017-09-04 16:41:05 +00:00
David Baker b55174e5e9 Fix plurals in translations
See https://github.com/matrix-org/matrix-react-sdk/pull/1358
Requires https://github.com/matrix-org/matrix-react-sdk/pull/1358
2017-09-04 17:18:27 +01:00
Weblate cde03565be Merge remote-tracking branch 'origin/develop' into develop 2017-09-04 16:16:53 +00:00
David Baker 1f3f7af1e1 Revert accidental merge 2017-09-04 17:16:13 +01:00
Weblate d13c712103 Merge remote-tracking branch 'origin/develop' into develop 2017-09-04 16:15:17 +00:00
David Baker 1e203cade7 Fix plurals in translations
See https://github.com/matrix-org/matrix-react-sdk/pull/1358
Requires https://github.com/matrix-org/matrix-react-sdk/pull/1358
2017-09-04 17:14:41 +01:00
Stefan Parviainen 4511805e3d Translated using Weblate (Finnish)
Currently translated at 100.0% (209 of 209 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/
2017-09-04 16:13:23 +00:00