gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,126 Commits 2 Branches 0 Tags 25 MiB
Commit Graph

9126 Commits

Author SHA1 Message Date
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
RiotRobot 8c27cd704e v1.3.5-rc.3 2019-09-13 16:25:33 +01:00
RiotRobot 9b530d4b0b Prepare changelog for v1.3.5-rc.3 2019-09-13 16:25:32 +01:00
RiotRobot ece11993d7 v1.3.5-rc.3 2019-09-13 16:24:13 +01:00
RiotRobot dbd5d891db js-sdk rc.1 (and updated react sdk) for report api 2019-09-13 16:23:39 +01:00
RiotRobot 4ece7ed936 v1.3.5-rc.2 2019-09-13 14:52:06 +01:00
RiotRobot ddab3709a3 Prepare changelog for v1.3.5-rc.2 2019-09-13 14:52:05 +01:00
RiotRobot 8feb51ebce v1.3.5-rc.2 2019-09-13 14:50:00 +01:00
RiotRobot 09492b15e8 react-sdk rc.2 2019-09-13 14:48:23 +01:00
RiotRobot c86bb03595 v1.3.5-rc.1 2019-09-12 18:45:34 +01:00
RiotRobot 5fed64117f Prepare changelog for v1.3.5-rc.1 2019-09-12 18:45:33 +01:00
RiotRobot f07c0488fe v1.3.5-rc.1 2019-09-12 18:44:00 +01:00
RiotRobot 0d53eb5386 react-sdk rc.1 2019-09-12 18:42:53 +01:00
Weblate 1ce1c16a05 Merge branch 'origin/develop' into Weblate. 2019-09-12 15:05:05 +00:00
Bruno Windels e1205246fc
Merge pull request #10844 from vector-im/bwindels/document-disable_custom_urls 
document disable_custom_urls
 2019-09-12 15:05:01 +00:00
Bruno Windels b809343cb6 line wrap 2019-09-12 17:04:24 +02:00
Bruno Windels d6e0f33fdb
document disable_custom_urls 2019-09-12 12:34:48 +00:00
RiotRobot eaf3bdbf34 Merge branch 'master' into develop 2019-09-12 13:26:17 +01:00
Weblate 488e9d5396 Merge branch 'origin/develop' into Weblate. 2019-09-12 12:24:25 +00:00
RiotRobot ceb1fcb6c1 v1.3.4 2019-09-12 13:21:14 +01:00
RiotRobot 2a28fa9774 Prepare changelog for v1.3.4 2019-09-12 13:21:14 +01:00
RiotRobot 6588d0e4bb v1.3.4 2019-09-12 13:17:55 +01:00