Richard Lewis
8016fb82d7
Fix broken commit.
2017-11-08 20:38:54 +00:00
Richard Lewis
56581ef408
Fix various loadingElement related issues.
2017-11-08 20:38:31 +00:00
Richard Lewis
b2b07d9370
Formatting
2017-11-08 20:17:28 +00:00
David Baker
7b243bf64d
Revert "UnknownDeviceDialog: get devices from SDK"
2017-11-08 18:49:50 +00:00
Richard Lewis
be0a76dbd6
Update variable name and JSdoc for improved clarity.
2017-11-08 17:44:54 +00:00
Matthew Hodgson
58ee4d0a76
rewrite the tinter to be ES6, and correctly cache fixups per theme
2017-11-08 06:55:07 -08:00
David Baker
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
Luke Barnard
e2a0cba6cb
If group member privilege level is equal, disambiguate with displayname or userId
2017-11-08 13:57:38 +00:00
Matthew Hodgson
e729bc431d
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-08 04:29:52 -08:00
Luke Barnard
e3e161fbea
Order users in the group member list with admins first
2017-11-08 11:51:58 +00:00
Luke Barnard
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
Luke Barnard
c1d9d3714a
Fix not being able to filter community rooms - fixes vector-im/vector-web#5538
2017-11-08 10:55:51 +00:00
Luke Barnard
077ca36b05
Rank rooms with shorter matching aliases first
2017-11-08 10:47:45 +00:00
Luke Barnard
b3674f503d
Do not search through room topics
2017-11-08 10:32:48 +00:00
Luke Barnard
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
Luke Barnard
10778e075e
Merge branch 'develop' into luke/groups-inviter-profile
2017-11-08 10:10:43 +00:00
Luke Barnard
4bb083d959
Style
2017-11-08 10:08:04 +00:00
Luke Barnard
f53f9ed8ca
inviterProfile = null initially
2017-11-08 10:07:43 +00:00
Luke Barnard
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
Matthew Hodgson
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
Travis Ralston
289b0c2b6a
Merge branch 'develop' into travis/granular-settings
2017-11-07 14:55:12 -07:00
Luke Barnard
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
Luke Barnard
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
Luke Barnard
edc744067f
Add checkbox to GroupAddressPicker for determining visibility of group rooms
2017-11-07 18:51:41 +00:00
Matthew Hodgson
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
David Baker
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
Travis Ralston
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
Matthew Hodgson
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
David Baker
10f15dfc56
Unmounted guard
2017-11-07 17:10:40 +00:00
Luke Barnard
80d4873542
Disable RoomDetailList in GroupView when editing
...
Otherwise the rooms can be clicked on.
2017-11-07 16:54:28 +00:00
Luke Barnard
ed709f52d1
Use the getProfileInfo API for group inviter profile
2017-11-07 16:42:43 +00:00
David Baker
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
Travis Ralston
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
Luke Barnard
646cabf324
Add missing whitespace
2017-11-07 15:15:10 +00:00
Luke Barnard
ddc1ff2f23
Name things in a sane way
2017-11-07 15:13:26 +00:00
Luke Barnard
62305a1ccd
Implement tooltip for group rooms
2017-11-07 14:07:31 +00:00
Richard Lewis
96de72ab44
Switch to using existing dep "qs" and record in package.json
2017-11-07 12:45:12 +00:00
Richard Lewis
d3784b4925
Fix URL parameter encoding.
2017-11-07 12:33:38 +00:00
Richard Lewis
eb8c15075a
Fix url params parsing.
2017-11-07 11:58:38 +00:00
Luke Barnard
7a09127687
Alter group member api
...
To match https://github.com/matrix-org/synapse/pull/2647
2017-11-07 11:27:42 +00:00
Richard Lewis
70c4100350
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering
2017-11-07 11:04:05 +00:00
Luke Barnard
9019fee49e
Adjust long desc placeholder text
2017-11-07 10:48:56 +00:00
Luke Barnard
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
David Baker
df5c6470e8
get dict syntax right
2017-11-06 22:01:23 +00:00
Luke Barnard
956c5ff343
Use a constant for easy reading of long desc placeholder
2017-11-06 18:52:55 +00:00
Luke Barnard
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
Luke Barnard
137f1311b3
Add useful placeholder for the long description textarea
2017-11-06 18:35:23 +00:00
Luke Barnard
36cd22663a
Open group settings when the group is created
2017-11-06 18:02:50 +00:00
David Baker
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
David Baker
08d006d112
PR feedback
2017-11-06 17:15:09 +00:00
Luke Barnard
d6a6e59d6c
Indicate admins in the group member list with a sheriff badge
2017-11-06 16:37:16 +00:00
David Baker
adc4290451
Pillify room notif pills in composer
2017-11-06 15:11:42 +00:00
Richard Lewis
f1db564506
Merge pull request #1533 from anoadragon453/develop
...
Remember whether widget drawer was hidden per-room
2017-11-06 14:29:25 +00:00
Travis Ralston
781b94c8f4
Appease the linter
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 15:37:06 -07:00
Travis Ralston
10519f9465
Fix the tests
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 14:56:41 -07:00
Travis Ralston
7ce4316cc8
Initial support for notification settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 21:47:18 -07:00
Travis Ralston
3958e32672
Ensure blacklistUnverifiedDevices persists reloads
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 20:13:23 -07:00
Travis Ralston
45140cab69
Don't assume false
means "use state"
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:52:42 -07:00
Travis Ralston
ef45d82ec6
Fix URL preview save calls
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:52:20 -07:00
Travis Ralston
b75be41f94
Fix split-brain for blacklistUnverifiedDevices
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:52:06 -07:00
Travis Ralston
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
Matthew Hodgson
68115f5b9c
tint when theming correctly
2017-11-05 00:40:38 +00:00
Matthew Hodgson
8587b36715
Merge branch 'develop' into matthew/status
2017-11-04 23:51:26 +00:00
Matthew Hodgson
e72e30197a
calculate new CSS tinting when we change theme
2017-11-04 23:50:57 +00:00
Matthew Hodgson
b2ddcb8027
tint the colours in the theme rather than hardcode vector green
2017-11-04 23:43:20 +00:00
Travis Ralston
c7eee36990
Fix lanugage detection
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 16:38:26 -06:00
Travis Ralston
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
Travis Ralston
358298e4ee
Support room color in settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 16:10:25 -06:00
Matthew Hodgson
3fd5937687
Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing
...
Fixes React warning
2017-11-04 15:41:57 +00:00
Travis Ralston
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
Travis Ralston
893c39bfbe
Merge branch 'develop' into travis/granular-settings
2017-11-03 22:00:07 -06:00
Travis Ralston
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
Travis Ralston
a2b7f6d30e
Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice
2017-11-03 19:57:39 -06:00
Travis Ralston
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
Travis Ralston
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
Luke Barnard
58f1757f0c
Handle rooms with no aliases or canonical alias
2017-11-03 17:52:36 +00:00
Luke Barnard
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
Luke Barnard
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
Luke Barnard
b88c13d527
Use prefixed class names to avoid collisions with other libraries
2017-11-03 16:02:41 +00:00
Luke Barnard
e84e4ed5f5
Add CSS classes to group ID input in CreateGroupDialog
2017-11-03 15:38:12 +00:00
Matthew Hodgson
6747390333
merge
2017-11-03 15:12:24 +00:00
David Baker
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
David Baker
2c9a93a8ac
Merge pull request #1572 from matrix-org/dbkr/fix_multiple_pills
...
Fix multiple pills on one line
2017-11-03 14:24:33 +00:00
David Baker
802ab16746
Fix multiple pills on one line
2017-11-03 14:06:59 +00:00
Luke Barnard
d0b3368445
Merge pull request #1570 from matrix-org/luke/fix-groups-invites-appearance
...
Fix group invites such that they look similar to room invites
2017-11-03 13:53:58 +00:00
Michael Telatynski
b2cd65e182
Fixes React warning
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-03 12:30:58 +00:00
Luke Barnard
151f9917b1
Fix group invites such that they look similar to room invites
...
- Change GroupInviteTile to use RoomTile CSS
- Give group invites their own sub list, with heading "Community Invites"
2017-11-03 12:19:37 +00:00
Luke Barnard
71c59eff2c
Add a GeminiScrollbar to Your Communities
2017-11-03 11:19:29 +00:00
Richard Lewis
853ada027d
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering
2017-11-02 18:34:46 +00:00
Richard Lewis
0e854ee356
Fix loading and initialisation spinners.
2017-11-02 18:33:11 +00:00
David Baker
843d797ded
Better type checking
2017-11-02 18:17:57 +00:00
David Baker
7f9967389d
Pass room into Autocompleter
2017-11-02 18:15:26 +00:00
David Baker
498b117d5a
copyrights
2017-11-02 18:01:28 +00:00
David Baker
4953d4de4d
Give autocomplete providers the room they're in
...
Removes the gut-wrenching that RoomView does to jam the user list
into the user autocomplete provider.
2017-11-02 17:51:08 +00:00
Richard Lewis
a52bb9d603
Pass URL to check.
2017-11-02 17:27:59 +00:00
David Baker
7c17ad8509
Merge pull request #1566 from matrix-org/luke/groups-room-publicity
...
Add toggle to alter visibility of a room-group association
2017-11-02 15:38:03 +00:00
Luke Barnard
982e87e01c
Communities are communities, wrap div for label alignment
2017-11-02 15:04:40 +00:00
David Baker
8895ab7e5b
Merge pull request #1564 from matrix-org/dbkr/pillify_at_room
...
Pillify room notifs in the timeline
2017-11-02 14:22:58 +00:00
Luke Barnard
bf77b51b5e
Merge branch 'develop' into luke/groups-room-publicity
2017-11-02 13:39:33 +00:00
Luke Barnard
790db94fd7
Add toggle to alter the visibility of a room-group association
2017-11-02 13:31:11 +00:00
Luke Barnard
e909d859ab
Merge branch 'develop' into luke/groups-room-info
2017-11-02 10:56:33 +00:00
David Baker
4f8d6d8fbe
Pillify room notifs in the timeline
...
This scans text nodes in the DOM for room notifications and turns
them into pills. Changes the pillification code around a bit so it
works with text nodes. Uses the push processor directly to test
the event against the room notifiation rule so we know whether
this event would actually trigger a room notification (needs to
hook into push at a lower level because otherwise our own room
notifications would not pillify since our own events never
generate notifications).
Requires https://github.com/matrix-org/matrix-js-sdk/pull/565
2017-11-01 19:42:47 +00:00
Luke Barnard
64a369216a
Implement simple GroupRoomInfo
...
which replaces the "X" on the GroupRoomTile with "Remove from community" under Admin Tools.
2017-11-01 17:27:35 +00:00
Luke Barnard
0dcd52d88f
Fix some react warnings firing
2017-11-01 17:12:22 +00:00
Matthew Hodgson
64d8c81897
Merge branch 'develop' into matthew/status
2017-11-01 15:24:30 +00:00
Stefan Parviainen
e1e4fc2dac
Make eslint happy
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 16:18:48 +01:00
Stefan Parviainen
d6f1e12bee
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 15:50:45 +01:00
David Baker
273aae207a
Merge pull request #1560 from matrix-org/luke/groups-expose-ready-state
...
Display whether the group summary/room list is loading
2017-10-31 17:29:36 +00:00
Richard Lewis
17c0405862
Restructure to pass props from componentWillRecieveProps.
2017-10-31 16:31:46 +00:00
Luke Barnard
16dca08b77
Use constants instead of string literals
2017-10-31 16:13:13 +00:00
Luke Barnard
5bfed67463
Merge branch 'luke/groups-expose-ready-state' of github.com:matrix-org/matrix-react-sdk into luke/groups-expose-ready-state
2017-10-31 14:25:10 +00:00
Luke Barnard
d6cbc44e0f
If groupRoomsLoading, replace RoomDetailList entirely with Spinner
2017-10-31 14:21:00 +00:00
David Baker
f24c64f071
Merge pull request #1558 from matrix-org/luke/fix-client-side-validation-group-id
...
Change client-side validation of group IDs to match synapse
2017-10-31 13:27:38 +00:00
Luke Barnard
45e15fd865
Merge branch 'develop' into luke/groups-expose-ready-state
2017-10-31 11:50:12 +00:00
Luke Barnard
302bd6c3e9
Escape dash in regex
2017-10-31 11:48:56 +00:00
Luke Barnard
775468e71a
Display whether the group summary/room list is loading
...
This uses a `ready` flag assigned to each fetching API used by the GroupServer. I've avoided making this generic for now for want of not doing so early.
2017-10-31 11:42:09 +00:00
Luke Barnard
20bf69c3c2
Prevent non-members from opening group settings
2017-10-31 10:54:44 +00:00
Richard Lewis
758df29b23
Fix onLoad on wrong element.
2017-10-31 10:43:17 +00:00
Richard Lewis
35b33263ea
Use querystring lib
2017-10-31 10:37:40 +00:00
Luke Barnard
53938f7998
Change client-side validation of group IDs to match synapse
2017-10-31 10:25:06 +00:00
Richard Lewis
1cb878bb57
Formatting
2017-10-31 10:04:37 +00:00
Richard Lewis
648b295971
Removed comment
2017-10-31 10:04:02 +00:00
Travis Ralston
6f8523081b
Some documentation
...
Far from complete, and probably needs a bit of work, but it's a start.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-30 21:09:24 -06:00
Travis Ralston
f070604350
Rename SettingsCheckbox to be a bit more generic
...
Splitting out the logic to two components doesn't make sense, but this isn't always a checkbox.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-30 20:08:27 -06:00
Travis Ralston
9c846e4dd9
Fix URL preview options
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-30 19:49:44 -06:00
Luke Barnard
4e234cfc3b
Alter UI for disinviting a group member
...
The same API as kicking is used for disinviting, so only cosmetic changes needed here.
2017-10-30 18:17:35 +00:00
Luke Barnard
19b798be10
Merge pull request #1555 from matrix-org/luke/groups-fix-admin-tools
...
Only show admin tools to privileged users
2017-10-30 18:03:24 +00:00
Luke Barnard
3e64333ada
Only show admin tools to privileged users
2017-10-30 16:45:45 +00:00
David Baker
57d516f042
Don't refresh page on password change prompt
...
It's on the form submit but missing a preventDefault
2017-10-30 16:28:27 +00:00
Luke Barnard
14d600a69f
Fix initial in GroupAvatar in GroupView
2017-10-30 15:04:12 +00:00
Travis Ralston
72517f95bb
Don't explode if the SdkConfig isn't available
...
This can happen prior to logging in, for some reason.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 22:53:59 -06:00
Travis Ralston
99ee58d13a
Don't break the room settings page
...
A later commit will make the URL preview settings behave like the rest of the settings page.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 22:18:03 -06:00
Travis Ralston
c056f4faa6
Make URL preview checkboxes pretty again
...
Works for all other settings too!
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 22:17:15 -06:00
Travis Ralston
b139c8d01c
Generate unique IDs for SettingsCheckbox
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 22:16:46 -06:00
Travis Ralston
786bd87fec
Support URL previews (with bugs)
...
Known issues at this point:
* The room-level setting accepts the current user's default, which is wrong
* The checkboxes on RoomSettings are not independent
* The checkboxes in RoomSettings need some layout fixes
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 21:48:29 -06:00
Travis Ralston
b5d5c81f32
Add a new component to back various settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 20:43:27 -06:00
Travis Ralston
0d3f0eaf98
Convert local settings to granular settings
...
This breaks language selection.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 16:53:00 -06:00
Travis Ralston
e8acb0e102
Use getValueAt()
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 16:02:51 -06:00
Travis Ralston
ae10a11ac4
Convert synced settings to granular settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 01:43:52 -06:00
Travis Ralston
bf815f4be9
Support labs features
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-28 20:21:50 -06:00
Matthew Hodgson
672fbb2873
hopefully fix NPE on toLowerCase
2017-10-28 18:33:38 +01:00
David Baker
858c3a2548
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-10-27 18:59:57 +01:00
David Baker
580d8dce19
Merge pull request #1549 from matrix-org/luke/groups-fix-mygroups-avatar-scale-method
...
Use "crop" method to scale group avatars in MyGroups
2017-10-27 18:40:19 +01:00
Luke Barnard
5209f29a5c
Use "crop" method to scale group avatars in MyGroups
2017-10-27 18:27:54 +01:00
Stefan Parviainen
95b2392104
Merge branch 'develop' into departify
2017-10-27 19:23:13 +02:00
David Baker
4eb8fe3e6a
Lowercase all usernames
...
As synapse doesn't accept usernames with capitals in them now
Fixes https://github.com/vector-im/riot-web/issues/5445
2017-10-27 17:49:44 +01:00
Richard Lewis
3756ce606d
Check URL prop updates and ensure that widgets are refreshed.
2017-10-27 17:49:14 +01:00
Matthew Hodgson
5d0629ff73
resolve matrix.status.im v. matrix.org confusion
2017-10-27 14:23:16 +01:00
Richard Lewis
7662b5ac8f
Unfinished, non-working changes to try and handle URL changes gracefully
2017-10-27 13:47:51 +01:00
Luke Barnard
e094c32c62
Simplify GroupStore listener registration
2017-10-27 11:38:10 +01:00