Commit Graph

5679 Commits

Author SHA1 Message Date
David Baker 43bdc04637 Merge remote-tracking branch 'origin/develop' into dbkr/my_groups 2017-07-07 10:47:41 +01:00
Weblate 700672b6ec Merge remote-tracking branch 'origin/develop' into develop 2017-07-06 21:04:36 +00:00
Luke Barnard e36899c30f Merge pull request #4442 from vector-im/erikj/group_server
CSS for GroupView
2017-07-06 22:04:30 +01:00
David Baker e04f34a202 More CSS for group view 2017-07-06 19:14:12 +01:00
Weblate d34164ec49 Merge remote-tracking branch 'origin/develop' into develop 2017-07-06 13:08:42 +00:00
Luke Barnard fc5ce7fb61 Merge pull request #4525 from vector-im/t3chguy/markdown_allow_u
remove unused class
2017-07-06 14:08:37 +01:00
Michael Telatynski a8d5f7d5eb
remove unused class
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-06 13:53:17 +01:00
Weblate efa0184034 Merge remote-tracking branch 'origin/develop' into develop 2017-07-06 09:27:31 +00:00
Luke Barnard 0796b304cc Merge pull request #4466 from vector-im/luke/css-rte-improvements
Fix long words causing MessageComposer to widen
2017-07-06 10:27:25 +01:00
Weblate 3d167d8a27 Merge remote-tracking branch 'origin/develop' into develop 2017-07-05 17:22:13 +00:00
Luke Barnard d4435daf31 Merge pull request #4516 from vector-im/luke/css-visual-bell
Add visual bell animation for RTE
2017-07-05 18:22:09 +01:00
Luke Barnard 07e8d4ef69 Add visual bell animation for RTE 2017-07-05 18:13:23 +01:00
Weblate e8c8a0a2c8 Merge remote-tracking branch 'origin/develop' into develop 2017-07-05 13:00:08 +00:00
Luke Barnard 8daa0fced8 Merge pull request #4502 from vector-im/luke/fix-rte-autocomplete-truncate
Truncate auto-complete pills properly
2017-07-05 14:00:02 +01:00
Luke Barnard 65a160f24a Merge branch 'develop' into luke/fix-rte-autocomplete-truncate 2017-07-05 13:45:06 +01:00
Weblate 04fd29c8b7 Merge remote-tracking branch 'origin/develop' into develop 2017-07-05 12:42:58 +00:00
Richard van der Hoff 43a70c2bfb Merge pull request #4512 from vector-im/rav/chrome_headless
Use chrome headless instead of phantomjs
2017-07-05 13:42:52 +01:00
Richard van der Hoff a14bc9a9b1 README: minor fixes 2017-07-05 11:47:38 +01:00
Richard van der Hoff ba0073ca71 README: Add notes on running tests 2017-07-05 11:45:33 +01:00
Weblate e128434acd Merge remote-tracking branch 'origin/develop' into develop 2017-07-05 09:55:03 +00:00
Tong Hui 9f05236503 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2017-07-05 09:55:01 +00:00
Richard van der Hoff 60703bdcfc Log errors thrown by getThirdpartyProtocols
- so that it appears in rageshakes and test logs.
2017-07-05 10:54:10 +01:00
David Baker 2ccd36d09e Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-07-05 10:13:53 +01:00
Richard van der Hoff cfe9e762ad Use trusty dist 2017-07-05 10:01:13 +01:00
Richard van der Hoff 9969d6095d Remove phantomjs; add chrome 2017-07-05 09:43:40 +01:00
Richard van der Hoff 38b1ca9b90 Use headless chrome instead of phantomjs for tests 2017-07-05 09:35:51 +01:00
Luke Barnard b4b33ae06f Add CSS class to truncate certain autocompletions 2017-07-04 16:49:11 +01:00
Luke Barnard 1e569e67b1 Do not truncate autocomplete provider names 2017-07-04 16:40:15 +01:00
Weblate 8b6ed9f993 Merge remote-tracking branch 'origin/develop' into develop 2017-07-04 15:38:45 +00:00
Richard van der Hoff 48889b51b0 Bump to matrix-mock-request 1.0.0
- for consistency with js-sdk updates
2017-07-04 16:38:19 +01:00
Weblate c6492b3d8a Merge remote-tracking branch 'origin/develop' into develop 2017-07-04 15:30:17 +00:00
Kelvin 92ff1f2671 Translated using Weblate (Malayalam)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-04 15:30:16 +00:00
Richard van der Hoff 5312c9ad4c Merge pull request #4489 from vector-im/rav/use_external_mock_request
Use external mock-request
2017-07-04 16:30:11 +01:00
Luke Barnard 77a52b02cb Take RTE out of labs
Goes with https://github.com/matrix-org/matrix-react-sdk/pull/1176
2017-07-04 16:26:19 +01:00
Richard van der Hoff bd1196716a Use external mock-request
mock-request is now factored out to matrix-mock-request; use it
2017-07-04 15:59:21 +01:00
Nathan van Beelen 185a5b51ff Translated using Weblate (Dutch)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
2017-07-03 20:28:27 +00:00
Pirate Praveen Arimbrathodiyil d5e1bfab48 Translated using Weblate (Malayalam)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 18:24:09 +00:00
Kelvin 8178f12ae8 Translated using Weblate (Malayalam)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 18:21:50 +00:00
Kelvin 97c4cd49b0 Translated using Weblate (Malayalam)
Currently translated at 100.0% (206 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 18:19:39 +00:00
Weblate b7cc469f7b Merge remote-tracking branch 'origin/develop' into develop 2017-07-03 18:04:36 +00:00
Kelvin c565d31e53 Translated using Weblate (Malayalam)
Currently translated at 99.0% (204 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 18:04:35 +00:00
Luke Barnard cb17cb0535 Merge pull request #4443 from vector-im/t3chguy/patch-3
fix Quote not closing contextual menu
2017-07-03 19:04:31 +01:00
Pirate Praveen Arimbrathodiyil e0b9b4320a Translated using Weblate (Malayalam)
Currently translated at 98.0% (202 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 17:47:09 +00:00
Kelvin 5e5096c69d Translated using Weblate (Malayalam)
Currently translated at 98.0% (202 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 17:38:35 +00:00
Pirate Praveen Arimbrathodiyil c45f976d34 Translated using Weblate (Malayalam)
Currently translated at 97.0% (200 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 17:19:08 +00:00
Michael Telatynski 39ff11fe82 preinstall phantomjs to try get rid of boom error 2017-07-03 18:13:56 +01:00
Kelvin 3a055634f2 Translated using Weblate (Malayalam)
Currently translated at 97.0% (200 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 17:10:11 +00:00
Pirate Praveen Arimbrathodiyil 802e2e6bba Translated using Weblate (Malayalam)
Currently translated at 96.1% (198 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 17:06:05 +00:00
നിദര്‍ശ് ca1b5ed611 Translated using Weblate (Malayalam)
Currently translated at 96.1% (198 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-07-03 16:22:14 +00:00
Weblate 5475f8ffbd Merge remote-tracking branch 'origin/develop' into develop 2017-07-03 08:57:59 +00:00