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

6672 Commits

Author SHA1 Message Date
David Baker de7d3ba701 Change electron build script paths 
Because electron builder has decided to output the mac assets to
somewhere else today.
 2018-10-16 10:26:04 +01:00
David Baker 05884ba279
Merge pull request #7501 from vector-im/dbkr/update_electron_builder_relbranch 
Update to latest electron builder
 2018-10-16 09:40:30 +01:00
David Baker a0e067510c Update to latest electron builder 
Tested auto update on both windows (ia32) and mac, seems to work!
 2018-10-16 09:39:30 +01:00
Weblate 2784d1b31c Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 08:37:33 +00:00
Tom Van Eyck 8e9d7d97f6 Translated using Weblate (Dutch) 
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/nl/
 2018-10-16 08:37:31 +00:00
David Baker f483fd3916
Merge pull request #7498 from vector-im/dbkr/update_electron_builder 
Update to latest electron builder
 2018-10-16 09:37:27 +01:00
David Baker 4e65b5f73b Update to latest electron builder 
Tested auto update on both windows (ia32) and mac, seems to work!
 2018-10-15 18:13:47 +01:00
Travis Ralston 47ade14e07
Merge pull request #6831 from MTRNord/patch-8 
Fix Tinter.setTheme to not fire using Firefox
 2018-10-12 13:55:43 -06:00
David Baker 5ad9d2094a v0.17.0-rc.1 2018-10-11 16:03:53 +01:00
David Baker 848bd8f553 Prepare changelog for v0.17.0-rc.1 2018-10-11 16:03:52 +01:00
David Baker 74f2266d89 v0.17.0-rc.1 2018-10-11 16:02:48 +01:00
David Baker 03323bc294 Merge remote-tracking branch 'origin/develop' into release-v0.17.0 2018-10-11 16:02:20 +01:00
David Baker df1eb9f5cb
Merge pull request #7483 from vector-im/revert-7429-bwindels/alsocommitlockfile 
Revert "also commit the lock file when bumping version as it is now committed to the repo"
 2018-10-11 16:02:09 +01:00
David Baker aaa9c82758
Revert "also commit the lock file when bumping version as it is now committed to the repo" 2018-10-11 16:01:56 +01:00
David Baker ba51c0721e js-sdk & react-sdk rc.1 2018-10-11 15:42:30 +01:00
David Baker 845b40d815 Bump electron version to 3 2018-10-11 12:06:30 +01:00
David Baker 69adab2c9f
Merge pull request #7478 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2018-10-11 11:08:59 +01:00
David Baker 80f0964342 Translated using Weblate (English (United States)) 
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/en_US/
 2018-10-11 09:58:31 +00:00
Weblate 56372b6a5f Merge remote-tracking branch 'origin/develop' into develop 2018-10-11 09:29:42 +00:00
Matthew Hodgson af4d3da7a8 link to Here Be Dragons 2018-10-11 10:29:28 +01:00
Weblate ae1971f5d2 Merge remote-tracking branch 'origin/develop' into develop 2018-10-10 16:35:17 +00:00
Matthew Hodgson 5c184e501d dep on dev sdks 2018-10-10 17:35:06 +01:00
Weblate 3488f04dd4 Merge remote-tracking branch 'origin/develop' into develop 2018-10-09 03:18:28 +00:00
Travis Ralston 92db2b85f3
Merge pull request #7444 from aaronraimist/promise-defer 
Fix riot-web Promise.defer warnings (#7409)
 2018-10-08 21:18:22 -06:00
Bruno Windels 060a7807f0 v0.16.6 2018-10-08 17:21:35 +02:00
Bruno Windels 52954982a3 Prepare changelog for v0.16.6 2018-10-08 17:21:35 +02:00
Bruno Windels dec60a9c85 v0.16.6 2018-10-08 17:19:54 +02:00
Bruno Windels 39b5e4b1e3 update matrix-react-sdk to 0.13.6 2018-10-08 17:16:22 +02:00
Aaron Raimist d836ad8dbc
Undo turning warnings back on (#7409) 
I guess that turns on warnings for everything, not just riot-web

Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-05 11:05:25 -05:00
Aaron Raimist d035efb14e
Fix lint warnings and turn warnings back on (#7409) 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-05 10:41:45 -05:00
Aaron Raimist 401c85ad5b
Fix Promise.defer warnings in WebPlatform.js (#7409) 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-05 10:23:06 -05:00
Aaron Raimist 54c46df0dc
Fix Promise.defer warnings in index.js (#7409) 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-05 10:23:06 -05:00
Aaron Raimist a5fb33de02
Fix Promise.defer warnings in getconfig.js (#7409) 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-05 10:23:05 -05:00
Weblate 4c2dace4ca Merge remote-tracking branch 'origin/develop' into develop 2018-10-05 14:59:05 +00:00
Travis Ralston b09aa2cff3
Merge pull request #7459 from vector-im/travis/https-clone 
Use HTTPS cloning for riot-web too
 2018-10-05 08:58:58 -06:00
David Baker e277d02f83 Merge remote-tracking branch 'origin/develop' into dbkr/wasm 2018-10-05 14:04:43 +01:00
Weblate f31ccaacef Merge remote-tracking branch 'origin/develop' into develop 2018-10-05 13:00:28 +00:00
Bruno Windels d4576dcf9f
Merge pull request #7463 from vector-im/dbkr/disable_auto_reload 
Disable webpack-dev-server auto reload
 2018-10-05 15:00:23 +02:00
David Baker 4e6f48df03 Disable webpack-dev-server auto reload 
As per comment
 2018-10-05 13:56:37 +01:00
Weblate 218da8a18a Merge remote-tracking branch 'origin/develop' into develop 2018-10-05 12:25:31 +00:00
David Baker e28180f3d5
Merge pull request #7462 from vector-im/dbkr/gone_away_is_the_bluebird 
Silence bluebird warnings
 2018-10-05 13:25:26 +01:00
David Baker bccccb2758 Silence bluebird warnings 2018-10-05 12:15:29 +01:00
Besnik Bleta 46587450cb Translated using Weblate (Albanian) 
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/sq/
 2018-10-05 10:10:27 +00:00
Besnik Bleta f17712fab3 Translated using Weblate (Albanian) 
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/sq/
 2018-10-05 10:06:27 +00:00
David Baker c5ee92f4c3 Fall back to legacy asm.js Olm 2018-10-04 20:11:34 +01:00
Weblate 24f292f360 Merge remote-tracking branch 'origin/develop' into develop 2018-10-04 17:33:39 +00:00
David Baker 4f5b61b798 Translated using Weblate (English (United States)) 
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/en_US/
 2018-10-04 17:33:38 +00:00
Travis Ralston a9e98e6711
Merge pull request #7443 from MTRNord/patch-9 
Fix reskindex on matrix-react-side not being called if using build script
 2018-10-04 11:33:34 -06:00
Travis Ralston 3286acd306
Use HTTPS cloning for riot-web too 2018-10-04 11:23:42 -06:00
Weblate 085dcfe7bc Merge remote-tracking branch 'origin/develop' into develop 2018-10-04 11:45:20 +00:00