Commit Graph

4598 Commits (2e5a79e76cdeba89c2368ddf699b85b65d0f7d91)

Author SHA1 Message Date
Richard van der Hoff d755903fdb typo 2017-07-11 14:10:18 +01:00
Richard van der Hoff 8ac26dd19f Give HomePage an unmounted guard
Also add missing return in error-handling path
2017-07-11 14:08:16 +01:00
Weblate 4d34809279 Merge remote-tracking branch 'origin/develop' into develop 2017-07-11 12:23:32 +00:00
Richard van der Hoff b375c71a28 fix comments on node versions 2017-07-11 13:23:15 +01:00
David Baker cefc3e6da9 Make CSS more generic 2017-07-10 19:32:25 +01:00
Travis Ralston bc88585026 Translated using Weblate (English (United States))
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/en_US/
2017-07-10 15:03:57 +00:00
David Baker 7a1494fc46 Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-10 14:35:51 +01:00
Weblate ab95905472 Merge remote-tracking branch 'origin/develop' into develop 2017-07-10 12:56:07 +00:00
Sri Lakshmi 61e5fd759a Translated using Weblate (Telugu)
Currently translated at 0.9% (2 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
2017-07-10 12:56:07 +00:00
Luke Barnard c1b8879b6b Merge pull request #4500 from vector-im/luke/feature-enable-RTE
Take RTE out of labs
2017-07-10 13:56:02 +01:00
Weblate f033234abe Merge remote-tracking branch 'origin/develop' into develop 2017-07-10 08:37:37 +00:00
LuPa f133409207 Translated using Weblate (Spanish)
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/es/
2017-07-10 08:37:37 +00:00
നിദര്‍ശ് a1681f8576 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-10 08:37:36 +00:00
Bamstam d7d61ab01d Translated using Weblate (German)
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/de/
2017-07-10 08:37:36 +00:00
Ross Schulman 3175387c73 Translated using Weblate (Esperanto)
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/eo/
2017-07-10 08:37:36 +00:00
Luke Barnard d98d493420 Merge pull request #4468 from vector-im/dbkr/my_groups
CSS for Groups page
2017-07-10 09:37:32 +01:00
Kelvin c2c6c14ec5 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-07 19:25:22 +00:00
നിദര്‍ശ് e77b1ea87b 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-07 19:11:43 +00:00
Pirate Praveen Arimbrathodiyil 3930720127 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-07 19:11:30 +00:00
നിദര്‍ശ് ae2f1ff382 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-07 19:11:09 +00:00
Pirate Praveen Arimbrathodiyil 5ce3d5dc36 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-07 19:09:49 +00:00
David Baker 5f5a802b44 Add CSS from react-sdk PR feedback 2017-07-07 18:34:57 +01:00
David Baker 052f9effc1 Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview 2017-07-07 12:02:38 +01:00
David Baker b4602fd2b1 Comment 2017-07-07 10:49:19 +01:00
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