gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,419 Commits 2 Branches 0 Tags 25 MiB
Commit Graph

8419 Commits

Author SHA1 Message Date
Travis Ralston 2e642310b8
Merge pull request #11375 from vector-im/travis/fix-chrome-favicon 
Perform favicon updates twice in Chrome
 2019-11-12 15:20:43 -07:00
Travis Ralston 71fb2e04a9
fix catch block indentation 2019-11-12 15:14:11 -07:00
Travis Ralston e84861f770 Apparently our eslint rules are different in different layers 2019-11-12 15:04:56 -07:00
Travis Ralston ec9a38c2fe Perform favicon updates twice in Chrome 
See diff for why this arcane magic is needed.

Fixes https://github.com/vector-im/riot-web/issues/11347
 2019-11-12 15:02:52 -07:00
Travis Ralston c6f62632d8
Fix config.json syntax 2019-11-12 10:12:25 -07:00
Travis Ralston 2561e3a64f
Merge pull request #11275 from vector-im/travis/mjolnir 
Add labs documentation for Mjolnir
 2019-11-12 10:00:37 -07:00
Bruno Windels 5041e6f3d9
Merge branch 'develop' into travis/mjolnir 2019-11-11 15:47:29 +00:00
Bruno Windels 67b87e26e8
Merge pull request #11360 from vector-im/bwindels/userinfo-labs-doc 
Add description of user info feature in labs doc
 2019-11-11 15:45:16 +00:00
Bruno Windels d3778ab1fd
Add description of user info feature 2019-11-11 13:59:32 +00:00
David Baker ed551c375d
Merge pull request #11359 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-11-11 10:12:13 +00:00
Stanislav Lukeš 52a3f4e1a8 Translated using Weblate (Czech) 
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/cs/
 2019-11-11 10:05:14 +00:00
Elwyn Malethan b8af903703 Translated using Weblate (Welsh) 
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/cy/
 2019-11-10 19:44:44 +00:00
Weblate 6eeeaff399 Merge branch 'origin/develop' into Weblate. 2019-11-08 22:05:21 +00:00
Travis Ralston c14bbea0a1
Merge pull request #11356 from vector-im/travis/verif-dm-docs 
Add DM verification feature to labs.md
 2019-11-08 15:05:17 -07:00
Weblate 43171c05d3 Merge branch 'origin/develop' into Weblate. 2019-11-08 21:56:17 +00:00
Travis Ralston 8c899ab13f
Merge pull request #11355 from vector-im/travis/labs-dm-verif 
Add feature_dm_verification to labs
 2019-11-08 14:56:10 -07:00
Travis Ralston 4eb0f014b8
Add DM verification feature to labs.md 2019-11-08 14:54:24 -07:00
Travis Ralston 8f13e8b2bb
Add feature_dm_verification to labs 2019-11-08 14:51:07 -07:00
Weblate 4903089e41 Merge branch 'origin/develop' into Weblate. 2019-11-08 15:58:39 +00:00
J. Ryan Stinnett 2db876d12c
Merge pull request #11341 from vector-im/jryans/feature-flag-process 
Document feature flag process
 2019-11-08 17:58:33 +02:00
J. Ryan Stinnett d373e2891e Describe regular setting path 2019-11-08 15:57:46 +00:00
J. Ryan Stinnett 8b0257d24b Apply suggestions from code review 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-11-08 15:57:09 +00:00
J. Ryan Stinnett fa3d3aa4dd Absolute URLs 2019-11-08 15:55:01 +00:00
J. Ryan Stinnett 9ca438087e Add numbers 2019-11-08 15:55:01 +00:00
J. Ryan Stinnett 037d8c071c Document feature flag process 
This records the feature flag process we intend to use with Riot and also how
that interacts with other teams and configuration.

Fixes https://github.com/vector-im/riot-web/issues/11116
 2019-11-08 15:55:01 +00:00
Damir Jelić a6839afc1f electron-main: Use a capital letter for the seshat import. 2019-11-08 13:57:41 +01:00
Damir Jelić 94196eb11b electron-main: Use camle-case for the send_error method. 2019-11-08 13:45:06 +01:00
Weblate 89bb2dba38 Merge branch 'origin/develop' into Weblate. 2019-11-08 11:23:24 +00:00
shuji narazaki f61aae7e3f Translated using Weblate (Japanese) 
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/ja/
 2019-11-08 11:23:24 +00:00
J. Ryan Stinnett ceacf3bf54
Merge pull request #11343 from vector-im/jryans/clean-flags 
Remove unused feature flags
 2019-11-08 13:23:17 +02:00
J. Ryan Stinnett 5e4e382dec Remove unused feature flags 2019-11-07 15:01:39 +00:00
Travis Ralston 956c199fcf Add some docs to describe Mjolnir and Ban Lists 2019-11-06 12:25:34 -07:00
Weblate 36f9d37487 Merge branch 'origin/develop' into Weblate. 2019-11-06 14:33:27 +00:00
RiotRobot 5bc15cf83c v1.5.3 2019-11-06 14:28:59 +00:00
RiotRobot ab180bc98d Prepare changelog for v1.5.3 2019-11-06 14:28:58 +00:00
RiotRobot a13fbab4e4 v1.5.3 2019-11-06 14:27:50 +00:00
David Baker f522305593 Bump to electron 6.1.4 2019-11-06 14:26:45 +00:00
RiotRobot 15c0561588 released react-sdk 2019-11-06 14:24:59 +00:00
dreamerchris 146ccc37a2 Translated using Weblate (Greek) 
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/el/
 2019-11-06 13:44:29 +00:00
David Baker c22199f92f
Merge pull request #11326 from vector-im/dbkr/no_menubar_on_mac 
Remove the 'auto hide menu bar' option on Mac
 2019-11-05 20:39:27 +00:00
David Baker 7af68bddea Remove the 'auto hide menu bar' option on Mac 
The menu bar is at the top of the screen on Mac so this setting
does absolutely nothing.
 2019-11-05 20:31:08 +00:00
Michael Telatynski 7ca40bed32
Merge pull request #11304 from vector-im/t3chguy/riot.im/develop/feature_user_info_panel 
Expose feature_user_info_panel on riot.im/develop
 2019-11-05 13:04:33 +00:00
Michael Telatynski e8913b843d Merge branches 'develop' and 't3chguy/riot.im/develop/feature_user_info_panel' of https://github.com/vector-im/riot-web into t3chguy/riot.im/develop/feature_user_info_panel 2019-11-05 11:58:47 +00:00
Michael Telatynski 385ad5f9ce Don't transform async at all, all browsers we care about support it 2019-11-05 10:43:05 +00:00
David Baker 1088a78720
Merge pull request #11312 from vector-im/dbkr/upgrade_electron_notarize 
Upgrade electron-notarize
 2019-11-05 10:16:54 +00:00
David Baker e006e92255 Upgrade electron-notarize 
To include https://github.com/electron/electron-notarize/pull/14
 2019-11-04 18:56:41 +00:00
RiotRobot 12bdb5ffe5 Merge branch 'master' into develop 2019-11-04 18:34:20 +00:00
RiotRobot a92e676e28 Merge branch 'release-v1.5.2' 2019-11-04 18:34:12 +00:00
RiotRobot 17027cb515 v1.5.2 2019-11-04 18:30:37 +00:00
RiotRobot 3cd7e1c18c Prepare changelog for v1.5.2 2019-11-04 18:30:36 +00:00