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

8048 Commits

Author SHA1 Message Date
Michael Telatynski eac6c46d28 Merge branches 'develop' and 't3chguy/remove_bluebird' of https://github.com/vector-im/riot-web into t3chguy/remove_bluebird 2019-11-22 14:00:02 +00:00
David Baker 8b2ca56283
Merge pull request #11445 from vector-im/dbkr/dedup_theming_code 
De-dup theming code
 2019-11-21 09:44:22 +00:00
Michael Telatynski 234e789d48
Merge pull request #11448 from vector-im/t3chguy/pre_jest 
Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants
 2019-11-20 22:43:10 +00:00
Michael Telatynski 97abce1ca6 Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-20 22:32:12 +00:00
David Baker 392de5a54f
Merge pull request #11444 from vector-im/dbkr/doc_custom_themes 
Add doc for custom themes
 2019-11-20 17:43:42 +00:00
David Baker 9ed4a07b28 linewrap 2019-11-20 17:39:58 +00:00
David Baker 1b0b3e1a44 Bump to Electron 7.1.2 
Tested with electron 7 and appears to be fine
 2019-11-20 17:33:32 +00:00
Bruno Windels 21781adb9e explain the internal name of custom themes 2019-11-20 18:27:25 +01:00
David Baker dc3cc37784 backticks to prevent infinitalic 2019-11-20 16:35:10 +00:00
David Baker 135d5f4cc7
Merge pull request #11442 from vector-im/dbkr/system_dark_mode 
Use new theme API in react-sdk
 2019-11-20 16:32:32 +00:00
David Baker e34c46c893 Dedup theming code 
Following on from https://github.com/matrix-org/matrix-react-sdk/pull/3637
this removes the code dealing with themes in vector/index.js and uses the
code from react-sdk. The two did almost exactly the same thing but in
subtley different ways.

This code can be incredibly subtle though, so doing this a separate
PR.
 2019-11-20 15:42:15 +00:00
David Baker 013e059ffc Add doc for custom themes 
Mostly just c+ped from Bruno's PR: https://github.com/matrix-org/matrix-react-sdk/pull/3503
 2019-11-20 15:40:44 +00:00
Bruno Windels 5e049efc87
Merge pull request #11441 from vector-im/bwindels/fix-roomstatus-e2e-icon 
preload warning triangle
 2019-11-20 14:36:41 +00:00
David Baker 7294bec1c8 Use new theme API in react-sdk 
A thesis presented in two parts. This part has the absolute minimum
logic changes to the themeing code in vector/index.js because I know
how subtle and fragile this code is. However, it also looks like it's
completely duplicated from react-sdk, so in the next part I'm going
to remove that logic and make it use the logic in react-sdk, then we
can see what breaks.

Requires https://github.com/matrix-org/matrix-react-sdk/pull/3637
 2019-11-20 13:43:08 +00:00
Bruno Windels 0c9f0e52bd preload warning triangle 2019-11-20 12:42:31 +01:00
David Baker 0e15bf124a
Merge pull request #11440 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-11-20 09:59:38 +00:00
Alexis a142a5a30c Translated using Weblate (Portuguese) 
Currently translated at 87.0% (20 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt/
 2019-11-20 05:45:16 +00:00
David Baker a5daa142eb
Merge pull request #11435 from vector-im/dbkr/audio_video_entitlements_mac 
Add entitlements file for mic & camera permissions on macOS
 2019-11-19 20:52:21 +00:00
David Baker a34766bd05 Fix tabs 2019-11-19 20:38:06 +00:00
David Baker 312e1bab47 Add entitlements file for mic & camera permissions on macOS 
Fixes https://github.com/vector-im/riot-web/issues/11151
 2019-11-19 19:02:10 +00:00
David Baker 3cf4d15192
Merge pull request #11429 from vector-im/dbkr/aftersign_error_exception 
Fix error/exception in electron signing script
 2019-11-19 16:04:50 +00:00
David Baker 64c23ae18d Fix error/exception in electron signing script 
'Exception' isn't a thing: Error is
 2019-11-19 15:55:03 +00:00
Bruno Windels 47772f520d
Merge pull request #11426 from vector-im/bwindels/merge-userinfo-flag 
Merge the `feature_user_info_panel` flag into `feature_dm_verification`
 2019-11-19 13:34:14 +00:00
Bruno Windels 6fc742f229 remove flag from develop config 2019-11-19 14:15:42 +01:00
Bruno Windels c197f7996b merge the feature_user_info_panel flag into feature_dm_verification 2019-11-19 14:15:11 +01:00
Travis Ralston efbb66ba4a
Merge pull request #11409 from vector-im/travis/desktop-config 
Let the user's homeserver config override the build config
 2019-11-18 10:04:13 -07:00
J. Ryan Stinnett fe6006f275
Merge pull request #11408 from vector-im/jryans/cross-signing-flag 
Add cross-signing labs flag to develop and document
 2019-11-18 16:57:22 +00:00
Travis Ralston 6bf03415ac Let the user's homeserver config override the build config 
Specifically for the desktop app to prevent the warning about too many homeservers defined.
 2019-11-18 09:11:05 -07:00
J. Ryan Stinnett 8043aebe1a Add cross-signing labs flag to develop and document 
Part of https://github.com/vector-im/riot-web/issues/11407
 2019-11-18 16:06:32 +00:00
David Baker d23086a6e8
Merge pull request #11405 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-11-18 10:21:08 +00:00
Volodymyr Kostyrko eabd91c29c Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
 2019-11-15 21:45:01 +00:00
Weblate 0eff02c69b Merge branch 'origin/develop' into Weblate. 2019-11-14 16:25:24 +00:00
Travis Ralston 515db517ca
Merge pull request #11381 from vector-im/travis/base-theme 
Trigger a theme change on startup, not just a tint change
 2019-11-14 09:25:15 -07:00
Travis Ralston 6cf4fc1026 Trigger a theme change on startup, not just a tint change 
Fixes https://github.com/vector-im/riot-web/issues/11370
 2019-11-13 14:00:22 -07:00
take100yen d7c4ef2fe7 Translated using Weblate (Japanese) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
 2019-11-13 11:44:52 +00:00
Travis Ralston 2e642310b8
Merge pull request #11375 from vector-im/travis/fix-chrome-favicon 
Perform favicon updates twice in Chrome
 2019-11-12 15:20:43 -07:00
Travis Ralston 71fb2e04a9
fix catch block indentation 2019-11-12 15:14:11 -07:00
Travis Ralston e84861f770 Apparently our eslint rules are different in different layers 2019-11-12 15:04:56 -07:00
Travis Ralston ec9a38c2fe Perform favicon updates twice in Chrome 
See diff for why this arcane magic is needed.

Fixes https://github.com/vector-im/riot-web/issues/11347
 2019-11-12 15:02:52 -07:00
Travis Ralston c6f62632d8
Fix config.json syntax 2019-11-12 10:12:25 -07:00
Travis Ralston 2561e3a64f
Merge pull request #11275 from vector-im/travis/mjolnir 
Add labs documentation for Mjolnir
 2019-11-12 10:00:37 -07:00
Bruno Windels 5041e6f3d9
Merge branch 'develop' into travis/mjolnir 2019-11-11 15:47:29 +00:00
Bruno Windels 67b87e26e8
Merge pull request #11360 from vector-im/bwindels/userinfo-labs-doc 
Add description of user info feature in labs doc
 2019-11-11 15:45:16 +00:00
Bruno Windels d3778ab1fd
Add description of user info feature 2019-11-11 13:59:32 +00:00
David Baker ed551c375d
Merge pull request #11359 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-11-11 10:12:13 +00:00
Stanislav Lukeš 52a3f4e1a8 Translated using Weblate (Czech) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2019-11-11 10:05:14 +00:00
Elwyn Malethan b8af903703 Translated using Weblate (Welsh) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cy/
 2019-11-10 19:44:44 +00:00
Weblate 6eeeaff399 Merge branch 'origin/develop' into Weblate. 2019-11-08 22:05:21 +00:00
Travis Ralston c14bbea0a1
Merge pull request #11356 from vector-im/travis/verif-dm-docs 
Add DM verification feature to labs.md
 2019-11-08 15:05:17 -07:00
Weblate 43171c05d3 Merge branch 'origin/develop' into Weblate. 2019-11-08 21:56:17 +00:00