gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,735 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

3735 Commits

Author SHA1 Message Date
David Baker bd76251fb5 Merge remote-tracking branch 'origin/develop' into experimental 2017-06-07 13:28:30 +01:00
David Baker 80d912bb2c Merge pull request #4219 from vector-im/luke/css-fix-timestamp-align 
Align message timestamp centrally about the avatar mid-point
 2017-06-07 11:37:26 +01:00
David Baker 65185a5fd0 Merge remote-tracking branch 'origin/new-guest-access' into experimental 2017-06-07 11:28:03 +01:00
Luke Barnard 37625faeb7 Merge pull request #4221 from vector-im/dbkr/ilag_home_url 
Remove '/' from homepage URL
 2017-06-07 11:27:39 +01:00
David Baker 090a7c5761 Remove '/' from homepage URL 
As we are not always at the root of the web server.
 2017-06-07 11:20:41 +01:00
David Baker fb358d8fd6 Merge remote-tracking branch 'origin/develop' into experimental 2017-06-07 10:59:01 +01:00
David Baker 5c51797420 Merge remote-tracking branch 'origin/new-guest-access' into experimental 2017-06-07 10:51:25 +01:00
David Baker 332a5b49a5 Merge remote-tracking branch 'origin/develop' into experimental 2017-06-07 10:51:18 +01:00
David Baker 9a6e0440f9 Merge pull request #4220 from vector-im/dbkr/right_branch_chop_origin 
Chop off 'origin/'
 2017-06-07 10:50:27 +01:00
David Baker 9c94f2ac14 Use bash magic instead of sed 2017-06-07 10:39:46 +01:00
David Baker b0486e333d Chop off 'origin/' 
when figuring out what branch we're on
 2017-06-07 10:35:08 +01:00
Luke Barnard 784e52f249 Align message timestamp centrally about the avatar mid-point 
Tested visually against any unintended changes to the alignment of e2e icons, with timestamps on 12h and 24h mode.
 2017-06-07 10:19:58 +01:00
RiotTranslate d235e2276f Translated using Weblate (Hungarian) (#4214) 
Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/
 2017-06-06 23:23:29 +01:00
Matthew Hodgson 080cbea080 Merge pull request #4211 from uhoreg/compact 
adjust alignment of message menu button in compact layout
 2017-06-06 18:07:32 +01:00
David Baker 968e21a67d Merge branch 'master' into develop 2017-06-06 17:48:32 +01:00
David Baker 26bb962a3c v0.10.2 2017-06-06 17:45:07 +01:00
David Baker 88e159e462 Prepare changelog for v0.10.2 2017-06-06 17:45:06 +01:00
David Baker 951b63898b v0.10.2 2017-06-06 17:43:57 +01:00
David Baker 3d51156b7e Temporarily revert 2017-06-06 17:43:34 +01:00
David Baker d648dc867e v0.10.2 2017-06-06 17:41:57 +01:00
David Baker a62ed0eb03 reatc-sdk 0.9.2 2017-06-06 17:41:26 +01:00
Hubert Chathi 383f6b619b adjust alignment of message menu button 2017-06-06 12:11:02 -04:00
Matthew Hodgson 13c780c7c5 add traditional chinese, thai, greek 2017-06-06 16:51:00 +01:00
Matthew Hodgson dbbb916be8 Merge pull request #4207 from RiotTranslate/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-06 16:45:09 +01:00
David Baker 1deadf5aad Merge branch 'new-guest-access' into experimental 2017-06-06 16:43:01 +01:00
Luke Barnard 8fee4941c3 Merge pull request #4209 from vector-im/dbkr/ilag_fix_tests 
Fix Tests in ILAG
 2017-06-06 16:20:14 +01:00
David Baker 8e288e14bf Add more hacky q.delays 
To work around the fact that we now do more trips around the
event loop to update view state (because of going vis the store).
Also add comment saying how horrible this is.
 2017-06-06 15:59:24 +01:00
David Baker 15d0bd9271 Partially revert https://github.com/vector-im/riot-web/pull/4201 
The q.delay is needed to make sure (or at least reasonably
sure...) that the login component has appeared by that point. The
done handler needs to be the error callback too otherwise failures
result in timeouts rather than the actual failure.
 2017-06-06 15:54:45 +01:00
RiotTranslate 8a6b940520 Merge remote-tracking branch 'origin/develop' into develop 2017-06-06 13:09:41 +00:00
Pitchaya Boonsarngsuk 5ad7099b6c Translated using Weblate (Thai) 
Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
 2017-06-06 13:07:22 +00:00
Max Sandholm 6518b9ac86 Translated using Weblate (Swedish) 
Currently translated at 98.1% (159 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
 2017-06-06 13:07:22 +00:00
Vladi 3843762123 Translated using Weblate (Russian) 
Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/
 2017-06-06 13:07:21 +00:00
Szimszon 82e1959f22 Translated using Weblate (Hungarian) 
Currently translated at 87.0% (141 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/
 2017-06-06 13:07:20 +00:00
David Baker d06934c5f6 Add velocity as a dep 
As we now use it from vector, so we shouldn't rely on it being
pulled in via react-sdk
 2017-06-06 14:00:36 +01:00
Kegsay 4cec4f066d Fix #4191: add defaults to avoid throwing (#4195) 2017-06-06 12:38:06 +01:00
David Baker e30fcdba4c Merge branch 'develop' into new-guest-access 2017-06-06 11:39:47 +01:00
David Baker ce01bcac2d Merge pull request #4197 from RiotTranslate/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-06 10:22:45 +01:00
David Baker 88e843d992 Merge pull request #4201 from vector-im/luke/fix-tests 
Fix tests for new-guest-access
 2017-06-05 21:25:59 +01:00
Luke Barnard feaff9d99d Fix tests for new-guest-access 
This time the test wasn't being flaky, but it does inspect a lot of the internal of RoomView, which has had some modifications recently. I've updated the test to reflect this and it passes locally.

Also, fix a bug in HomePage with an undeclared "error" which should be "err".

Let's see what Travis thinks of this!
 2017-06-05 20:16:44 +01:00
Pitchaya Boonsarngsuk e8d5021b48 Translated using Weblate (Thai) 
Currently translated at 100.0% (162 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
 2017-06-05 17:12:05 +00:00
Luke Barnard 5e67bcdac7 Merge pull request #4198 from vector-im/luke/ilag-i18n 
i18n for SetPasswordDialog
 2017-06-05 17:00:21 +01:00
Luke Barnard 0919b7ce3a i18n for SetPasswordDialog 2017-06-05 16:13:44 +01:00
RiotTranslate 95d9b85a93 Merge remote-tracking branch 'origin/develop' into develop 2017-06-05 15:09:47 +00:00
BrianMwit 2f990bf410 Translated using Weblate (Thai) 
Currently translated at 56.7% (92 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
 2017-06-05 15:09:47 +00:00
Matthew Hodgson c610d21e68 enable en_US as a 1st class language 2017-06-05 16:05:07 +01:00
Matthew Hodgson 58433423f4 Merge pull request #4193 from RiotTranslate/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-05 14:31:18 +01:00
BrianMwit e60b7c6dba Translated using Weblate (Thai) 
Currently translated at 55.5% (90 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
 2017-06-05 12:52:22 +00:00
BrianMwit 3b398cba6c Translated using Weblate (Thai) 
Currently translated at 4.9% (8 of 162 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
 2017-06-05 11:31:09 +00:00
BrianMwit 869d41e4b1 Added translation using Weblate (Thai) 2017-06-05 11:13:54 +00:00
Matthew Hodgson 7b9ae0157a Merge pull request #4183 from vector-im/t3chguy/electron_logo_windows_weirdness 
to make the windows volume mixer not explode as it can't resize icons.
 2017-06-04 22:58:17 +01:00