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

7278 Commits

Author SHA1 Message Date
Travis Ralston e3d807b053
Merge pull request #8156 from vector-im/develop 
Develop->Experimental
 2019-01-17 16:00:52 -07:00
David Baker e5c0af478d v0.17.9-rc.1 2019-01-17 11:09:13 +00:00
David Baker 82cd88cf25 Prepare changelog for v0.17.9-rc.1 2019-01-17 11:09:12 +00:00
David Baker e94e712d49 v0.17.9-rc.1 2019-01-17 11:07:42 +00:00
David Baker 021d6c5908 Add npm user arg for https://github.com/matrix-org/matrix-js-sdk/pull/749 2019-01-17 11:06:41 +00:00
David Baker b09f0618a9 js-sdk & react-sdk rc.1 2019-01-17 10:56:34 +00:00
David Baker ea17711616
Merge pull request #8150 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2019-01-17 10:27:05 +00:00
Weblate e0b4875615 Merge remote-tracking branch 'origin/develop' into develop 2019-01-17 10:16:34 +00:00
Paulo Miranda bbfd1448c5 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
 2019-01-17 10:16:34 +00:00
Paulo Miranda d482d3c907 Translated using Weblate (Portuguese) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt/
 2019-01-17 10:16:34 +00:00
David Baker 3236f72031 Electron 4.0.1 2019-01-17 10:16:15 +00:00
Michael Telatynski 67ba81e80a
Merge pull request #8124 from vector-im/t3chguy/electron-mailto 
Correct the copying of e-mail addresses in the electron app
 2019-01-15 18:22:17 +00:00
Michael Telatynski 8c895cd435 Correct the copying of e-mail addresses in the electron app 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-01-15 08:37:01 +00:00
J. Ryan Stinnett 99b5695fec Fix SdkConfig import to use transformed module 
This was originally added in #7755, which pulled in the original source for the
module, breaking ancient browsers without support for classes (#8082).
 2019-01-11 17:51:19 -06:00
J. Ryan Stinnett 05f9cf453d Fix SdkConfig import to use transformed module 
This was originally added in #7755, which pulled in the original source for the
module, breaking ancient browsers without support for classes (#8082).
 2019-01-11 17:37:20 -06:00
J. Ryan Stinnett 3d7a74cc2b
Merge pull request #7165 from ptman/patch-1 
Start documenting keyboard shortcuts
 2019-01-10 09:23:29 -06:00
Paul Tötterman f7f9d8bfc3 Take Mac into account in keyboard shortcuts 
Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
 2019-01-09 17:37:54 +02:00
Paul Tötterman ff95952969 Start documenting keyboard shortcuts 
I'm sure I don't know all of them.

Signed-off-by: Paul Tötterman <paul.totterman@iki.fi>
 2019-01-09 17:37:54 +02:00
David Baker 373c587ef8
Merge pull request #8003 from vector-im/develop 
Merge develop into experimental
 2019-01-03 18:56:03 +00:00
Paulo Miranda ca024673b9 Translated using Weblate (Portuguese) 
Currently translated at 100.0% (37 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt/
 2019-01-03 14:55:05 +00:00
Weblate ef7d8a6d94 Merge remote-tracking branch 'origin/develop' into develop 2019-01-03 10:09:38 +00:00
Le Dang Trung 0cc8027fd9 Translated using Weblate (Vietnamese) 
Currently translated at 48.6% (18 of 37 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/vi/
 2019-01-03 10:09:38 +00:00
David Baker 9e085511fd
Merge pull request #7943 from vector-im/dbkr/electron_custom_protocol 
Electron: Load app from custom protocol
 2019-01-03 10:09:31 +00:00
Le Dang Trung 344184f239 Added translation using Weblate (Vietnamese) 2018-12-25 03:54:18 +00:00
Matthew Hodgson ad41229bb6
Merge pull request #7948 from vector-im/toml/experimental-feedback 
Update issue templates
 2018-12-24 09:54:59 +00:00
Tom Lant bb5e78f723 Make the filename match the link 2018-12-24 07:13:44 +00:00
Tom Lant 2f473912ac
Update issue templates 2018-12-24 07:09:41 +00:00
David Baker 62a49af23f Only serve origin migrator whilst migrating 
as per comment
 2018-12-21 22:21:06 +00:00
David Baker 751a1dc543 Add tool to migrate logins between origins 
App checks at startup for an existing session, if there isn't one,
it will start the tool to check for a login in the file:// origin.
If there is one, it will copy the login over to the vector://vector
origin.

In principle this could also be used to migrate logins between
other origins on the web if this were ever required.

This includes a minified copy of the browserified js-sdk with
a getAllEndToEndSessions() function added to the crypto store
(https://github.com/matrix-org/matrix-js-sdk/pull/812). This is
not great, but for a short-lived tool this seems better than
introducing more entry points into webpack only used for the
electron app.
 2018-12-21 19:14:25 +00:00
Nad Chishtie 8b97e2ceab
Merge pull request #7927 from vector-im/nadonomy/accent 
Added new colour var to all themes
 2018-12-20 17:25:03 +00:00
Nad Chishtie d01d67c2b0 Added new colour variable. 2018-12-20 16:08:13 +00:00
David Baker 4274c7287a Fix the IndexedDB worker 
Looks like this was broken in the webpack 4 upgrade due to the
worker script setter and the bundle being re-ordered in index.html.

 * Remove the loop: we only use two scripts now, so import them
   explicitly
 * Remove outdated olm import code.
 * Stop generating a script import for each theme: we were pulling
   in 3 js files that did absolutely nothing.
 * Fix worker 'onmessage' scope (set it as a global rather than
   trying to make it an ES6 module which it isn't).
 * Fail hard if the indexeddb worker script isn't set to avoid
   this happening again.
 2018-12-20 11:11:52 +00:00
Weblate 2830b6caf4 Merge remote-tracking branch 'origin/develop' into develop 2018-12-20 07:49:36 +00:00
David Baker baf3df5736
Merge pull request #7920 from vector-im/dbkr/fix_indexeddb_worker 
Fix the IndexedDB worker
 2018-12-20 07:49:29 +00:00
David Baker 7527bdd2c7 Fix the IndexedDB worker 
Looks like this was broken in the webpack 4 upgrade due to the
worker script setter and the bundle being re-ordered in index.html.

 * Remove the loop: we only use two scripts now, so import them
   explicitly
 * Remove outdated olm import code.
 * Stop generating a script import for each theme: we were pulling
   in 3 js files that did absolutely nothing.
 * Fix worker 'onmessage' scope (set it as a global rather than
   trying to make it an ES6 module which it isn't).
 * Fail hard if the indexeddb worker script isn't set to avoid
   this happening again.
 2018-12-19 22:05:04 +00:00
Weblate 7965011be9 Merge remote-tracking branch 'origin/develop' into develop 2018-12-19 21:11:07 +00:00
Michael Telatynski 6c6819f27c
Merge pull request #7919 from remram44/debian-pkg-is-electron 
Make clear that the Debian package is for desktop
 2018-12-19 21:11:01 +00:00
Remi Rampin f7bdc9339c Make clear that the Debian package is for desktop 2018-12-19 21:05:21 +00:00
Weblate 7b43ec757c Merge remote-tracking branch 'origin/develop' into develop 2018-12-19 15:05:01 +00:00
J. Ryan Stinnett 8cd37d28da Clarify line number instructions 
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
 2018-12-19 15:04:54 +00:00
David Baker b6d70f4434 Missing include 2018-12-19 12:25:32 +00:00
David Baker fc4e1485ad Electron: Load app from custom protocol 
This puts the app into its own origin so it doesn't have access
to the filesystem via file:// URIs.

Next step: migrate over localstorage & indexeddb data from the old
origin...
 2018-12-19 12:04:40 +00:00
Weblate 76833d478b Merge remote-tracking branch 'origin/develop' into develop 2018-12-19 09:48:16 +00:00
David Baker b35903bb19
Merge pull request #7907 from vector-im/dbkr/electron_sandbox 
Run the Desktop app in a sandbox
 2018-12-19 09:48:10 +00:00
David Baker ff45dc6430 Remove unused commented line 2018-12-19 09:29:05 +00:00
Weblate b1c48ed346 Merge remote-tracking branch 'origin/develop' into develop 2018-12-18 19:14:28 +00:00
David Baker 5a549519a6
Merge pull request #7908 from vector-im/dbkr/electron_singleinstance_apiupdate 
Update to new electron single instance API
 2018-12-18 19:14:22 +00:00
David Baker 0e580635eb Update tests for new platform layout 2018-12-18 18:13:51 +00:00
David Baker 60d3076038 Update to new electron single instance API 2018-12-18 18:10:09 +00:00
David Baker 0c428efea0 lint 2018-12-18 18:03:47 +00:00