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

8204 Commits

Author SHA1 Message Date
Travis Ralston 17e332bb48 Import from src/ for the react-sdk and js-sdk 
We compile directly for accuracy of sourcemaps.
 2019-12-23 20:02:11 -07:00
Travis Ralston c44a6e296e Merge branch 'develop' into travis/sourcemaps 2019-12-20 12:34:22 -07:00
Michael Telatynski 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
Damir Jelić 6ead268ef0 electron-main: Provide a better error message if Seshat isn't installed. 
This closes #11637.
 2019-12-19 12:45:32 +01:00
Michael Telatynski 5fbe74e20d Add accelerators to context menu options like cut&paste in electron 2019-12-19 11:16:33 +00:00
Travis Ralston 4479018289
Merge pull request #11660 from vector-im/travis/babel7-reskindex 
Remove now-retired package.json property
 2019-12-17 08:11:14 -07:00
David Baker 7f451d2635
Merge pull request #11672 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-12-16 10:02:14 +00:00
Weblate ecb386017f Merge branch 'origin/develop' into Weblate. 2019-12-13 14:56:59 +00:00
Michael Telatynski 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
Michael Telatynski 6f06716954 Regenerate yarn.lock 2019-12-13 13:10:30 +00:00
Michael Telatynski f6db2ed8dd Remove babel-plugin-transform-async-to-bluebird 2019-12-13 13:08:29 +00:00
Travis Ralston c143b9b2d7 Remove now-retired package.json property 
For https://github.com/matrix-org/matrix-react-sdk/pull/3723
 2019-12-12 19:47:31 -07:00
Weblate b537016bfb Merge branch 'origin/develop' into Weblate. 2019-12-12 17:36:51 +00:00
Travis Ralston 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
Travis Ralston b23318be8d
Clarify which versions of what we support 2019-12-12 10:34:22 -07:00
Weblate 65c8c8b52a Merge branch 'origin/develop' into Weblate. 2019-12-11 15:57:29 +00:00
J. Ryan Stinnett 0930424406 Further attempt to flip to develop 2019-12-11 15:56:59 +00:00
Weblate 4ae5559a59 Merge branch 'origin/develop' into Weblate. 2019-12-11 10:37:51 +00:00
Ganzo DG 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
J. Ryan Stinnett dd9eda8f97 Flip back to develop 2019-12-11 10:37:36 +00:00
J. Ryan Stinnett eb42793ad5 Remove bluebird transform as regular dep 2019-12-11 10:36:24 +00:00
Ganzo DG a30ad77d10 Added translation using Weblate (Mongolian) 2019-12-11 05:05:09 +00:00
David Baker 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
David Baker 685c1ba276 Revert accidental commit 2019-12-09 15:02:00 +00:00
David Baker 04402b325a Remove more origin migrator bits 2019-12-09 15:01:10 +00:00
David Baker bd57ff793f Remove rest of the origin migrator 2019-12-09 14:54:36 +00:00
David Baker 33284302b9 try & explain better 2019-12-09 13:44:42 +00:00
David Baker 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
RiotRobot b7f6d7b102 Merge branch 'master' into develop 2019-12-09 11:43:27 +00:00
RiotRobot cfb3258c36 v1.5.6 2019-12-09 11:39:56 +00:00
RiotRobot 080725295d Prepare changelog for v1.5.6 2019-12-09 11:39:56 +00:00
RiotRobot 6cf087dc82 v1.5.6 2019-12-09 11:38:41 +00:00
RiotRobot 45d51f56f2 Released js-sdk & react-sdk 2019-12-09 11:38:11 +00:00
David Baker 7776b19339
Merge pull request #11617 from vector-im/dbkr/yarn_upgrade_dec19_2 
yarn upgrade
 2019-12-06 16:12:28 +00:00
David Baker 60467ffd02 yarn upgrade 
attempt 2
 2019-12-06 15:58:44 +00:00
David Baker 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
David Baker c063cec4d7 remove draft CSS reference 2019-12-06 13:44:51 +00:00
David Baker e2b1a86a29 Remove draft-js dependency 
...which for some reason was still kicking around
 2019-12-06 13:33:30 +00:00
J. Ryan Stinnett 1d49544238 Remove bluebird transform as regular dep 2019-12-06 12:39:29 +00:00
J. Ryan Stinnett 70d2adb9e2 Move extract-text-webpack-plugin to dev dep 2019-12-06 12:36:58 +00:00
J. Ryan Stinnett 8ad1bd1501 Move bluebird transform to a dev dependency 2019-12-04 16:02:55 +00:00
David Baker 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
RiotRobot aaf1afaa13 v1.5.6-rc.1 2019-12-04 13:59:44 +00:00
RiotRobot aaa2960b32 Prepare changelog for v1.5.6-rc.1 2019-12-04 13:59:44 +00:00
RiotRobot bf33f3bdce v1.5.6-rc.1 2019-12-04 13:58:43 +00:00
David Baker 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
RiotRobot c99cd9fc58 js-sdk & react-sdk rc.1 2019-12-04 12:05:56 +00:00
David Baker c6afbed3fe electron 7.1.3 2019-12-04 11:47:14 +00:00
David Baker 0f76af48c1
Merge pull request #11599 from vector-im/travis/fix-words 
Update Lithuanian language name
 2019-12-04 10:34:59 +00:00
Travis Ralston 831522d02d Update Lithuanian language name 
By request: https://matrix.to/#/!yvhoprZiKmhjxKfNHa:matrix.org/$E_5Waedui4X866edAWmYVAjg6vv-vwAXRHN4h0DKY6s?via=matrix.eclabs.de&via=matrix.org&via=dodsorf.as
 2019-12-03 23:14:40 -07:00