d7607df1b1
Add feature_bridge_state to config
2020-01-05 15:42:09 +00:00
024c019c5b
Merge pull request #11758 from vector-im/travis/ftue/user-lists/1-initial
...
Add docs for feature_ftue_dms flag
2020-01-03 10:30:32 -07:00
514e9b754a
Add FTUE User Lists to develop config
2020-01-03 10:25:09 -07:00
16e384172c
Add docs for feature_ftue_dms flag
...
This should hopefully be short-lived.
For https://github.com/matrix-org/matrix-react-sdk/pull/3792
2020-01-02 17:44:58 -07:00
b0255683e9
Merge pull request #11721 from vector-im/travis/fix-version
...
Fix version file for Docker images
2020-01-02 08:51:05 -07:00
3389f7afc9
Fix version file for Docker images
...
Fixes https://github.com/vector-im/riot-web/issues/11642
2019-12-24 18:34:40 -07:00
443d3812d1
Merge pull request #11690 from vector-im/t3chguy/context_menu_accelerators
...
Add accelerators to context menu options like cut&paste in electron
2019-12-19 19:27:24 +00:00
6ead268ef0
electron-main: Provide a better error message if Seshat isn't installed.
...
This closes #11637 .
2019-12-19 12:45:32 +01:00
5fbe74e20d
Add accelerators to context menu options like cut&paste in electron
2019-12-19 11:16:33 +00:00
7f451d2635
Merge pull request #11672 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate
2019-12-16 10:02:14 +00:00
ecb386017f
Merge branch 'origin/develop' into Weblate.
2019-12-13 14:56:59 +00:00
4be0ff7095
Merge pull request #11662 from vector-im/t3chguy/remove_bluebird_import
...
Remove babel-plugin-transform-async-to-bluebird
2019-12-13 14:56:52 +00:00
6f06716954
Regenerate yarn.lock
2019-12-13 13:10:30 +00:00
f6db2ed8dd
Remove babel-plugin-transform-async-to-bluebird
2019-12-13 13:08:29 +00:00
b537016bfb
Merge branch 'origin/develop' into Weblate.
2019-12-12 17:36:51 +00:00
e5fcbd1b05
Merge pull request #11658 from vector-im/travis/official-support
...
Clarify which versions of what we support
2019-12-12 10:36:44 -07:00
b23318be8d
Clarify which versions of what we support
2019-12-12 10:34:22 -07:00
65c8c8b52a
Merge branch 'origin/develop' into Weblate.
2019-12-11 15:57:29 +00:00
0930424406
Further attempt to flip to develop
2019-12-11 15:56:59 +00:00
4ae5559a59
Merge branch 'origin/develop' into Weblate.
2019-12-11 10:37:51 +00:00
df3517d7bf
Translated using Weblate (Mongolian)
...
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/mn/
2019-12-11 10:37:50 +00:00
dd9eda8f97
Flip back to develop
2019-12-11 10:37:36 +00:00
eb42793ad5
Remove bluebird transform as regular dep
2019-12-11 10:36:24 +00:00
a30ad77d10
Added translation using Weblate (Mongolian)
2019-12-11 05:05:09 +00:00
26eff8d372
Merge pull request #11631 from vector-im/dbkr/remove_origin_migrator
...
Remove the code that calls the origin migrator
2019-12-09 15:18:20 +00:00
685c1ba276
Revert accidental commit
2019-12-09 15:02:00 +00:00
04402b325a
Remove more origin migrator bits
2019-12-09 15:01:10 +00:00
bd57ff793f
Remove rest of the origin migrator
2019-12-09 14:54:36 +00:00
33284302b9
try & explain better
2019-12-09 13:44:42 +00:00
89d622b8b2
Remove the code that calls the origin migrator
...
This will have done its job now, everyone's had long enough to
install a newer version of Riot and migrate to the new origin.
Laves the code on the backend that handles it for the time being,
as per comment.
2019-12-09 11:57:43 +00:00
b7f6d7b102
Merge branch 'master' into develop
2019-12-09 11:43:27 +00:00
cfb3258c36
v1.5.6
2019-12-09 11:39:56 +00:00
080725295d
Prepare changelog for v1.5.6
2019-12-09 11:39:56 +00:00
6cf087dc82
v1.5.6
2019-12-09 11:38:41 +00:00
45d51f56f2
Released js-sdk & react-sdk
2019-12-09 11:38:11 +00:00
7776b19339
Merge pull request #11617 from vector-im/dbkr/yarn_upgrade_dec19_2
...
yarn upgrade
2019-12-06 16:12:28 +00:00
60467ffd02
yarn upgrade
...
attempt 2
2019-12-06 15:58:44 +00:00
364e79c673
Merge pull request #11616 from vector-im/dbkr/why_are_you_still_here_draft_js
...
Remove draft-js dependency
2019-12-06 15:55:24 +00:00
c063cec4d7
remove draft CSS reference
2019-12-06 13:44:51 +00:00
e2b1a86a29
Remove draft-js dependency
...
...which for some reason was still kicking around
2019-12-06 13:33:30 +00:00
1d49544238
Remove bluebird transform as regular dep
2019-12-06 12:39:29 +00:00
70d2adb9e2
Move extract-text-webpack-plugin to dev dep
2019-12-06 12:36:58 +00:00
8ad1bd1501
Move bluebird transform to a dev dependency
2019-12-04 16:02:55 +00:00
f93b7a1675
Add transform-async-to-bluebird
...
Add babel plugin until the js-sdk stop using bluebird, since we
force-recompile the js-sdk so we need the plugin installed for that
to work (and it's a devDependency on js-sdk so doesn't otherwise get
installed).
2019-12-04 14:25:21 +00:00
aaf1afaa13
v1.5.6-rc.1
2019-12-04 13:59:44 +00:00
aaa2960b32
Prepare changelog for v1.5.6-rc.1
2019-12-04 13:59:44 +00:00
bf33f3bdce
v1.5.6-rc.1
2019-12-04 13:58:43 +00:00
577e614fa4
Add transform-async-to-bluebird
...
Add babel plugin until the js-sdk stop using bluebird, since we
force-recompile the js-sdk so we need the plugin installed for that
to work (and it's a devDependency on js-sdk so doesn't otherwise get
installed).
2019-12-04 13:52:59 +00:00
c99cd9fc58
js-sdk & react-sdk rc.1
2019-12-04 12:05:56 +00:00
c6afbed3fe
electron 7.1.3
2019-12-04 11:47:14 +00:00
Will Hunt