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

7225 Commits

Author SHA1 Message Date
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
Bruno Windels eed9c56c51 Merge branch 'develop' into matthew/dharma 2018-10-11 09:56:07 +02: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
toriko b6d5f350e4 Translated using Weblate (Japanese) 
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/ja/
 2018-10-04 11:45:19 +00:00
Bruno Windels 4d3df8b86b
Merge pull request #7454 from vector-im/dbkr/double_closing_tags 
Fix double-closed tags
 2018-10-04 13:45:14 +02:00
David Baker a356264801 Fix double-closed tags 2018-10-04 10:49:28 +01:00
Weblate d32dbb6d10 Merge remote-tracking branch 'origin/develop' into develop 2018-10-03 04:53:45 +00:00
IMIN 70319e4939 Translated using Weblate (Korean) 
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/ko/
 2018-10-03 04:53:44 +00:00
Travis Ralston 92b2980b41
Merge pull request #7435 from aaronraimist/patch-1 
Document how to turn off Piwik and bug reports (#6738)
 2018-10-02 22:53:40 -06:00
Aaron Raimist eabcc9261d
Add text saying that bug reports aren't automatic 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-02 22:58:49 -05:00
Marcel ad5be455bb
Fix reskindex on matrix-react-side not being called if using build script 2018-10-03 02:00:35 +02:00