c0002e7778
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events
2017-11-15 16:03:07 +00:00
5563b71c47
differentiate between state events and message events
...
so that people can't fake state event types and have them rendered.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-15 15:56:54 +00:00
aeca83ff2e
Unused import
2017-11-15 15:20:45 +00:00
750e64deee
Pass required props to TintableSvg.
2017-11-15 15:17:21 +00:00
93800be742
Factor out showing UnknownDeviceDialog
...
So we can re-use it for calls that fail due to unknwon devices
2017-11-15 15:15:21 +00:00
24b9269ff5
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour
2017-11-15 15:08:28 +00:00
f4ecc7fa5d
speculatively fix @lampholder's NPE
2017-11-15 14:47:20 +00:00
ec33806379
Merge pull request #1610 from matrix-org/rxl881/lintingErrors
...
Fix linting errors.
2017-11-15 14:30:36 +00:00
7bab7813bb
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour
2017-11-15 13:26:29 +00:00
59d405d4fa
Use TintableSvgButtons for widget menubar icons.
2017-11-15 13:24:38 +00:00
6c2e9096cd
Tintable SVGs that behave like normal image buttons / links.
2017-11-15 13:08:24 +00:00
f8fc6dc83e
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-15 12:11:33 +00:00
96a3eff5d3
lint hell
2017-11-15 11:25:56 +00:00
84591729a8
unbreak tests
2017-11-15 11:15:49 +00:00
060a890275
Merge pull request #1516 from turt2live/travis/granular-settings
...
Granular settings
2017-11-15 10:55:55 +00:00
63919befd0
Catch call failures due to unknown devices
...
And show a specific dialog that you can then launch the UDD from
(although currently with a 'Send Anyway' button which makes little
sense for VoIP)
2017-11-15 10:49:29 +00:00
56a70f5530
Add tinting for lowlights.
2017-11-15 10:40:07 +00:00
06b319937f
Fix linting errors.
2017-11-15 10:14:16 +00:00
e91e94fd42
fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601
2017-11-15 09:56:44 +00:00
f58e8826c0
Use the correct settings store for presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-14 19:18:04 -07:00
443bff5832
Presence feature
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-14 19:14:56 -07:00
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
546b062d82
automatically and correctly retint when changing theme
2017-11-15 01:45:51 +00:00
d6fc4ebe3c
fix new tinter problems
...
correctly handle skinned tertiaryColors (turns out they're used for the RoomSublist divider bars)
handle the fact that some room accountData apparently has ended up with rgb() colors in it...
2017-11-15 01:01:17 +00:00
f05958e334
Merge pull request #1482 from turt2live/travis/presence
...
Implement user-controlled presence
2017-11-14 23:53:16 +00:00
ae252f7e59
Log if no match is found
2017-11-14 21:34:20 +01:00
58966c5c3d
Make edit icon green by default
2017-11-14 19:53:59 +00:00
e87940f63c
Make app tile title stronger
2017-11-14 19:53:32 +00:00
f8660de52d
Add note about alternative to opacity
2017-11-14 20:13:00 +01:00
df6d5cc2b4
Pass plain components, rather than functions returning them
2017-11-14 20:09:52 +01:00
788be67c75
Clarifications
2017-11-14 20:08:27 +01:00
772550a24a
Dont't add empty nodes
2017-11-14 19:33:12 +01:00
7c98558b6a
fix neglible race when loading CSS
2017-11-14 16:07:48 +00:00
1fd7ac30e4
turns out i made up the .complete property on link elements
2017-11-14 16:04:11 +00:00
8d6e3dd27d
fix lint
2017-11-14 15:37:03 +00:00
dcfbe93409
fix race when loading CSS
...
fixes https://github.com/vector-im/riot-web/issues/5590
2017-11-14 15:28:34 +00:00
805796e4e0
force the tinter to refresh when we change theme
2017-11-14 15:27:28 +00:00
8c218557df
fix disable_custom_urls
2017-11-14 15:17:50 +00:00
b58514f427
Stop FF quantum exploding on CSS edits
2017-11-14 14:27:27 +00:00
55260becc9
Revert "Lowercase all usernames"
2017-11-14 14:13:22 +00:00
12d9f05883
Merge branch 'develop' into luke/fix-restrict-power-level-options
2017-11-14 13:08:31 +00:00
3fa1bece0a
Simplify further
...
Also fix not-i18n-friendly "of" to be "=".
2017-11-14 13:06:54 +00:00
e7c99a71b6
Merge pull request #1606 from matrix-org/luke/fix-member-info-power-level-display
...
Determine whether power level is custom once Roles have been determined
2017-11-14 12:42:55 +00:00
c3492634bd
Merge branch 'luke/fix-member-info-power-level-display' into luke/fix-restrict-power-level-options
2017-11-14 12:41:36 +00:00
d2ef6bffa8
Remove reverseRoles
...
This variable seemed redundant in hindsight, it seemed better to remove it than to worry about where it went in the component.
2017-11-14 12:02:37 +00:00
d92cba25ef
Use the SettingsStore to get the theme
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 13:14:00 -07:00
2acd42e7c5
Make eslint happy
2017-11-13 21:10:08 +01:00
63bebe9dfd
Split out avatar and display name hiding
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 12:58:10 -07:00
ffecb82bca
Groups were released
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 12:34:30 -07:00
0648b3eae7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:29:36 -07:00
3afbaf61e7
Refactor i18n stuff a bit
2017-11-13 20:19:33 +01:00
c5c346f0b7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:18:41 -07:00
0659ac1ccb
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-13 17:45:57 +00:00
52af7a7659
Attempt to clarify the affect that the users_default has on power levels
...
This modifies displayed power levels such that:
- If users_default is !== 0:
- the power level 0 is displayed as "Restricted (0)"
- the power level users_default is displayed as "Default ({users_default})"
- Otherwise:
- the power level 0 is displayed as "Default (0)"
When changing users_default, to say, 10, when the textual powers are rendered
again, they will take users_default into account. So those previously at 10
and which would have previously have been rendered "Custom of 10" will now
read "Default (10)". Conversely, those that were "Default (0)" will now read
"Restricted (0)".
2017-11-13 17:03:48 +00:00
88010fa26c
Determine whether power level is custom once Roles have been determined
...
Instead of potentially inspecting an empty {} before mounting.
This fixes an issue where "Custom of N" would appear on the first mount of MemberInfo - part of https://github.com/vector-im/riot-web/issues/5107#issuecomment-331882294
2017-11-13 11:57:34 +00:00
ca531f83d2
remove needless case-squash on login, castrating https://github.com/matrix-org/matrix-react-sdk/pull/1550
2017-11-13 10:34:38 +00:00
6942e94394
unbreak tests
2017-11-12 00:00:46 +00:00
46387e135e
Merge branch 'develop' into matthew/status
2017-11-11 23:50:48 +00:00
2827bc0718
replace some of the status.im theme with general config options
2017-11-11 23:46:43 +00:00
39763d668c
Revert "Lowercase all usernames"
2017-11-11 15:59:43 +00:00
bce4815851
Initialise unread messages value correctly
2017-11-11 15:57:20 +00:00
a0cdaf29f9
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-10 15:29:42 -08:00
a96bfee9f2
Remove unused UserSettingsStore import
2017-11-10 16:12:27 +00:00
ceda5939f9
Remember to import React
2017-11-10 15:55:55 +00:00
853d33a93a
Make groups a fully-fleged baked-in feature
2017-11-10 15:42:11 +00:00
6e1cf6ce17
Merge pull request #1548 from matrix-org/rxl881/widgetrendering
...
Improve widget rendering on prop updates
2017-11-10 12:41:20 +00:00
74c6ebc5c6
Merge pull request #1595 from matrix-org/luke/groups-show-user-profile-on-action
...
Display group member profile (avatar/displayname) in ConfirmUserActionDialog
2017-11-10 12:31:47 +00:00
d2549b621c
Merge pull request #1602 from matrix-org/dbkr/nullcheck_atroom_rule
...
Don't crash if there isn't a room notif rule
2017-11-10 11:57:43 +00:00
981ca458ec
Merge pull request #1596 from matrix-org/luke/groups-show-name-in-flair-tootip
...
Show group name in flair tooltip if one is set
2017-11-10 11:51:45 +00:00
ba8a9f2a43
Comment length
2017-11-10 11:50:14 +00:00
ff5e00d244
Don't crash if there isn't a room notif rule
2017-11-10 11:50:00 +00:00
6deeaf94d6
group name not required
2017-11-10 11:43:05 +00:00
d2070a08d8
Replace 'qs' dep. with 'querystring'
2017-11-10 11:42:56 +00:00
90a63d78b9
Merge pull request #1597 from matrix-org/luke/groups-fix-invite-avatar
...
Convert group avatar URL to HTTP before handing to BaseAvatar
2017-11-10 11:41:51 +00:00
d179267714
Add prop type
2017-11-10 11:41:36 +00:00
0d174ffe9a
Fix tests
2017-11-10 11:13:52 +00:00
f4428267a1
Refactor onboarding redirect, add groups to the onboarding starters
2017-11-10 10:51:28 +00:00
266a504981
Use the same MatrixClient for the duration of GroupView lifecycle
...
Using the pegged matrix client would lead to trying to call removeListener on `null` when GroupView is unmounted during logout.
2017-11-10 10:49:14 +00:00
681f43913a
Make the disabled PowerSelector element showing custom value translatable. Fixes #5547
2017-11-10 11:26:53 +01:00
bd6b5c4498
Improve function name.
2017-11-10 10:17:55 +00:00
98ac3dd19b
Explicitly set initialisation state.
2017-11-10 09:44:58 +00:00
7893927e14
Merge pull request #1598 from matrix-org/luke/groups-update-group-room-visibility-api
...
Modify the group room visibility API to reflect the js-sdk changes
2017-11-09 17:34:18 +00:00
31be27515c
Modify the group room visibility API to reflect the js-sdk changes
...
See https://github.com/matrix-org/matrix-js-sdk/pull/569
2017-11-09 16:28:21 +00:00
b1ec430523
Remove now-unused dispatches
2017-11-09 16:09:12 +00:00
820d9c1c25
Show staus bar on Unknown Device Error
...
Don't pop up the dialog as soon as we can't send a message.
Also removes dispatches used to keep the RoomStatusBar up to date.
We can get the same events straight from the js-sdk via the
pending events event.
2017-11-09 15:58:15 +00:00
a8487c540f
Convert group avatar URL to HTTP before handing to BaseAvatar
...
This is yet another component that imports the MatrixClient just for mxcUrlToHttp. It'd be much nicer to have an avatar component that accepted MXCs, e.g. by wrapping or modifying BaseAvatar.
2017-11-09 14:34:04 +00:00
da8b1ff1cd
Ensure that loading state is reset when showing app panel.
2017-11-09 14:28:24 +00:00
3807d99a6a
Merge remote-tracking branch 'origin/develop' into develop
2017-11-09 14:17:07 +00:00
1c1acd6d12
Translated using Weblate (Slovak)
...
Currently translated at 100.0% (928 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-09 14:17:06 +00:00
f796c4c6d1
Translated using Weblate (Russian)
...
Currently translated at 98.4% (914 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-09 14:17:06 +00:00
9b7f302310
Translated using Weblate (Polish)
...
Currently translated at 76.7% (712 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-11-09 14:17:06 +00:00
0250958c25
Translated using Weblate (Galician)
...
Currently translated at 1.7% (16 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2017-11-09 14:17:06 +00:00
9a6c9594a1
Correctly display group invite
...
By making sure the groupName truncates in the right place
2017-11-09 14:16:54 +00:00
f796bc79c3
Fix addition of scalar token to widget URL.
...
Add error logging.
2017-11-09 14:07:29 +00:00
9027780215
Show group name in flair tooltip if one is set
...
e.g. "Group Name (+group_id:homeserver)" or "+group_id:homeserver"
Fixes https://github.com/vector-im/riot-web/issues/5341
2017-11-09 12:38:43 +00:00
6eeb91ee2e
Display group member profile (avatar/displayname) in ConfirmUserActionDialog
...
Fixes https://github.com/vector-im/riot-web/issues/5486
2017-11-09 12:24:20 +00:00
9b7ab4b7bd
Added translation using Weblate (Galician)
2017-11-09 06:24:11 +00:00
030633fa90
Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings
2017-11-08 17:43:38 -07:00
2711da28b4
Use the SettingsStore in the UnknownDeviceDialog
2017-11-08 17:43:06 -07:00
f7da5836e1
Make blacklistUnverifiedDevices override the level order
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-08 17:41:32 -07:00
c7d8f3931f
Revert notification toolbar setting
...
It isn't a setting.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-08 17:06:36 -07:00
8016fb82d7
Fix broken commit.
2017-11-08 20:38:54 +00:00
56581ef408
Fix various loadingElement related issues.
2017-11-08 20:38:31 +00:00
b2b07d9370
Formatting
2017-11-08 20:17:28 +00:00
23c9324fa5
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 18:52:33 +00:00
7b243bf64d
Revert "UnknownDeviceDialog: get devices from SDK"
2017-11-08 18:49:50 +00:00
be0a76dbd6
Update variable name and JSdoc for improved clarity.
2017-11-08 17:44:54 +00:00
58ee4d0a76
rewrite the tinter to be ES6, and correctly cache fixups per theme
2017-11-08 06:55:07 -08:00
685e5b916b
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 14:04:32 +00:00
b575df7da7
Merge pull request #1591 from matrix-org/luke/groups-order-admins-first
...
Order users in the group member list with admins first
2017-11-08 14:04:28 +00:00
e2a0cba6cb
If group member privilege level is equal, disambiguate with displayname or userId
2017-11-08 13:57:38 +00:00
02cce94c2b
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 13:35:58 +00:00
65cea53f3d
Merge pull request #1592 from matrix-org/luke/groups-fix-accept-invite-refresh-members
...
Fetch group members after accepting an invite
2017-11-08 13:35:53 +00:00
d583a12514
Translated using Weblate (German)
...
Currently translated at 100.0% (928 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-08 13:00:39 +00:00
569a3a3ac4
Translated using Weblate (French)
...
Currently translated at 100.0% (928 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-08 12:34:28 +00:00
e729bc431d
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-08 04:29:52 -08:00
447f23796c
Translated using Weblate (Slovak)
...
Currently translated at 100.0% (928 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-08 12:07:30 +00:00
3e3ebd6358
Fetch group members after accepting an invite
2017-11-08 11:52:52 +00:00
e3e161fbea
Order users in the group member list with admins first
2017-11-08 11:51:58 +00:00
100053ff3d
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 11:49:49 +00:00
7075931c58
Merge pull request #1589 from matrix-org/luke/improve-room-address-picker
...
Improve address picker for rooms
2017-11-08 11:49:45 +00:00
63c8d676cf
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 11:36:35 +00:00
f14f2f99ab
Translated using Weblate (Slovak)
...
Currently translated at 99.8% (927 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2017-11-08 11:31:58 +00:00
1c5e7f3048
Fix FlairStore getPublicisedGroupsCached to give the correct, existing promise
2017-11-08 11:31:04 +00:00
4a9752a482
Added translation using Weblate (Slovak)
2017-11-08 11:21:21 +00:00
1e7fc953b3
Ooops, also add the string to the default language file.
2017-11-08 11:56:30 +01:00
b496eec523
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 10:55:59 +00:00
c1d9d3714a
Fix not being able to filter community rooms - fixes vector-im/vector-web#5538
2017-11-08 10:55:51 +00:00
8f2bb73229
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (928 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-08 10:53:24 +00:00
077ca36b05
Rank rooms with shorter matching aliases first
2017-11-08 10:47:45 +00:00
b3674f503d
Do not search through room topics
2017-11-08 10:32:48 +00:00
59bf3b231c
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 10:24:05 +00:00
120e7b821f
Merge pull request #1585 from matrix-org/luke/groups-inviter-profile
...
Use the getProfileInfo API for group inviter profile
2017-11-08 10:24:00 +00:00
10778e075e
Merge branch 'develop' into luke/groups-inviter-profile
2017-11-08 10:10:43 +00:00
4bb083d959
Style
2017-11-08 10:08:04 +00:00
f53f9ed8ca
inviterProfile = null initially
2017-11-08 10:07:43 +00:00
662a05e86f
Merge remote-tracking branch 'origin/develop' into develop
2017-11-08 10:04:45 +00:00
4c47f75918
Merge pull request #1587 from matrix-org/luke/groups-add-rooms-with-visibility
...
Add checkbox to GroupAddressPicker for determining visibility of group rooms
2017-11-08 10:04:41 +00:00
a29ab0976b
Make the addresses heading on the aliases settings view translatable
2017-11-08 10:23:11 +01:00
a79a687e59
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 22:46:15 +00:00
ce6957a288
Merge pull request #1581 from matrix-org/luke/groups-update-group-members-api
...
Alter group member api
2017-11-07 22:46:11 +00:00
289b0c2b6a
Merge branch 'develop' into travis/granular-settings
2017-11-07 14:55:12 -07:00
d5d5b9e334
Translated using Weblate (French)
...
Currently translated at 100.0% (928 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-07 21:41:16 +00:00
4e717f38d7
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (928 of 928 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-07 19:41:02 +00:00
17e7dc8eed
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 18:55:38 +00:00
8fbe50a1cf
Merge pull request #1580 from matrix-org/luke/groups-new-group-settings
...
Improve group creation UX
2017-11-07 18:55:34 +00:00
51ec12bfe9
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 18:53:08 +00:00
d777e370f2
Merge pull request #1583 from matrix-org/luke/groups-disable-rooms-whilst-editing
...
Disable RoomDetailList in GroupView when editing
2017-11-07 18:53:04 +00:00
edc744067f
Add checkbox to GroupAddressPicker for determining visibility of group rooms
2017-11-07 18:51:41 +00:00
85ea67494c
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 18:24:25 +00:00
3b1726657f
Merge pull request #1586 from turt2live/travis/message-pinning-fix1
...
Default to no read pins if there is no applicable account data
2017-11-07 18:24:21 +00:00
343ffa6b97
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 18:16:04 +00:00
49a935881f
Merge pull request #1584 from matrix-org/dbkr/udd_devices_from_sdk
...
UnknownDeviceDialog: get devices from SDK
2017-11-07 18:15:59 +00:00
e0ddd88ec9
Default to no read pins if there is no applicable account data
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-07 11:14:27 -07:00
ffd83f1faf
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 17:56:17 +00:00
002086de69
Translated using Weblate (Russian)
...
Currently translated at 98.7% (914 of 926 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-07 17:56:16 +00:00
e14e0bf200
Merge pull request #1486 from turt2live/travis/pinned-notice
...
Add a small indicator for when a new event is pinned
2017-11-07 17:56:12 +00:00
10f15dfc56
Unmounted guard
2017-11-07 17:10:40 +00:00
80d4873542
Disable RoomDetailList in GroupView when editing
...
Otherwise the rooms can be clicked on.
2017-11-07 16:54:28 +00:00
ed709f52d1
Use the getProfileInfo API for group inviter profile
2017-11-07 16:42:43 +00:00
ec560345c7
UnknownDeviceDialog: get devices from SDK
...
rather than having to have the error message passed in.
This is in preparation for not having the dialog pop up straight
away when a message isn't sent so we don't have to keep the error
object knocking around somewhere.
2017-11-07 16:37:43 +00:00
142d23a099
Cap the read pin event IDs to 10
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-07 09:16:19 -07:00
2c096f45c2
Translated using Weblate (French)
...
Currently translated at 100.0% (926 of 926 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-07 15:34:05 +00:00
ed34c1cc63
Translated using Weblate (German)
...
Currently translated at 100.0% (926 of 926 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-07 15:24:45 +00:00
397d7724e5
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 15:22:40 +00:00
a8ff8973f8
Translated using Weblate (Russian)
...
Currently translated at 98.4% (911 of 925 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-07 15:22:39 +00:00
646cabf324
Add missing whitespace
2017-11-07 15:15:10 +00:00
ddc1ff2f23
Name things in a sane way
2017-11-07 15:13:26 +00:00
62305a1ccd
Implement tooltip for group rooms
2017-11-07 14:07:31 +00:00
3e29a26766
Translated using Weblate (German)
...
Currently translated at 100.0% (925 of 925 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-07 13:33:46 +00:00
96de72ab44
Switch to using existing dep "qs" and record in package.json
2017-11-07 12:45:12 +00:00
d3784b4925
Fix URL parameter encoding.
2017-11-07 12:33:38 +00:00
eb8c15075a
Fix url params parsing.
2017-11-07 11:58:38 +00:00
7a09127687
Alter group member api
...
To match https://github.com/matrix-org/synapse/pull/2647
2017-11-07 11:27:42 +00:00
70c4100350
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering
2017-11-07 11:04:05 +00:00
9019fee49e
Adjust long desc placeholder text
2017-11-07 10:48:56 +00:00
b92156a1ff
Translated using Weblate (French)
...
Currently translated at 100.0% (925 of 925 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-07 10:47:23 +00:00
5e9bb4353a
Merge remote-tracking branch 'origin/develop' into develop
2017-11-07 10:25:54 +00:00
47bf991471
Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills
...
Room notifs in autocomplete & composer
2017-11-07 10:25:48 +00:00
df5c6470e8
get dict syntax right
2017-11-06 22:01:23 +00:00
956c5ff343
Use a constant for easy reading of long desc placeholder
2017-11-06 18:52:55 +00:00
477051cfa6
Add placeholder for when a long desc hasn't been set
...
this is only visible to group admins.
2017-11-06 18:35:52 +00:00
137f1311b3
Add useful placeholder for the long description textarea
2017-11-06 18:35:23 +00:00
36cd22663a
Open group settings when the group is created
2017-11-06 18:02:50 +00:00
afc9c36e4e
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 18:02:44 +00:00
17ae37bd3b
Merge pull request #1579 from matrix-org/luke/fix-img-no-src-bug
...
Ignore img tags in HTML if src is not specified
2017-11-06 18:02:38 +00:00
d14f943629
Ignore img tags in HTML if src is not specified
...
This applies to HTML messages and group summaries.
2017-11-06 17:52:46 +00:00
16771cac4f
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 17:16:39 +00:00
029853d379
Merge pull request #1578 from matrix-org/luke/groups-admin-badges
...
Indicate admins in the group member list with a sheriff badge
2017-11-06 17:16:34 +00:00
08d006d112
PR feedback
2017-11-06 17:15:09 +00:00
d6a6e59d6c
Indicate admins in the group member list with a sheriff badge
2017-11-06 16:37:16 +00:00
41e7496ff1
unused var
2017-11-06 15:25:25 +00:00
adc4290451
Pillify room notif pills in composer
2017-11-06 15:11:42 +00:00
706981688a
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 14:29:30 +00:00
f1db564506
Merge pull request #1533 from anoadragon453/develop
...
Remember whether widget drawer was hidden per-room
2017-11-06 14:29:25 +00:00
0fdde954d4
Merge remote-tracking branch 'origin/develop' into develop
2017-11-06 13:02:51 +00:00
cb7b1268fe
Translated using Weblate (Ukrainian)
...
Currently translated at 10.6% (98 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-11-06 13:02:51 +00:00
febeb0429e
Throw an error when trying to create a group store with falsey groupId
2017-11-06 10:18:10 +00:00
781b94c8f4
Appease the linter
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 15:37:06 -07:00
10519f9465
Fix the tests
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 14:56:41 -07:00
f0000f7400
Update documentation
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 14:33:40 -07:00
50807d498a
Use settings in slash commands too
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 13:06:55 -07:00
e31c89d360
Make the controller work for notifications
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 22:28:35 -07:00
7ce4316cc8
Initial support for notification settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 21:47:18 -07:00
8351ec7e73
Local echo on all setting levels
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 20:32:00 -07:00
3958e32672
Ensure blacklistUnverifiedDevices persists reloads
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 20:13:23 -07:00
45140cab69
Don't assume `false` means "use state"
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:52:42 -07:00
ef45d82ec6
Fix URL preview save calls
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:52:20 -07:00
b75be41f94
Fix split-brain for blacklistUnverifiedDevices
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:52:06 -07:00
cb17c0a379
Migrate blacklistUnverifiedDevicesPerRoom
...
This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:15:55 -07:00
68115f5b9c
tint when theming correctly
2017-11-05 00:40:38 +00:00
8587b36715
Merge branch 'develop' into matthew/status
2017-11-04 23:51:26 +00:00
e72e30197a
calculate new CSS tinting when we change theme
2017-11-04 23:50:57 +00:00
b2ddcb8027
tint the colours in the theme rather than hardcode vector green
2017-11-04 23:43:20 +00:00
c7eee36990
Fix lanugage detection
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 16:38:26 -06:00
4f1ad974fc
Delay URL preview saving until the save button is pressed
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 16:32:13 -06:00
358298e4ee
Support room color in settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 16:10:25 -06:00
bb5f7bed85
Check the correct event type for the room
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 15:48:24 -06:00
a8169a682c
Throw errors if the setting isn't known
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 15:46:15 -06:00
257e1aabb8
Improve documentation of settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 15:44:01 -06:00
ae844a048f
Merge remote-tracking branch 'origin/develop' into develop
2017-11-04 15:42:03 +00:00
3fd5937687
Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing
...
Fixes React warning
2017-11-04 15:41:57 +00:00
8282534f87
Add SettingsLevel enum; Move settings to own file.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 23:19:45 -06:00
893c39bfbe
Merge branch 'develop' into travis/granular-settings
2017-11-03 22:00:07 -06:00
de6fc32a87
Show an indicator when there are any pins in the room
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 20:00:48 -06:00
a2b7f6d30e
Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice
2017-11-03 19:57:39 -06:00
5c37155730
Don't assume we have a valid event.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 18:18:09 -06:00
3656fdb571
Store read pinned events as an array to avoid racing saves.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 18:12:57 -06:00
107f83f84f
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 22:44:22 +00:00
d4adff3d25
Merge pull request #1575 from matrix-org/luke/fix-flair-store-again
...
Fix Flair not appearing due to missing this._usersInFlight
2017-11-03 22:44:16 +00:00
6ddbaebb65
Translated using Weblate (French)
...
Currently translated at 100.0% (923 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-03 19:54:40 +00:00
da23afdec2
Better comment on FlairStore _usersInFlight
2017-11-03 18:48:15 +00:00
295bdae075
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 18:47:03 +00:00
ed586bedbc
Translated using Weblate (Czech)
...
Currently translated at 70.0% (647 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-11-03 18:47:02 +00:00
4d8f18742b
Check against non-existant promise to resolve a user's groups
2017-11-03 18:43:43 +00:00
d64fc4c842
Fix Flair not appearing due to missing this._usersInFlight
2017-11-03 18:19:10 +00:00
58f1757f0c
Handle rooms with no aliases or canonical alias
2017-11-03 17:52:36 +00:00
98312a4647
Use, if possible, a room's canonical or first alias when viewing the room
...
(Only affects rooms the user has never joined)
2017-11-03 17:37:13 +00:00
dad5023728
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (923 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-03 16:51:41 +00:00
6796b5b70c
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 16:15:06 +00:00
04614de139
Translated using Weblate (German)
...
Currently translated at 100.0% (923 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-03 16:15:05 +00:00
abff4ee6b5
Merge pull request #1573 from matrix-org/luke/groups-add-style-to-create-group-dialog
...
Add CSS classes to group ID input in CreateGroupDialog
2017-11-03 16:14:59 +00:00
b88c13d527
Use prefixed class names to avoid collisions with other libraries
2017-11-03 16:02:41 +00:00
e84e4ed5f5
Add CSS classes to group ID input in CreateGroupDialog
2017-11-03 15:38:12 +00:00
f96c0d8533
Translated using Weblate (German)
...
Currently translated at 100.0% (923 of 923 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-03 15:35:45 +00:00
6747390333
merge
2017-11-03 15:12:24 +00:00
49ee78dab1
Merge remote-tracking branch 'origin/develop' into dbkr/composer_at_room_pills
2017-11-03 14:39:52 +00:00
6a5162b047
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 14:30:06 +00:00
43a23d7e89
Merge pull request #1568 from matrix-org/dbkr/autocomplete_provider_room
...
Give autocomplete providers the room they're in
2017-11-03 14:29:59 +00:00
ec8afd185f
Merge remote-tracking branch 'origin/develop' into develop
2017-11-03 14:24:37 +00:00
Michael Telatynski