4666ac7c83
hide rich quoting behind flags, retaining original quoting for now
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-12 23:29:43 +00:00
38e8488c2a
we don't actually use state.room
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-12 23:25:38 +00:00
c93266b6af
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/titleBar
2017-12-11 13:08:49 +00:00
b6182f7e6c
Tidy Quote class, removing comments etc
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-10 12:54:19 +00:00
0f85391587
Implement Rich Quoting/Replies
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-10 12:50:41 +00:00
24db57bfb6
Fix api prefix.
2017-12-08 18:47:00 +00:00
f2d68e4601
Merge pull request #1649 from matrix-org/rxl881/titleBar
...
Add maximize / minimize apps drawer icons.
2017-12-08 19:18:45 +01:00
0d38e7510d
Merge pull request #1600 from matrix-org/dbkr/udd_no_auto_show
...
Don't Auto-show UnknownDeviceDialog
2017-12-08 16:33:25 +00:00
a9ae4be74c
Fix page title variable name.
2017-12-08 15:27:14 +00:00
196e1a4f66
Fix one variant of a scroll jump that occurs when decrypting an m.text
2017-12-08 15:25:14 +00:00
20917e1a07
Set page title from widget data, if available.
2017-12-08 15:12:48 +00:00
72550961e5
Move 'commit_tags' to action creator
2017-12-08 10:52:20 +00:00
b20667a5a8
Merge pull request #1655 from matrix-org/rxl881/cmc
...
Remove logging.
2017-12-07 15:56:10 +00:00
df438924a7
Remove logging.
2017-12-07 09:57:53 +00:00
4603d593de
Merge pull request #1588 from pvagner/develop
...
Add some missing translatable strings
2017-12-07 09:41:39 +00:00
ed675fe791
Allow bypass of widget loading screen on hide / show.
2017-12-06 22:54:32 +00:00
2a01985076
better proptypes
2017-12-06 19:07:12 +00:00
0deed4bb88
null guard
2017-12-06 19:05:25 +00:00
65d88334a9
Fix linting
...
React DnD specifies functions with upper-case first letters
2017-12-06 16:48:18 +00:00
e20db416f2
Add field to bypass riot widget loading screen.
2017-12-06 16:44:41 +00:00
a8a650c24a
Move TagTile to separate file, and make it dragable
2017-12-06 11:25:46 +00:00
802abe7091
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
2017-12-06 11:07:01 +01:00
3206527d73
Remove logging.
2017-12-05 21:59:44 +00:00
7f86ed35a3
Only show custom title if different from app name.
2017-12-05 21:49:11 +00:00
1415a83a61
Merge branch 'rxl881/titleBar' of https://github.com/matrix-org/matrix-react-sdk into rxl881/customTitle
2017-12-05 21:42:47 +00:00
d5d5397959
Set custom widget title.
2017-12-05 21:41:44 +00:00
9fd8deb16d
Add maximize / minimize apps drawer icons.
2017-12-05 18:18:51 +00:00
9eb334a1d4
Merge pull request #1640 from matrix-org/rxl881/widgetTitle
...
Add widget -> riot postMessage API
2017-12-05 12:02:57 +00:00
aac5bcfe80
Attempt to improve TagPanel performance
...
by only recalculating rooms to show (for a given group) when a group updates.
2017-12-05 11:25:30 +00:00
49a2985515
Register message endpoints.
...
Store endpoint origins only.
2017-12-05 00:08:17 +00:00
641add4964
Fix one kind of scroll jump
...
by calling onWidgetLoad when the <img> in MImageBody loads
2017-12-01 14:18:13 +00:00
363fe04a10
isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent
2017-12-01 10:44:00 +00:00
fe81fcb8c6
Factor out isCtrlOrCmdKeyEvent, use that in TagPanel
...
as opposed to the incorrect ctrl || meta
2017-12-01 10:30:49 +00:00
5ff5ca4705
Remove logging and broken title fetching functions.
2017-11-30 14:50:30 +00:00
2cfbbb000e
Refactor messaging listerners.
2017-11-30 10:20:29 +00:00
4f5f44ff38
Add widget postmessage API stub.
2017-11-29 22:16:22 +00:00
45bcb6f2ed
Implement TagPanel (or LeftLeftPanel) for group filtering
...
This allows for filtering of the RoomList by group. When a group is selected, the room list will show:
- Rooms in the group
- Direct messages with members in the group
A button at the bottom of the TagPanel allows for creating new groups, which will appear in the panel following creation.
2017-11-29 16:53:43 +00:00
ff25c2f329
Merge pull request #1638 from matrix-org/luke/feature-bulk-device-deletion
...
Implement UI for using bulk device deletion API
2017-11-28 16:01:39 +00:00
a5acc2cfc2
Merge pull request #1637 from matrix-org/luke/replace-IRC-with-flair
...
Replace (IRC) with flair
2017-11-28 16:00:47 +00:00
736b8045aa
Remove evil auth cache
2017-11-28 15:54:00 +00:00
204bbebfca
Only calculate displayed groups if flair enabled
2017-11-28 15:49:11 +00:00
b32e4a57bc
Factor out _getDisplayeDGroups
2017-11-28 15:46:23 +00:00
b748c62880
Renames for clarification
2017-11-28 15:40:36 +00:00
1c71983610
Implement UI for using bulk device deletion API
2017-11-28 15:32:40 +00:00
3addb924b1
Replace (IRC) with flair
...
If a user has public groups that are honoured in their flair, remove the (IRC) to give the appearance that the flair replaces it.
2017-11-28 13:50:05 +00:00
7ec4010881
Make GroupStore use MatrixClientPeg
...
To avoid weirdness with using a cached matrix client
2017-11-28 11:54:05 +00:00
bbaa46f773
Merge pull request #1634 from matrix-org/luke/move-group-flair-toggle-to-user-settings
...
Move group publication toggles to UserSettings
2017-11-28 11:02:45 +00:00
d4f5e7e6d7
Deal with errors, lack of groups, loading
2017-11-28 10:46:20 +00:00
0d5f7ef246
Avoid NPE
2017-11-28 10:12:46 +00:00
3342754a72
Catch and log errors from getting group profile
2017-11-28 10:11:25 +00:00
9ed9422af8
Move group publication toggles to UserSettings
2017-11-27 17:24:42 +00:00
7826d0c61a
Merge pull request #1630 from aidalgol/redact-dialog-fix
...
Rebase ConfirmRedactDialog on QuestionDialog
2017-11-27 14:55:04 +00:00
e07c7e404e
Merge pull request #1632 from matrix-org/luke/rename-related-communities
...
Rename Related Groups to improve readability
2017-11-27 14:34:02 +00:00
3635997090
Rename Related Groups to improve readability
2017-11-27 14:13:44 +00:00
3358fdc906
Address eslint errors
...
* Remove space before curly brace.
* Remove unused import.
2017-11-26 16:04:24 +13:00
aaf8106e9e
Rebase ConfirmRedactDialog on QuestionDialog
...
Rewrite the ConfirmRedactDialog component to derive from the QuestionDialog component.
2017-11-26 15:46:24 +13:00
c002d3ff99
Merge pull request #1616 from pafcu/fix-presence-i18n
...
Make PresenceLabel more easily translatable
2017-11-22 17:17:52 +00:00
a784abd57f
Comment typo
2017-11-22 17:13:18 +00:00
d4feca5dfb
Merge pull request #1628 from pafcu/label-actionbuttons
...
Add aria-labels to ActionButtons
2017-11-21 18:46:07 +00:00
b2e80a8ee2
Merge pull request #1620 from matrix-org/rav/fix_memberpresence_avatar
...
MemberPresenceAvatar: fix null references
2017-11-21 17:42:13 +00:00
5f3fda2950
Update MemberPresenceAvatar.js
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-21 09:01:56 -07:00
7c5f74e18a
Fix GroupMemberList search for users without displayname
...
When there is a user in a group which has no displayname set
the search failed with "Cannot read property 'toLowerCase' of null"
2017-11-20 17:02:20 +01:00
e2f5e16fa7
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-20 10:00:47 +00:00
4d177626b5
init Linkify properly to make tests happy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-19 13:24:18 +00:00
d943807ad1
remove unused imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-19 13:18:06 +00:00
f0752572a7
make RoomDetailRow reusable for the Room Directory
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-19 12:49:26 +00:00
093f110199
Make the toggle button on the memberEventListSummary translatable
2017-11-18 17:48:57 +01:00
184b29daf8
Revert "Make the disabled PowerSelector element showing custom value translatable. Fixes #5547"
...
This reverts commit 681f43913a
2017-11-18 16:58:36 +01:00
28ff0a4ee7
Disable presence controls if there's no presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-17 22:25:15 -07:00
d010329f4a
Make the room-level URL preview notification explicit
...
Fixes https://github.com/vector-im/riot-web/issues/5638
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-17 22:03:06 -07:00
cdf5a6fb8a
Fix typo that prevented URL previews on a room-account level from being saved
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-17 22:02:33 -07:00
4e7fd55fb4
MemberPresenceAvatar: fix null references
...
avoid assuming that `member` has a `user`
2017-11-17 14:35:33 +00:00
8090aadb0e
Add aria-labels to ActionButtons
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-17 14:33:39 +01:00
65e1d49f37
More sensible buttons in UnknownDeviceDialog
...
Just say 'Send' (or equiv) if you actually verify all the devices,
rather than 'Send Anyway'.
2017-11-16 17:59:42 +00:00
df921438f3
Make PresenceLabel more easily translatable
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-16 18:36:54 +01:00
3c8645871f
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-16 16:47:15 +00:00
196eafdc7f
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-16 15:59:16 +00:00
02629d13d9
Merge pull request #1615 from matrix-org/luke/fix-sender-profile-opacity
...
Do something more sensible for sender profile name/aux opacity
2017-11-16 15:35:16 +00:00
7ffb542cb5
Do something more sensible for sender profile name/aux opacity
...
- If no translation is needed, don't do it.
- For now, ignore the fact that this doens't allow us easily to put
Flair into "luke sent an image" but we don't kow where the flair
should go for this anyway.
2017-11-16 15:24:36 +00:00
6f8427a5af
Revert rest of https://github.com/matrix-org/matrix-react-sdk/pull/1584
...
Because apparently the revert did not revert this part
2017-11-16 15:11:47 +00:00
b54e563cb6
Merge branch 'develop' into luke/linting-keyword-spacing
2017-11-16 13:23:42 +00:00
dad797d4a2
Run linting --fix
2017-11-16 13:19:36 +00:00
f62b04c3be
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:12:03 +00:00
f99755378a
Merge pull request #1612 from matrix-org/t3chguy/state_events
...
differentiate between state events and message events
2017-11-16 13:06:36 +00:00
a80935e181
JSX does not do comments in a way one might expect
2017-11-16 11:45:40 +00:00
d0a0a9ce7f
Fix URL preview string not being translated
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:33:23 -07:00
2c1618bc10
Fix conflict and update strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:40:51 +01:00
b0027525f3
Wire up Unknown Devices popup for outbound calls
2017-11-15 17:21:04 +00:00
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
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
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
f58e8826c0
Use the correct settings store for presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-14 19:18:04 -07:00
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
f05958e334
Merge pull request #1482 from turt2live/travis/presence
...
Implement user-controlled presence
2017-11-14 23:53:16 +00: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
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
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
2827bc0718
replace some of the status.im theme with general config options
2017-11-11 23:46:43 +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
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
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
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
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
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
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
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
e729bc431d
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-08 04:29:52 -08:00
e3e161fbea
Order users in the group member list with admins first
2017-11-08 11:51:58 +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
c1d9d3714a
Fix not being able to filter community rooms - fixes vector-im/vector-web#5538
2017-11-08 10:55:51 +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
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
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
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
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
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
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
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
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
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
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
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
36cd22663a
Open group settings when the group is created
2017-11-06 18:02:50 +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
adc4290451
Pillify room notif pills in composer
2017-11-06 15:11:42 +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
781b94c8f4
Appease the linter
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 15:37:06 -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
8587b36715
Merge branch 'develop' into matthew/status
2017-11-04 23:51:26 +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
Michael Telatynski