gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,149 Commits 2 Branches 0 Tags 25 MiB
Commit Graph

4149 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Michael Telatynski 39ff11fe82 preinstall phantomjs to try get rid of boom error 2017-07-03 18:13:56 +01:00
Luke Barnard 5d4b98d4f6 Merge pull request #4470 from vector-im/luke/css-emotes-pre-wrap 
Apply white-space: pre-wrap to mx_MEmoteBody
 2017-07-03 09:57:56 +01:00
Luke Barnard 6fcf504a4b Apply white-space: pre-wrap to mx_MEmoteBody 
as we do with MTextBody.

So that people can do multi-line emotes...
 2017-06-30 17:41:55 +01:00
Luke Barnard 515f8de2c5 Merge pull request #4456 from vector-im/luke/css-rte-improvements 
Add some style improvements to autocompletions
 2017-06-28 17:38:53 +01:00
Luke Barnard 2ea69624af Add some style improvements to autocompletions 
- Fix https://github.com/vector-im/riot-web/issues/2230 by adding text-overflow: ellipsis to pill spans
 - Add padding to pills
 - Make sure to only apply horizontal margin of pill children at one level of the DOM tree
 2017-06-28 16:36:32 +01:00
Richard Lewis 176f7f1515 Merge pull request #4447 from vector-im/rxl881/apps 
Styling for apps / widgets
 2017-06-28 16:06:57 +01:00
Michael Telatynski f36c1ca207 fix Quote not closing contextual menu 
also use `this.closeMenu();` over the explicit direct call as the wrapper exists and is a little clearer
 2017-06-27 14:51:18 +01:00
Richard Lewis 83353e9419 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/apps 2017-06-27 12:40:32 +01:00
David Baker c614bc2356 Merge pull request #4400 from vector-im/rav/flush_logs_on_close 
Attempt to flush the rageshake logs on close
 2017-06-23 09:47:53 +01:00
Matthew Hodgson f7f5255378 fix vars 2017-06-22 21:53:06 +01:00
Matthew Hodgson 23a0e9a96c Merge pull request #4401 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-22 21:42:58 +01:00
Elia 8b89a1770d Translated using Weblate (Turkish) 
Currently translated at 96.6% (199 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
 2017-06-22 20:21:51 +00:00
Pitchaya Boonsarngsuk bfe43d841f Translated using Weblate (Thai) 
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/th/
 2017-06-22 20:21:51 +00:00
Carlos A. Carnero Delgado 423a047687 Translated using Weblate (Spanish) 
Currently translated at 99.5% (205 of 206 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2017-06-22 20:21:51 +00:00
Richard van der Hoff cc56ef3abd Attempt to flush the rageshake logs on close 
... so that we get to see what happened in the last 30s.
 2017-06-22 18:25:19 +01:00
Pitchaya Boonsarngsuk fbcdc5adad Translated using Weblate (Thai) 
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/th/
 2017-06-22 17:08:08 +00:00
Weblate b75180d959 Merge remote-tracking branch 'origin/develop' into develop 2017-06-22 16:37:03 +00:00
David Baker fab50bc1f1 Merge pull request #4176 from vector-im/t3chguy/updating_stuff 
improve update polling electron and provide a manual check for updates button
 2017-06-22 17:36:58 +01:00
Weblate cfe7fbb23e Merge remote-tracking branch 'origin/develop' into develop 2017-06-22 14:30:14 +00:00
Elia 8477ed2967 Translated using Weblate (Turkish) 
Currently translated at 99.0% (199 of 201 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
 2017-06-22 14:30:14 +00:00
David Baker a1132ca7aa Merge pull request #4395 from vector-im/rav/fix_braindead_firefox 
Fix load failure in firefox when indexedDB is disabled
 2017-06-22 15:30:01 +01:00
Richard van der Hoff 6e52ab6182 Fix load failure in firefox when indexedDB is disabled 2017-06-22 15:11:11 +01:00
Michael Telatynski e33e0effa3 use `_t` on string literals and i18n 'warning' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-22 15:05:13 +01:00
Michael Telatynski 0788826a71 Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	electron_app/src/tray.js
 2017-06-22 15:04:33 +01:00
Weblate c79c0bd333 Merge remote-tracking branch 'origin/develop' into develop 2017-06-22 13:37:35 +00:00
Elia e4c3a63375 Translated using Weblate (Turkish) 
Currently translated at 99.0% (200 of 202 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
 2017-06-22 13:37:35 +00:00
Richard van der Hoff a9c8429d2e Merge pull request #4362 from turt2live/travis/missed-redact 
Change missed 'Redact' to 'Remove' in ImageView.
 2017-06-22 14:37:31 +01:00
Weblate 9af8cfd1dc Merge remote-tracking branch 'origin/develop' into develop 2017-06-22 11:40:18 +00:00
Matthew Hodgson 93502b3c2a better englishing 2017-06-22 12:40:09 +01:00
Weblate 46ff43e9ba Merge remote-tracking branch 'origin/develop' into develop 2017-06-22 11:08:22 +00:00
Elia 954d56e151 Translated using Weblate (Turkish) 
Currently translated at 99.0% (200 of 202 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
 2017-06-22 11:08:22 +00:00
IMIN f040a72765 Translated using Weblate (Korean) 
Currently translated at 100.0% (202 of 202 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
 2017-06-22 11:08:22 +00:00
David Baker 8b65b96adf Merge branch 'master' into develop 2017-06-22 12:08:14 +01:00
David Baker cf5cf02529 v0.11.4 2017-06-22 12:04:49 +01:00
David Baker 26ea8a7494 Prepare changelog for v0.11.4 2017-06-22 12:04:49 +01:00
David Baker 27d83ba440 v0.11.4 2017-06-22 12:01:05 +01:00
David Baker c380e7566a Released js-sdk & react-sdk 2017-06-22 11:58:57 +01:00
daniel tygel 81518069ed Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (202 of 202 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
 2017-06-22 09:58:03 +00:00
Weblate a06eb5dfe1 Merge remote-tracking branch 'origin/develop' into develop 2017-06-21 14:04:40 +00:00