OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
17,210 Commits
209 Branches
549 Tags
652 MiB
Commit Graph

17210 Commits (5bc9636e288fdcb552b96e27ddc1db2bf26dedf2)

Author SHA1 Message Date
dccs 5bc9636e28 Translated using Weblate (German) 
Currently translated at 88.9% (1519 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-08-13 15:00:26 +00:00
Weblate 93ec1b44c1 Merge branch 'origin/develop' into Weblate. 2019-08-13 08:32:30 +00:00
David Baker 12eeb20574
Merge pull request #3291 from matrix-org/t3chguy/fix_RoomAvatarEvent 
Fix wrong default-letter-avatar for RoomAvatarEvent
 2019-08-13 09:32:26 +01:00
Weblate 3ee91186f1 Merge branch 'origin/develop' into Weblate. 2019-08-12 20:55:27 +00:00
Travis Ralston b8fb283391
Merge pull request #3307 from matrix-org/travis/fix-settings-alignment 
Fix alignment of add email/phone number inputs in settings
 2019-08-12 14:55:23 -06:00
Travis Ralston 438eba1c46 Fix alignment of add email/phone number inputs in settings 2019-08-12 14:14:17 -06:00
Weblate d2de260aa7 Merge branch 'origin/develop' into Weblate. 2019-08-12 17:19:15 +00:00
Michael Telatynski e3348c6184
Merge pull request #3306 from matrix-org/t3chguy/react16_2 
Bump matrix-react-test-utils for React 16 compatibility
 2019-08-12 18:19:11 +01:00
Michael Telatynski 7145d0e1a6 Hit yarn with a hammer until it works 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-12 18:06:37 +01:00
Michael Telatynski 387fa75da8 Bump matrix-react-test-utils for React 16 compatibility 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-12 17:41:36 +01:00
Weblate 04a52f707e Merge branch 'origin/develop' into Weblate. 2019-08-12 14:58:00 +00:00
Michael Telatynski bb23374b8a
Merge pull request #3304 from matrix-org/t3chguy/un-hardcode-themes-in-settings 
Consolidate Themes into ThemeController. Remove hardcoded themes in view
 2019-08-12 15:57:56 +01:00
Michael Telatynski 7bdac85a2a Break themes out into a separate file 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-12 14:24:12 +01:00
Weblate 8e33b52bd2 Merge branch 'origin/develop' into Weblate. 2019-08-12 13:19:21 +00:00
Michael Telatynski 691b9145ee
Merge pull request #3303 from matrix-org/t3chguy/ModularServerConfig_extend_ServerConfig 
Deduplicate code in ModularServerConfig by extending ServerConfig
 2019-08-12 14:19:17 +01:00
Weblate 9636bc5a33 Merge branch 'origin/develop' into Weblate. 2019-08-12 12:48:47 +00:00
Tuomas Hietala 36a396247a Translated using Weblate (Finnish) 
Currently translated at 99.1% (1693 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-08-12 12:48:47 +00:00
Michael Telatynski 76f5977a2a
Merge pull request #3299 from matrix-org/t3chguy/fix_registrationForm_defaultValue_Field 
RegistrationForm: the Fields are controlled, fix default values
 2019-08-12 13:48:42 +01:00
Jeff Huang 66e6ed2d17 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1709 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-08-12 04:07:53 +00:00
Besnik Bleta e346c17006 Translated using Weblate (Albanian) 
Currently translated at 99.5% (1701 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-08-12 04:07:52 +00:00
Michael Telatynski 916af736ad Consolidate Themes into ThemeController. Remove hardcoded themes in view 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-11 03:43:34 +01:00
Michael Telatynski 3e08bf6ecb Deduplicate code in ModularServerConfig by extending ServerConfig 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-11 03:34:12 +01:00
Weblate 18dbccb062 Merge branch 'origin/develop' into Weblate. 2019-08-09 17:16:44 +00:00
Michael Telatynski 75bcd61934
Merge pull request #3298 from matrix-org/t3chguy/Modal.createX_promise 
change Modal async/await signature to use raw promises
 2019-08-09 18:16:40 +01:00
Michael Telatynski 242f23c753 RegistrationForm: the Fields are controlled, fix default values 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 18:08:17 +01:00
Michael Telatynski 49c7730503 change Modal async/await signature to use raw promises 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 17:29:22 +01:00
Weblate f5480a2e99 Merge branch 'origin/develop' into Weblate. 2019-08-09 16:16:25 +00:00
Michael Telatynski a9afdec24a
Merge pull request #3297 from matrix-org/t3chguy/Modal.createX_promise 
Modal.createX return thenable which extends onFinished, for async/await
 2019-08-09 17:16:21 +01:00
Weblate f520957051 Merge branch 'origin/develop' into Weblate. 2019-08-09 15:55:12 +00:00
Michael Telatynski 13c7149592
Merge pull request #3294 from matrix-org/t3chguy/mount-guard 
Add mount-guards to MImageBody
 2019-08-09 16:55:08 +01:00
Weblate d629f9a177 Merge branch 'origin/develop' into Weblate. 2019-08-09 15:54:56 +00:00
Michael Telatynski cc0b698c92
Merge pull request #3296 from matrix-org/t3chguy/remove_legacyLoginParams 
Get rid of support for legacy login params
 2019-08-09 16:54:51 +01:00
Michael Telatynski 7fe078c07a Modal.createX return thenable which extends onFinished, for async/await 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 16:47:22 +01:00
Weblate 930e7b15b9 Merge branch 'origin/develop' into Weblate. 2019-08-09 14:39:04 +00:00
Kévin C 0050ed7e73 Translated using Weblate (French) 
Currently translated at 100.0% (1709 of 1709 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-08-09 14:39:04 +00:00
David Baker d297018d9a
Merge pull request #3295 from matrix-org/dbkr/debounce_field 
Change throttle to debounce
 2019-08-09 15:38:58 +01:00
Michael Telatynski 787e9feeff Get rid of support for legacy login params 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 15:34:32 +01:00
David Baker fcdbce1dda Change throttle to debounce 
And add an explanation of whyI think one's more apropriate than the
other for this.
 2019-08-09 15:30:05 +01:00
Michael Telatynski 72a83a8e6e Add mount-guards to MImageBody 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 14:51:07 +01:00
Michael Telatynski ee3542453e Fix RoomAvatarEvent historic fallback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 11:31:04 +01:00
Weblate 8be1066b2f Merge branch 'origin/develop' into Weblate. 2019-08-08 23:31:43 +00:00
Travis Ralston 78744b8bcf
Merge pull request #3293 from matrix-org/travis/fix-karma 
Misc fixes to karma webpack
 2019-08-08 17:31:39 -06:00
Travis Ralston ac9682a75b Actually use argument in karma tests 2019-08-08 16:00:14 -06:00
Travis Ralston a6347af320 Fix karma complaining about woff2 files 2019-08-08 16:00:07 -06:00
Michael Telatynski 423a74c99c Clean up implementation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-08 20:21:53 +01:00
Michael Telatynski 28b42d512a Use the room name rather than sender name for fallback room avatar event 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-08 20:07:38 +01:00
Weblate 0b8ee2d196 Merge branch 'origin/develop' into Weblate. 2019-08-08 16:48:55 +00:00
J. Ryan Stinnett 3214ed8829
Merge pull request #3289 from matrix-org/jryans/rm-bind-at-reg 
Remove 3PID binding during registration
 2019-08-08 17:48:50 +01:00
Weblate 8a36973695 Merge branch 'origin/develop' into Weblate. 2019-08-08 16:48:23 +00:00
J. Ryan Stinnett c2f81a00c4
Merge pull request #3288 from matrix-org/jryans/user-settings-toggle-3pid 
Add controls for toggling discovery in user settings
 2019-08-08 17:48:17 +01:00