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

7949 Commits

Author SHA1 Message Date
RiotRobot 17027cb515 v1.5.2 2019-11-04 18:30:37 +00:00
RiotRobot 3cd7e1c18c Prepare changelog for v1.5.2 2019-11-04 18:30:36 +00:00
RiotRobot 6f85fc9e8c v1.5.2 2019-11-04 18:27:35 +00:00
David Baker 0401e86216
Merge pull request #11311 from vector-im/dbkr/hotfix_macos_151_2 
Fix close window behaviour on Macos
 2019-11-04 18:25:36 +00:00
Michael Telatynski fbd5ffc198 Fix close window behaviour on Macos 2019-11-04 18:23:47 +00:00
David Baker 7a7ea8c7f6 I meant 6.1.2. There is no 6.1.12 2019-11-04 15:33:25 +00:00
RiotRobot fb64a0a46c v1.5.1 2019-11-04 15:17:30 +00:00
RiotRobot dd4f5131c7 Prepare changelog for v1.5.1 2019-11-04 15:17:30 +00:00
RiotRobot f48ca740fc v1.5.1 2019-11-04 15:15:52 +00:00
RiotRobot 6d553d1ecd Released react-sdk & js-sdk 2019-11-04 15:14:59 +00:00
RiotRobot 3ba3c1b881 v1.5.1-rc.2 2019-11-01 10:24:29 +00:00
RiotRobot a98c052664 Prepare changelog for v1.5.1-rc.2 2019-11-01 10:24:28 +00:00
RiotRobot 37119efec9 v1.5.1-rc.2 2019-11-01 10:22:34 +00:00
RiotRobot 0c18f944cc react-sdk rc.2 2019-11-01 10:22:09 +00:00
RiotRobot 35d1222cba v1.5.1-rc.1 2019-10-30 16:51:57 +00:00
RiotRobot 5b8c5c0601 Prepare changelog for v1.5.1-rc.1 2019-10-30 16:51:57 +00:00
RiotRobot ce1bc98ae6 v1.5.1-rc.1 2019-10-30 16:50:56 +00:00
RiotRobot f7bb2c02fb js-sdk & react-sdk rc.1 2019-10-30 16:50:31 +00:00
Michael Telatynski eab6ffe7db
Merge pull request #11258 from vector-im/t3chguy/hide_tray_icon 
Add ability to hide tray icon on non-Mac (which has no tray icon)
 2019-10-30 16:31:47 +00:00
Michael Telatynski cb5ef44d3f Remove outdated workaround which on modern electron makes window not show 2019-10-30 14:33:20 +00:00
Michael Telatynski 9820e59559 Merge hide-to-tray-icon with show-tray-icon 2019-10-30 14:32:28 +00:00
David Baker 88339fc782 Bump electron to 6.1.2 
7 is available but I'm not feeling that brave just yet
 2019-10-30 13:54:05 +00:00
David Baker d6125d0d0c
Merge pull request #11264 from vector-im/dbkr/fix_wakelock_bug 
Fix bug preventing display from sleeping after a call
 2019-10-30 13:19:01 +00:00
David Baker cc840df352 Fix bug preventing display from sleeping after a call 
Calls often transition from connected to connected after transitioning
into the connected state (when the ICE layer connects) so we ended up
creating two wake locks and then only stopping one of them.

Don't make another wake lock if we already have one.

Hopefully fixes https://github.com/vector-im/riot-web/issues/6814
 2019-10-30 10:58:34 +00:00
J. Ryan Stinnett ddf733a7cc
Merge pull request #11257 from vector-im/jryans/rm-scripts-from-docs 
Remove mention of CI scripts from docs
 2019-10-29 16:07:36 +02:00
Michael Telatynski 4b0fa940bb revert icon path change 2019-10-29 12:00:40 +00:00
Michael Telatynski 1498872214 Add ability to hide tray icon on non-Mac (which has no tray icon) 2019-10-29 11:37:42 +00:00
J. Ryan Stinnett 2c0559dbea Remove mention of CI scripts from docs 
This removes `fetch-develop.deps.sh` from the docs, as it's designed more for
use on CI environments and ends up causing confusion when used for anything
else.

Fixes https://github.com/vector-im/riot-web/issues/11247
 2019-10-29 10:37:36 +00:00
Michael Telatynski 7062015e25
Merge pull request #11254 from vector-im/t3chguy/fix_skinning_replaces 
Fix skinning replaces being broken since being rewritten as React FC's
 2019-10-29 10:17:19 +00:00
Michael Telatynski 5ffdc79bc7 Fix skinning replaces being broken since being rewritten as React FC's 2019-10-28 18:17:52 +00:00
J. Ryan Stinnett 6ada5e4397
Merge pull request #11249 from vector-im/jryans/identity-update-config 
Update config docs about identity servers
 2019-10-28 19:56:47 +02:00
J. Ryan Stinnett 19e183c801
Add missing word 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-10-28 19:56:38 +02:00
J. Ryan Stinnett 5117c04883 Update config docs about identity servers 
This updates the discussion of identity servers in the config docs to match what
was shipped in the privacy sprint.

Fixes https://github.com/vector-im/riot-web/issues/10982
 2019-10-28 16:57:22 +00:00
J. Ryan Stinnett 575751323c
Merge pull request #11248 from vector-im/jryans/identity-server-warnings 
Remove unneeded help about identity servers
 2019-10-28 18:19:47 +02:00
J. Ryan Stinnett 716c5c828b Remove unneeded help about identity servers 
The custom server path no longer shows an identity server field (for modern
homeservers), so it's confusing to have the help dialog reference it.

Fixes https://github.com/vector-im/riot-web/issues/11236
 2019-10-28 15:44:41 +00:00
David Baker 7bfda36ae5
Merge pull request #11243 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-10-28 09:55:39 +00:00
Weblate 636f6db51c Merge branch 'origin/develop' into Weblate. 2019-10-24 15:03:41 +00:00
Travis Ralston dcbe51c855
Merge pull request #11207 from vector-im/travis/matrix.org-sample 
Update sample config for new matrix.org CS API URL
 2019-10-24 09:03:35 -06:00
MamasLT 7e6d07ea88 Translated using Weblate (Lithuanian) 
Currently translated at 62.5% (15 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lt/
 2019-10-24 03:24:39 +00:00
Travis Ralston 4c92e0aa2c Update sample config for new matrix.org CS API URL 
This was missed in https://github.com/vector-im/riot-web/pull/11112
 2019-10-23 13:16:00 -06:00
Walter 8440abcee5 Translated using Weblate (Russian) 
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2019-10-23 08:14:11 +00:00
Bruno Windels 5b1c615498
Merge pull request #11115 from vector-im/bwindels/merge-e2e-tests 
clarify where the e2e tests are located
 2019-10-21 12:20:53 +00:00
Bruno Windels a3a8da1746 provide deep link to e2e instructions in react sdk 2019-10-21 14:13:57 +02:00
David Baker 7373e9cdd7
Merge pull request #11171 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-10-21 10:08:12 +01:00
Weblate 24e4162e76 Merge branch 'origin/develop' into Weblate. 2019-10-20 10:45:09 +00:00
Matthew Hodgson c219be1dc2
Merge pull request #6155 from rugk/patch-3 
Prevent referrers from being sent
 2019-10-20 11:45:04 +01:00
Matthew Hodgson 4e619b1693
Merge branch 'develop' into patch-3 2019-10-20 11:44:38 +01:00
Weblate f7f2e6c936 Merge branch 'origin/develop' into Weblate. 2019-10-18 15:14:37 +00:00
J. Ryan Stinnett 14f59801d7 Change back to develop branch for deps 2019-10-18 16:14:28 +01:00
Weblate 279a661176 Merge branch 'origin/develop' into Weblate. 2019-10-18 14:02:15 +00:00