Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,073 Commits 3 Branches 492 Tags 100 MiB
acd7e028d5
Commit Graph

8073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RiotRobot
acd7e028d5 Merge branch 'master' into develop 2019-11-25 13:43:52 +00:00
RiotRobot
bf26ec9d1a v1.5.4 2019-11-25 13:40:05 +00:00
RiotRobot
b0d004d716 Prepare changelog for v1.5.4 2019-11-25 13:40:05 +00:00
RiotRobot
607c37adfd v1.5.4 2019-11-25 13:37:12 +00:00
RiotRobot
83591b4567 Released js-sdk & react-sdk 2019-11-25 13:36:37 +00:00
Michael Telatynski
6b1ba5e150
Merge pull request #11301 from vector-im/t3chguy/remove_bluebird 
get rid of bluebird
 2019-11-25 13:31:03 +00:00
Michael Telatynski
73990acf7a use function over const lambda 2019-11-25 12:53:07 +00:00
David Baker
43ae607839
Merge pull request #11488 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-11-25 09:56:29 +00:00
Weblate
1e340686e6 Merge branch 'origin/develop' into Weblate. 2019-11-25 04:55:44 +00:00
Travis Ralston
f8b42929c8
Merge pull request #8702 from vector-im/michaelkaye/readme_updates_caching 
Add note in README about self-hosted riot installs requiring custom caching headers
 2019-11-24 21:55:38 -07:00
Travis Ralston
1bd473a1b9 Move caching requirements higher in the readme 2019-11-24 21:54:01 -07:00
Travis Ralston
9790cac065 Merge branch 'develop' into michaelkaye/readme_updates_caching 2019-11-24 21:52:35 -07:00
Alexis
33e72a9c08 Translated using Weblate (Portuguese) 
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/pt/
 2019-11-24 15:45:31 +00:00
dreboy30
99edcc0f97 Translated using Weblate (Portuguese) 
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/pt/
 2019-11-24 15:45:31 +00:00
RiotRobot
7b59379d29 v1.5.4-rc.2 2019-11-22 17:30:05 +00:00
RiotRobot
9f3cd93bd6 Prepare changelog for v1.5.4-rc.2 2019-11-22 17:30:04 +00:00
RiotRobot
ff86c8acc7 v1.5.4-rc.2 2019-11-22 17:28:03 +00:00
RiotRobot
1cebd3dcd1 react-sdk rc.2 2019-11-22 17:27:27 +00:00
Michael Telatynski
0a209fc340 Use promises in tests properly 2019-11-22 14:08:45 +00:00
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
RiotRobot
fa5475f1c0 v1.5.4-rc.1 2019-11-20 18:32:56 +00:00
RiotRobot
2a564884e7 Prepare changelog for v1.5.4-rc.1 2019-11-20 18:32:56 +00:00
RiotRobot
46a6dbe9b8 v1.5.4-rc.1 2019-11-20 18:31:59 +00:00
RiotRobot
f07e3c3b25 react-sdk & js-sdk rc.1 2019-11-20 18:31:32 +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