J. Ryan Stinnett
6094b8be9a
Change back to develop branch for deps
2019-09-27 14:46:05 +01:00
J. Ryan Stinnett
54767b5a65
Clean Yarn cache during Electron builds
2019-09-27 12:49:13 +01:00
RiotRobot
97a2a6a168
v1.4.0
2019-09-27 12:36:45 +01:00
RiotRobot
aca687dc12
Prepare changelog for v1.4.0
2019-09-27 12:36:45 +01:00
RiotRobot
f2648927f2
v1.4.0
2019-09-27 12:32:52 +01:00
RiotRobot
d76ed50625
Upgrade to React SDK 1.6.0 and JS SDK 2.4.0
2019-09-27 12:09:11 +01:00
RiotRobot
845590ed68
v1.4.0-rc.2
2019-09-26 12:21:17 +01:00
RiotRobot
0c125c1386
Prepare changelog for v1.4.0-rc.2
2019-09-26 12:21:17 +01:00
RiotRobot
0a884ab20b
v1.4.0-rc.2
2019-09-26 12:18:39 +01:00
RiotRobot
0e6b3eab11
Upgrade to React SDK 1.6.0-rc.2
2019-09-26 12:15:43 +01:00
RiotRobot
db5c17b518
Add upgrade line to changelog
2019-09-26 12:13:08 +01:00
RiotRobot
1713f49e07
v1.4.0-rc.1
2019-09-25 17:49:29 +01:00
RiotRobot
04a6b4448f
Prepare changelog for v1.4.0-rc.1
2019-09-25 17:49:29 +01:00
RiotRobot
6afd7e3b72
v1.4.0-rc.1
2019-09-25 17:43:47 +01:00
RiotRobot
6db826005c
Upgrade to React SDK 1.6.0-rc.1 and JS SDK 2.4.0-rc.1
2019-09-25 17:42:57 +01:00
J. Ryan Stinnett
3ee8098eb2
Upgrade to latest Electron 6.x
2019-09-25 17:07:52 +01:00
J. Ryan Stinnett
ce33ae1527
Merge pull request #10961 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate
2019-09-25 17:03:15 +01:00
Weblate
27ed1e94e9
Merge branch 'origin/develop' into Weblate.
2019-09-22 15:51:47 +00:00
Michael Telatynski
0c187b4459
Merge pull request #10929 from vector-im/t3chguy/don't_log_query_params
...
Don't log query parameters as they may contain secrets
2019-09-22 16:51:42 +01:00
Tuomas Hietala
5315519655
Translated using Weblate (Finnish)
...
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/fi/
2019-09-21 17:51:01 +00:00
Michael Telatynski
1018dc7ced
Don't log query parameters as they may contain secrets
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-21 17:44:58 +01:00
RiotRobot
6bd089c350
Merge branch 'master' into develop
2019-09-19 17:54:39 +01:00
RiotRobot
ab3f1f829a
v1.3.6
2019-09-19 17:51:56 +01:00
RiotRobot
6998aa94fd
Prepare changelog for v1.3.6
2019-09-19 17:51:56 +01:00
Weblate
9e3bb09ef1
Merge branch 'origin/develop' into Weblate.
2019-09-19 16:51:43 +00:00
RiotRobot
5feb4f9c89
v1.3.6
2019-09-19 17:50:59 +01:00
David Baker
0e406c5440
Merge pull request #10920 from vector-im/dbkr/fix_originmigrator_electron6_2
...
Fix origin migrator for SSO logins
2019-09-19 17:46:57 +01:00
David Baker
42b756952e
Typo
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-09-19 17:42:43 +01:00
David Baker
6464bfe850
Remove the other listener when one fires
2019-09-19 17:41:08 +01:00
David Baker
835d7bfb9d
Fix origin migrator for SSO logins
...
For some reason this was trying to close the same window twice
when the app was reloaded after an SSO login. Possibly also a
problem on electron < 6 - presumably a race condition.
2019-09-19 17:20:54 +01:00
Weblate
d40e57ad27
Merge branch 'origin/develop' into Weblate.
2019-09-18 20:47:24 +00:00
Travis Ralston
e008d7cbeb
Merge pull request #10906 from ptman/patch-1
...
Document more shortcuts
2019-09-18 14:47:19 -06:00
Paul Tötterman
481bc2cb92
Update docs/shortcuts.md
...
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-09-18 13:32:24 +03:00
Paul Tötterman
2eddda1843
Update docs/shortcuts.md
...
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
2019-09-18 13:21:23 +03:00
Paul Tötterman
55c809e839
Document more shortcuts
...
I'm probably missing some still
2019-09-18 11:55:44 +03:00
Weblate
f50a95d723
Merge branch 'origin/develop' into Weblate.
2019-09-17 17:09:47 +00:00
Travis Ralston
e8fbd77a61
Merge pull request #10893 from vector-im/travis/bump2
...
Point to #develop and use the same gemini-scrollbar version as the react-sdk
2019-09-17 11:09:43 -06:00
Travis Ralston
43d85521c4
Upgrade to develop dependencies
2019-09-17 11:05:05 -06:00
Travis Ralston
e88c5a0da7
Use the same gemini-scrollbar version as the react-sdk
...
Might fix an issue?
2019-09-17 09:35:14 -06:00
Weblate
d9a90eed24
Merge branch 'origin/develop' into Weblate.
2019-09-17 13:05:54 +00:00
J. Ryan Stinnett
c212b525d2
Update yarn.lock
2019-09-17 14:05:41 +01:00
RiotRobot
b0934c9121
Merge branch 'master' into develop
2019-09-16 17:59:09 +01:00
Weblate
f8cfe69b5c
Merge branch 'origin/develop' into Weblate.
2019-09-16 16:56:28 +00:00
RiotRobot
00130e6ac6
v1.3.5
2019-09-16 17:55:28 +01:00
RiotRobot
3983abe814
Prepare changelog for v1.3.5
2019-09-16 17:55:28 +01:00
RiotRobot
2298a61d76
v1.3.5
2019-09-16 17:52:48 +01:00
RiotRobot
9bb007f4b5
released js-sdk & react-sdk
2019-09-16 17:51:52 +01:00
Weblate
c24732f90a
Merge branch 'origin/develop' into Weblate.
2019-09-16 14:08:41 +00:00
J. Ryan Stinnett
df7bd02861
Merge pull request #10874 from vector-im/jryans/react-16-lock-tweak
...
Tweak lock file to pull in only one React version
2019-09-16 16:08:36 +02:00
J. Ryan Stinnett
8ad667c43e
Tweak lock file to pull in only one React version
...
Yarn deps can be a bit fiddly when targeting specific versions. This tweaks the
lock file to only pull in a single React version.
For others who may need to do something like this again, I recommend deleting
specific package entries from `yarn.lock` and re-running `yarn install`. That
should make it pick the right thing while also leaving other packages as they
were.
2019-09-16 14:37:52 +01:00
