gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,084 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

4084 Commits

Author SHA1 Message Date
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
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
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
Matthew Hodgson 93502b3c2a better englishing 2017-06-22 12:40:09 +01: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
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
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
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
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
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
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
David Baker 8dade0d84e Merge pull request #4366 from vector-im/luke/feature-user-settings-password-warning 
Give _t to PasswordNagBar, add CSS for UserSettings password warning
 2017-06-20 14:31:12 +01:00
Michael Telatynski 499b1c2e70 add missing semicolon 2017-06-20 14:05:17 +01:00
Luke Barnard 047b255e14 Add en_EN translations 2017-06-20 13:33:38 +01:00
David Baker 3926e4dd98 Merge branch 'master' into develop 2017-06-20 13:18:58 +01:00
David Baker 639b17c663 v0.11.3 2017-06-20 13:15:36 +01:00
David Baker ea8a49f1b7 Prepare changelog for v0.11.3 2017-06-20 13:15:35 +01:00
David Baker eda3f20b26 v0.11.3 2017-06-20 13:13:28 +01:00
David Baker 6ef32f182a react-sdk 0.9.6 2017-06-20 13:13:03 +01:00
David Baker 6bae293bdf Merge pull request #4361 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-20 13:12:14 +01:00
Luke Barnard d5d29c1c92 Give _t to PasswordNagBar, add CSS for UserSettings password warning 
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1123
 2017-06-20 11:23:34 +01:00
David Baker 556ff24c5f Merge pull request #4361 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-20 10:19:34 +01:00
strixaluco f5d9af9b0b Translated using Weblate (Ukrainian) 
Currently translated at 98.0% (196 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
 2017-06-20 09:00:47 +00:00
GrigRUSS 3ff0ed52b2 Translated using Weblate (Russian) 
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2017-06-20 09:00:47 +00:00
turt2live 4ae6e9fdfd Remove 'Redact' from en_US and en_EN as it is no longer needed 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-19 16:31:59 -06:00
turt2live b9fc46fa41 Change missed 'Redact' to 'Remove' in ImageView. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-19 16:24:03 -06:00
GrigRUSS 133f3d24f5 Translated using Weblate (Russian) 
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2017-06-19 17:18:38 +00:00
Bamstam 241ebe50d2 Translated using Weblate (German) 
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-06-19 17:18:38 +00:00
Matthew Hodgson 7fda26f268 Merge pull request #4360 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-19 15:43:34 +01:00
Weblate 0729d50e47 Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 13:38:56 +00:00
Richard van der Hoff f6cbb708b0 Merge pull request #4352 from vector-im/rav/test_return_to_app 
Test 'return-to-app' functionality
 2017-06-19 14:38:52 +01:00
russian 8b7692cf3b Translated using Weblate (Russian) 
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2017-06-19 13:24:27 +00:00
daniel tygel 7523251098 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
 2017-06-19 13:23:34 +00:00
David Baker 5b5e6d83d9 Merge branch 'master' into develop 2017-06-19 13:24:58 +01:00
David Baker 448e33bb65 v0.11.2 2017-06-19 13:20:45 +01:00
David Baker 88950f29c5 Prepare changelog for v0.11.2 2017-06-19 13:20:44 +01:00
David Baker 3e279746d5 v0.11.2 2017-06-19 13:19:09 +01:00