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
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
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
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
176f7f1515
Merge pull request #4447 from vector-im/rxl881/apps
...
Styling for apps / widgets
2017-06-28 16:06:57 +01:00
83353e9419
Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/apps
2017-06-27 12:40:32 +01:00
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
f7f5255378
fix vars
2017-06-22 21:53:06 +01:00
23a0e9a96c
Merge pull request #4401 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-22 21:42:58 +01:00
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
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
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
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
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
b75180d959
Merge remote-tracking branch 'origin/develop' into develop
2017-06-22 16:37:03 +00:00
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
cfe7fbb23e
Merge remote-tracking branch 'origin/develop' into develop
2017-06-22 14:30:14 +00:00
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
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
6e52ab6182
Fix load failure in firefox when indexedDB is disabled
2017-06-22 15:11:11 +01:00
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
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
c79c0bd333
Merge remote-tracking branch 'origin/develop' into develop
2017-06-22 13:37:35 +00:00
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
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
9af8cfd1dc
Merge remote-tracking branch 'origin/develop' into develop
2017-06-22 11:40:18 +00:00
93502b3c2a
better englishing
2017-06-22 12:40:09 +01:00
46ff43e9ba
Merge remote-tracking branch 'origin/develop' into develop
2017-06-22 11:08:22 +00:00
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
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
8b65b96adf
Merge branch 'master' into develop
2017-06-22 12:08:14 +01:00
cf5cf02529
v0.11.4
2017-06-22 12:04:49 +01:00
26ea8a7494
Prepare changelog for v0.11.4
2017-06-22 12:04:49 +01:00
27d83ba440
v0.11.4
2017-06-22 12:01:05 +01:00
c380e7566a
Released js-sdk & react-sdk
2017-06-22 11:58:57 +01:00
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
a06eb5dfe1
Merge remote-tracking branch 'origin/develop' into develop
2017-06-21 14:04:40 +00:00
7d3f75ef87
Merge pull request #4355 from vector-im/t3chguy/electron/windows_icon_instability
...
explicit convert to nativeImage to stabilise trayIcon on Windows [Electron]
2017-06-21 15:04:36 +01:00
54ef2dd39b
Merge remote-tracking branch 'origin/develop' into develop
2017-06-21 13:14:18 +00:00
b51101038f
Translated using Weblate (Hungarian)
...
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/hu/
2017-06-21 13:14:18 +00:00
79ad89c673
Merge pull request #4373 from vector-im/luke/fix-pwd-nagbar-_t
...
Use _tJsx for PasswordNagBar (because it has <u>)
2017-06-21 14:14:15 +01:00
e7dd6fa714
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-21 11:50:00 +00:00
a46a0c0949
Translated using Weblate (Ukrainian)
...
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/uk/
2017-06-21 01:28:06 +00:00
a13b766bad
Translated using Weblate (Ukrainian)
...
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/uk/
2017-06-21 01:26:17 +00:00
969c7c93d6
Translated using Weblate (Greek)
...
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/el/
2017-06-20 20:22:23 +00:00
d1c97d8f9a
Translated using Weblate (Hungarian)
...
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/hu/
2017-06-20 17:13:23 +00:00
ae8ad6969a
Merge remote-tracking branch 'origin/develop' into develop
2017-06-20 16:55:46 +00:00
6d62bf0e25
Translated using Weblate (Ukrainian)
...
Currently translated at 98.0% (198 of 202 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
2017-06-20 16:55:45 +00:00
26a27a6de4
Merge pull request #4376 from vector-im/rav/test_log_cleanups
...
Clean up some log outputs from the integ tests
2017-06-20 17:55:42 +01:00
51cfad5b9f
Translated using Weblate (Russian)
...
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/ru/
2017-06-20 16:48:26 +00:00
Luke Barnard