Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-09-22 00:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,324 Commits 3 Branches 492 Tags 100 MiB
745b803d28
Commit Graph

4324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Baker
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
Weblate
54ef2dd39b Merge remote-tracking branch 'origin/develop' into develop 2017-06-21 13:14:18 +00:00
Szimszon
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
David Baker
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
IMIN
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
strixaluco
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
Walter
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
Tom Tryfonidis
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
Szimszon
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
Weblate
ae8ad6969a Merge remote-tracking branch 'origin/develop' into develop 2017-06-20 16:55:46 +00:00
Walter
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
Richard van der Hoff
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
Walter
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
Richard van der Hoff
ca3399df77 Clean up some log outputs from the integ tests 2017-06-20 17:41:21 +01:00
Luke Barnard
c4a3211cfc Use _tJsx for PasswordNagBar (because it has <u>) 2017-06-20 16:28:40 +01:00
Weblate
d9f662c06e Merge remote-tracking branch 'origin/develop' into develop 2017-06-20 15:24:12 +00:00
Richard van der Hoff
abf21675d5 Add some more logging to the tests 
... to help diagnose when they fail
 2017-06-20 16:24:04 +01:00
marekjedrzejewski
8a17e3543a Translated using Weblate (Polish) 
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/pl/
 2017-06-20 15:17:51 +00:00
Krombel
c70ad2fa65 Translated using Weblate (German) 
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/de/
 2017-06-20 15:15:40 +00:00
David Baker
8f8b28425d Fix json fail 2017-06-20 15:55:35 +01:00
Luke Barnard
6b5bfe24e6 Merge pull request #4367 from vector-im/luke/redesign-user-settings-pwd-warn 
CSS for redeisng of password warning
 2017-06-20 15:24:07 +01:00
Luke Barnard
ae23664a41 Merge branch 'develop' into luke/redesign-user-settings-pwd-warn 2017-06-20 15:03:10 +01:00
Luke Barnard
bbbb82351f CSS for redeisng of password warning 
Now looks like red text
 2017-06-20 15:01:39 +01:00
Michael Telatynski
67a9b6502b Merge branch 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff 2017-06-20 14:33:09 +01:00
Michael Telatynski
fe1b0b5cd8 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff 2017-06-20 14:32:19 +01:00