OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
16,299 Commits
211 Branches
549 Tags
658 MiB
Commit Graph

16299 Commits (ee03a0f31dd5c2f5f390e23cbe6a54a646dc139d)

Author SHA1 Message Date
Bruno Windels 63fba611c0
Merge pull request #3108 from matrix-org/bwindels/edit-room-notif-pill 
Support @room pills while editing
 2019-06-18 16:43:14 +00:00
RiotRobot a835d916e1 v1.2.2-rc.2 2019-06-18 15:52:29 +01:00
RiotRobot 043cae2aa9 Prepare changelog for v1.2.2-rc.2 2019-06-18 15:52:29 +01:00
RiotRobot 27a94bb250 js-sdk rc.2 2019-06-18 15:46:23 +01:00
David Baker ab4142ab5a Merge remote-tracking branch 'origin/develop' into release-v1.2.2 2019-06-18 15:25:44 +01:00
Weblate d52b5ba85d Merge branch 'origin/develop' into Weblate. 2019-06-18 14:17:26 +00:00
Travis Ralston 7b514b0573
Merge pull request #3115 from matrix-org/travis/reduce-scalar-calls 
Defer scalar API calls until they are needed
 2019-06-18 08:17:21 -06:00
Travis Ralston b6ca0ea6bf Appease the linter 2019-06-18 08:01:38 -06:00
Travis Ralston be37332bb0 Further simplify usage of integrations 2019-06-18 07:55:43 -06:00
Weblate 386de1970e Merge branch 'origin/develop' into Weblate. 2019-06-18 13:09:30 +00:00
Bruno Windels f7c03acb58
Merge pull request #3117 from matrix-org/bwindels/redactions-blended-echo 
Blend pending redactions
 2019-06-18 13:09:25 +00:00
Bruno Windels c4fc2a8089 remove redundant localecho part from method name 2019-06-18 14:57:58 +02:00
Bruno Windels f9188bca92 reduced opacity for pending redactions 2019-06-18 13:48:51 +02:00
Bruno Windels 02c9e29937 use renamed method that also takes local redactions into account now 2019-06-18 13:47:33 +02:00
Weblate 6e072e300c Merge branch 'origin/develop' into Weblate. 2019-06-18 09:57:13 +00:00
random 3cd91feb2a Translated using Weblate (Italian) 
Currently translated at 100.0% (1651 of 1651 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-06-18 09:57:13 +00:00
Tirifto ea32d12c77 Translated using Weblate (Esperanto) 
Currently translated at 83.9% (1385 of 1651 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2019-06-18 09:57:13 +00:00
Bruno Windels cc155ac049
Merge pull request #3116 from matrix-org/bwindels/feature-guard-arrowup-to-edit 
Keep old arrow-up behaviour when editing is not enabled
 2019-06-18 09:57:04 +00:00
Bruno Windels f95f194b6a keep old arrow-up behaviour when editing is not enabled 
also, move caret at end/start checks before choosing what to do
also, selectHistory shouldn't return a promise
 2019-06-18 11:49:36 +02:00
Weblate 592576bf42 Merge branch 'origin/develop' into Weblate. 2019-06-18 08:59:18 +00:00
Bruno Windels 32840fc274
Merge pull request #3098 from matrix-org/t3chguy/restore_composer_history 
Restore Composer History under shift-up & down
 2019-06-18 08:59:11 +00:00
Weblate 38d9f9ef8c Merge branch 'origin/develop' into Weblate. 2019-06-18 08:37:36 +00:00
Jeff Huang 1729247340 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1651 of 1651 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-06-18 08:37:36 +00:00
Osoitz d8c0f12009 Translated using Weblate (Basque) 
Currently translated at 100.0% (1651 of 1651 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-06-18 08:37:36 +00:00
David Baker 5e7b4564cf
Merge pull request #3114 from matrix-org/dbkr/allow_server_change_if_dead 
Allow changing server if validation has failed
 2019-06-18 09:37:31 +01:00
Bruno Windels 1db505c667 comment typo 2019-06-18 09:50:31 +02:00
Bruno Windels 3119feaa17 whitespace 2019-06-18 09:48:25 +02:00
Bruno Windels 47579f37e8 clarify why its always safe to not append @room at end while parsing 2019-06-18 08:40:58 +02:00
Weblate 6b7bcb239b Merge branch 'origin/develop' into Weblate. 2019-06-18 00:06:20 +00:00
Szimszon 0692775f98 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1650 of 1650 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-06-18 00:06:20 +00:00
Travis Ralston b0d340f578
Merge pull request #3109 from matrix-org/t3chguy/upload_all_button 
Add Upload All button to UploadConfirmDialog
 2019-06-17 18:06:15 -06:00
Travis Ralston d5db0077ed Remove unused imports 2019-06-17 15:53:11 -06:00
Travis Ralston 8f6e8c1ec7 Appease the linter 2019-06-17 15:51:14 -06:00
Travis Ralston d58ab8e6d0 Remove excessive scalar auth checks in manager util class 2019-06-17 15:50:09 -06:00
Travis Ralston 974a11ed20 Defer scalar auth in AppsDrawer to widgets/manager dialog 2019-06-17 15:39:32 -06:00
Travis Ralston d2d0cb2e9e Port AppTile (widgets) over to new integration manager dialog props 2019-06-17 15:34:30 -06:00
Travis Ralston f699fed720 Defer sticker picker scalar auth to integration manager dialog 
or when needed, instead of up front.
 2019-06-17 15:30:24 -06:00
Travis Ralston ebabc5238d Port integration manager class to new dialog props 2019-06-17 15:30:01 -06:00
Travis Ralston a5f296457f Make the Manage Integrations Button defer scalar auth to the manager 
This moves the responsibility of creating a URL to open from the button (and other components) to the integrations manager dialog itself.

By doing this, we also cut down on scalar API calls because we don't pick up on account information until the user opens the dialog.
 2019-06-17 15:29:28 -06:00
Travis Ralston 6cc443cd01 spelling 2019-06-17 15:27:35 -06:00
Travis Ralston 7c80355ea7 Convert IntegrationsManager to a class 2019-06-17 15:26:58 -06:00
David Baker 10f6abfe17 Allow changing server if validation has failed 
Show the server config section if there's an error and fix an if
case where we forgot to un-set the busy flag
 2019-06-17 18:47:20 +01:00
Weblate d9226751dc Merge branch 'origin/develop' into Weblate. 2019-06-17 17:45:43 +00:00
David Baker fac6dc25f6
Merge pull request #3112 from matrix-org/dbkr/reenable_register_button 
Re-enable register button
 2019-06-17 18:45:39 +01:00
Weblate b2ab8e3255 Merge branch 'origin/develop' into Weblate. 2019-06-17 17:42:55 +00:00
Bruno Windels 536f78eaf5
Merge pull request #3111 from matrix-org/bwindels/fix-register-layout 
keep mx_Field stretching
 2019-06-17 17:42:52 +00:00
Bruno Windels a35c9ea585 provide default for missing device labels 2019-06-17 19:39:40 +02:00
Bruno Windels 872c1acdea keep mx_Field stretching 2019-06-17 18:29:03 +02:00
David Baker 3f6bb0c7ca Use default cursor for disabled submit button 2019-06-17 16:57:13 +01:00
David Baker e3bf4a0b8e Re-enable register button on change to working HS 
Register button disabling is done via serverErrorIsFatal so we need
to reset this on a successful validation.

https://github.com/vector-im/riot-web/issues/10029
 2019-06-17 16:27:35 +01:00