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
Matthew Hodgson
e3f896c5e0
don't forget login prompt class
2017-10-27 01:35:21 +01:00
Matthew Hodgson
1bf3ef6de4
fix password reset
2017-10-27 01:23:50 +01:00
Matthew Hodgson
0952befdea
target blank for tg
2017-10-27 01:09:37 +01:00
Matthew Hodgson
015aed0597
hide optionality of email for status
2017-10-27 01:03:04 +01:00
Andrew (anoa)
b4868a6846
showWidget->hideWidgetDrawer and remove logs
...
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-26 11:27:58 -07:00
Michael Telatynski
1d5b4a9d50
Merge branch 'develop' into t3chguy/mention_user
2017-10-26 18:10:10 +01:00
Matthew Hodgson
655d0c615a
remove spurious Sign In button and legacy Return to App buttons
2017-10-26 17:57:49 +01:00
Matthew Hodgson
14d9743e30
unbreak reg
2017-10-26 17:22:32 +01:00
David Baker
c8a489ca77
Merge pull request #1541 from matrix-org/luke/groups-only-show-settings-icon-to-members
...
Only show group settings cog to members
2017-10-26 14:52:16 +01:00
Luke Barnard
9643784f85
Only show group settings cog to members
...
Non-members have no settings to change.
2017-10-26 14:31:27 +01:00
Luke Barnard
eec6ed36cd
Use correct icon for group room deletion and make themeable
...
Also fix cancel icons to have class mx_filterFlipColor
2017-10-26 14:05:58 +01:00
David Baker
5871a74228
Merge pull request #1534 from matrix-org/t3chguy/invite_in_memberinfo
...
Add invite button to MemberInfo if user has left or wasn't in room
2017-10-26 11:35:45 +01:00
Luke Barnard
591a7f4b86
Default to false
2017-10-26 10:06:04 +01:00
Luke Barnard
97b9cf6402
Actually use the synced setting
2017-10-26 09:58:46 +01:00
David Baker
e6c3483c8b
Add correct telegram link
2017-10-26 09:58:05 +01:00
Matthew Hodgson
5c32b5b11a
fix i18n
2017-10-26 02:10:03 +01:00
Matthew Hodgson
deb0f902e3
linting
2017-10-26 01:59:18 +01:00
Matthew Hodgson
1237de3ef0
Merge branch 'develop' into matthew/status
2017-10-26 01:47:22 +01:00
Matthew Hodgson
5a9dae5ff1
use generic 'text button' for delete buttons in UserSettings
2017-10-26 01:44:05 +01:00
Matthew Hodgson
ac7a94afb2
apply theme tint at launch
2017-10-26 01:43:42 +01:00
Travis Ralston
e773585a02
Merge remote-tracking branch 'matrix-org/develop' into travis/presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:21:39 -06:00
Luke Barnard
3ae97348f8
Add option to mirror local video feed
2017-10-25 18:17:33 +01:00
Luke Barnard
4cfbd66729
Merge pull request #1538 from matrix-org/luke/fix-redaction-sender-tooltip
...
Use the correct userId when displaying who redacted a message
2017-10-25 17:47:22 +01:00
Luke Barnard
cedc0b27a9
Handle redaction with no sender
2017-10-25 17:37:20 +01:00
Luke Barnard
5990e41bd7
Use the correct userId when displaying who redacted a message
2017-10-25 17:24:45 +01:00
Stefan Parviainen
53e983f9c7
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-25 18:19:27 +02:00
Michael Telatynski
fd7e057ec0
Merge branch 'develop' into t3chguy/invite_in_memberinfo
2017-10-25 16:33:50 +01:00
David Baker
8ed3474b64
Merge pull request #1529 from matrix-org/luke/fix-can-edit-editable-item-lists
...
Only show editing UI for aliases/related_groups for users /w power
2017-10-25 15:52:51 +01:00
Luke Barnard
39fa866d68
Merge pull request #1535 from matrix-org/luke/fix-interactable-greyed-ui
...
Swap from `ui_opacity` to `panel_disabled`
2017-10-25 15:47:18 +01:00
Luke Barnard
b1f2a6c1e9
Dramatically simplify use of mx_fadable
...
by applying it to parent elements of things that need to be faded.
2017-10-25 15:15:49 +01:00
David Baker
19364c25ee
Merge pull request #1536 from matrix-org/luke/fix-room-address-picker-default-name
...
Fix room address picker tiles default name
2017-10-25 14:25:51 +01:00
Luke Barnard
fbe0cc4927
Merge pull request #1531 from matrix-org/t3chguy/hide_level_change_on_50
...
T3chguy/hide level change on 50
2017-10-25 14:09:59 +01:00
Luke Barnard
813d0cd64c
Merge pull request #1537 from matrix-org/t3chguy/missing_date_sep
...
fix missing date sep caused by hidden event at start of day
2017-10-25 14:07:28 +01:00
Michael Telatynski
f3c8951d4e
remove unused lastPresenceTs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-25 12:56:23 +01:00
Michael Telatynski
1bbc26a27f
fix missing date sep caused by hidden event at start of day
...
if first event in day was hidden, the date sep would go missing as the next event would compare its date to the hidden one instead of the one before it
due to naive N-1 check rather than a previous valid event comparison, now fixed by comparing date against the first event in MELS instead.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-25 12:52:51 +01:00
Luke Barnard
27f845a7aa
Match on any alias
2017-10-25 12:42:58 +01:00
Luke Barnard
7029ab07fc
If no canonical alias, use first alias (and fallback to Unnamed)
2017-10-25 12:38:39 +01:00
Luke Barnard
37b55984ec
Fix group Leave button tooltip
2017-10-25 12:09:13 +01:00
Luke Barnard
2f8f2ce76e
Swap from ui_opacity
to panel_disabled
...
to simplify the process of disabling panels in the UI.
2017-10-25 11:23:51 +01:00
Richard Lewis
fd85c74bc5
Merge pull request #1520 from matrix-org/rxl881/deleteWidget
...
Add a delete confirmation dialog for widgets
2017-10-25 10:45:52 +01:00
Richard Lewis
2e3bdfd55d
Fix string indentation.
2017-10-25 10:45:17 +01:00
Matthew Hodgson
6beb604cd0
fascist linting >:(
2017-10-25 02:31:30 +01:00
Matthew Hodgson
ae40ef4460
fix error layouts
2017-10-25 02:18:14 +01:00
Matthew Hodgson
eb4b7c78a0
skin register screen
2017-10-25 02:04:02 +01:00
Matthew Hodgson
67cc02df3b
hide header when error is up
2017-10-25 01:37:06 +01:00
Matthew Hodgson
adbea44d70
hide login options for status
2017-10-25 01:30:09 +01:00
Michael Telatynski
b3463146ba
Add invite button to MemberInfo if user has left or wasn't in room
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-25 01:00:13 +01:00
Andrew (anoa)
9821f0d459
Fix linting
...
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-24 16:42:06 -07:00
Andrew (anoa)
f032284eff
Remember whether widget drawer was hidden per-room
...
Fixes #4850
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-24 16:28:10 -07:00
Matthew Hodgson
26e8b2c1b3
switch to a LoginPage wrapper component
...
as it's much nicer in the CSS to wrap the LoginBox as needed rather than have separate header & footer divs floating above and below it which need to be correctly vertically centered
2017-10-24 23:37:26 +01:00
Michael Telatynski
5514d81683
Add Mention button to MemberInfo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 23:01:40 +01:00
Michael Telatynski
c896dfb17b
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 22:21:33 +01:00
Michael Telatynski
f813a752e7
only show change power level option in MemberInfo if we can actually
...
send m.room.power_level AND are lower PL than them
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 22:12:48 +01:00
Stefan Parviainen
88fd60066f
Fix typo
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-24 20:07:57 +02:00
Stefan Parviainen
b5024cca75
Further simplify MemberEventListSummary a bit
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-24 19:34:08 +02:00
Luke Barnard
e9ce7f97f5
canSetRelatedRooms -> canSetRelatedGroups
2017-10-24 17:57:26 +01:00
Stefan Parviainen
4ff369c884
Merge branch 'develop' into departify
2017-10-24 18:27:24 +02:00
Luke Barnard
640d88f25d
Typo
2017-10-24 16:21:18 +01:00
Luke Barnard
ee7ebc425c
Only show editing UI for aliases/related_groups for users /w power
2017-10-24 16:19:09 +01:00
Luke Barnard
459ffc47d6
Prevent editing of UI requiring user privilege if user unprivileged
2017-10-24 15:25:35 +01:00
David Baker
ba46faf1b1
Merge pull request #1522 from matrix-org/luke/fix-group-react-warnings
...
Fix some react warnings in GroupMemberList
2017-10-24 11:18:03 +01:00
Luke Barnard
d1db0d6426
Deduplicate members, key by userId
2017-10-24 10:50:31 +01:00
Luke Barnard
e419446081
Add fields needed by RoomDetailList to groupRoomFromApiObject
...
and also alter props API for RDL to match the returned rooms.
(This doesn't affect RoomDirectory - this does not use RDL (yet))
2017-10-24 10:13:38 +01:00
Luke Barnard
1cc427ba46
Fix some react warnings in GroupMemberList
...
- If the list contains two users twice, react would warn about duplicate keys. Use `index` instead.
- Check if unmounted before setting state after fetching members.
2017-10-24 09:58:45 +01:00
Richard Lewis
11d4a63a32
Update text and split across multiple lines.
2017-10-23 23:59:36 +01:00
Richard Lewis
8b7f737c97
Remove logging.
...
Return early.
2017-10-23 23:47:37 +01:00
Richard Lewis
54bd916862
Split string across multiple lines.
2017-10-23 20:08:52 +01:00
Stefan Parviainen
115772d526
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-23 19:57:52 +02:00
Stefan Parviainen
ef30ba889b
Make MemberEventListSummary more translatable
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-23 19:55:40 +02:00
Richard Lewis
3c4c986aca
Update button text
2017-10-23 18:42:43 +01:00
Luke Barnard
2f418976aa
Only show flair for groups with avatars set
...
Fix vector-im/riot-web#5377
2017-10-23 17:06:47 +01:00
Richard Lewis
ee60155846
Add delete widget confirmation dialog.
2017-10-23 17:05:44 +01:00
Luke Barnard
0799e5cde4
Refresh group member lists after inviting users
2017-10-23 16:04:26 +01:00
Luke Barnard
03f4e6c622
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-10-23 14:57:50 +01:00
Luke Barnard
a133fd1cf4
Fix "failed to create community" message
2017-10-23 14:57:40 +01:00
Matthew Hodgson
440b8e0e31
16px for flair please
2017-10-23 14:56:24 +01:00
Luke Barnard
e89371fb1c
Add click-to-open-settings functionality to GroupAvatar
2017-10-23 14:54:57 +01:00
Matthew Hodgson
f09fbccc19
WIP
2017-10-23 00:56:15 +01:00
Matthew Hodgson
37fd19290f
concept of default theme
2017-10-20 18:42:29 +01:00
Luke Barnard
1a7710c192
Adjust wording on placeholder
2017-10-20 18:10:14 +01:00
Luke Barnard
a0e218d107
Add placeholder to MyGroups page, adjust CSS classes
...
- This is part of a general improvement in the look of MyGroups
- Wording on "Create a community to..." modified to not have the word "community" twice
2017-10-20 17:38:02 +01:00
Luke Barnard
a85a011db9
Fix faulty translation in GroupView
2017-10-19 18:06:32 +01:00
Luke Barnard
d4aac4a69c
Merge pull request #1507 from matrix-org/dbkr/groupid_only_enter_localpart
...
Group create dialog: only enter localpart
2017-10-19 17:37:56 +01:00
Luke Barnard
877f213057
Merge pull request #1509 from matrix-org/luke/groups-my-groups
...
Improve MyGroups UI
2017-10-19 17:35:48 +01:00
David Baker
cbb36f4780
Lint
2017-10-19 17:31:06 +01:00
Luke Barnard
b0f8619754
Improve MyGroups UI
...
as per design layed out by @tur2live!
2017-10-19 17:24:45 +01:00
David Baker
b9574ff382
Group create dialog: only enter localpart
...
Since we currently can only create groups on the local server anyway,
there's no point making the user jump through the hoop of forming the
whole group ID and telling them off if they got the server name wrong.
2017-10-19 16:47:43 +01:00
David Baker
19173ab4d6
Space, man.
2017-10-19 16:31:45 +01:00
David Baker
4abaa93cf0
Add clientside error for non-alphanumeric group ID
2017-10-19 16:28:02 +01:00
Luke Barnard
ea1dbe1f76
Fix invites to groups without names
2017-10-19 15:47:52 +01:00
Luke Barnard
2be0ebdd1d
More Groups->Communities
2017-10-19 15:01:16 +01:00
Luke Barnard
fd65cb1396
Merge pull request #1501 from matrix-org/luke/groups-are-communities
...
Groups -> Communities
2017-10-19 12:16:15 +01:00
Luke Barnard
bafa2c6be0
Fix typo
2017-10-19 12:03:59 +01:00
Luke Barnard
c3f143acc3
Merge branch 'develop' into luke/groups-are-communities
2017-10-19 11:31:00 +01:00
Luke Barnard
71443e9b94
Remove logs comments
2017-10-19 10:34:24 +01:00
Luke Barnard
5f3c06b38a
Factor out Flair cache into FlairStore
...
This will make invalidating the userGroups cache for the user architecturally more sound (the plan is to have GroupStore hit FlairStore as opposed to Flair itself in order to invalidate the cache).
2017-10-19 10:28:59 +01:00
Matthew Hodgson
7fe8c9cb01
fix lint
2017-10-19 01:48:49 +02:00
Matthew Hodgson
1087b36597
fix editing visuals on groupview header
2017-10-18 17:49:49 +01:00
Luke Barnard
a40704f085
Merge branch 'develop' into luke/groups-are-communities
2017-10-18 15:57:37 +01:00
Luke Barnard
677c8e95ee
Merge branch 'develop' into luke/groups-move-buttons
2017-10-18 10:31:54 +02:00
Stefan Parviainen
7eeed3e093
Simplify MemberEventListSummary by using pluralization provided by the i18n library
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-17 23:46:23 +02:00
Stefan Parviainen
fc860c66bc
De-partify RoomPreviewBar
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-17 22:03:49 +02:00
Stefan Parviainen
468a05c6f1
Fix SenderProfile
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-17 21:32:35 +02:00
David Baker
62a79d823d
Merge pull request #1491 from matrix-org/luke/groups-fix-optional-profile-properties
...
Fix bug preventing partial group profile
2017-10-17 19:30:50 +01:00
Luke Barnard
df9e037bfc
Default values when GETing instead of when POSTing
2017-10-17 18:11:00 +01:00
Luke Barnard
1b8c5b50db
Don't show room IDs when picking rooms
2017-10-17 18:02:35 +01:00
Luke Barnard
3bbff627fc
Fix bug preventing partial group profile
...
When updating the group profile, send empty strings instead of `null` as synapse does not expect `null`.
2017-10-17 17:26:34 +01:00
Luke Barnard
49b7525a67
Actually move the buttons in GroupView
...
- The "Leave" button is now in the top-right
- The "Publish" button is not a checkbox
2017-10-17 16:10:34 +01:00
Luke Barnard
0415869b8c
Add useful functions to GroupView to inspect user flags
2017-10-17 16:08:19 +01:00
Luke Barnard
626f007f4e
Move membership section above long description textarea
2017-10-17 12:00:31 +01:00
Luke Barnard
7df3335570
Only show membership settings when editing
2017-10-17 11:59:52 +01:00
Luke Barnard
495465e865
Put invite accept/decline buttons in correct div to align them to the right
2017-10-17 11:59:16 +01:00
Luke Barnard
85d99d429d
Use correct logic operator
2017-10-17 09:49:39 +01:00
Stefan Parviainen
8083dccfa5
De-partify SenderProfile
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
Also, text does not need to be EmojiText
2017-10-16 20:53:43 +02:00
Luke Barnard
14eee9a37a
Only show invited section if there are invited group members
2017-10-16 17:59:53 +01:00
Luke Barnard
0c34e943fb
Merge branch 'develop' into luke/groups-are-communities
2017-10-16 17:34:06 +01:00
Luke Barnard
760b3cc60a
Merge pull request #1488 from matrix-org/luke/groups-invited-users
...
Show "Invited" section in the user list
2017-10-16 18:29:15 +02:00
Luke Barnard
9b08f4d11f
Separate fetching indicator state
2017-10-16 17:21:05 +01:00
Luke Barnard
008e8d4f54
Show "Invited" section in the user list
2017-10-16 16:38:32 +01:00
Luke Barnard
47ac0988ba
Refactor class names for an entity tile being hovered over
2017-10-16 16:31:13 +01:00
Luke Barnard
eaa5dd5f22
Groups -> Communities in the UI
...
Translation files still need updating, and this would be much simpler with a script that could automate the tedium
2017-10-16 13:18:39 +01:00
David Baker
e4a3309752
Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque
...
Modify GroupView UI
2017-10-16 10:17:44 +01:00
Travis Ralston
4f6cd6b23a
Add a small indicator for when a new event is pinned
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-15 21:17:43 -06:00
Stefan Parviainen
ad2f54f8ab
Fix italics and parens
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-15 18:01:57 +02:00
Stefan Parviainen
15d1dc1f3b
Fix indentation
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-15 16:57:22 +02:00
Stefan Parviainen
9a5cffb5eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into departify
2017-10-15 16:49:27 +02:00
Travis Ralston
7307bc412f
Respond to updates from presence context menu
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 23:16:12 -06:00
Travis Ralston
c483717282
Make onClick be a context menu for presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 21:44:07 -06:00
Travis Ralston
03800b7476
Support more positioning options on context menus
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 21:43:47 -06:00
Travis Ralston
788e16a716
Linting
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 20:23:50 -06:00
Travis Ralston
0b20681f6a
Put presence management behind a labs setting
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 19:13:46 -06:00
Travis Ralston
854394cb2e
Merge branch 'develop' into travis/presence
2017-10-14 18:49:58 -06:00
Matthew Hodgson
1d75d9e90d
yet more horrifically strict linting :/
2017-10-15 01:47:11 +01:00
Matthew Hodgson
635996c083
more bizarrely strict linting :/
2017-10-15 01:19:06 +01:00
Matthew Hodgson
247e32115f
bizarrely strict linting :/
2017-10-15 01:13:52 +01:00
Matthew Hodgson
2b367edccf
Merge pull request #1439 from turt2live/travis/pinned_messages
...
Message/event pinning
2017-10-15 01:03:18 +01:00
Travis Ralston
49c19bc9b4
Merge branch 'develop' into travis/presence
2017-10-14 17:26:54 -06:00
Matthew Hodgson
e57d9e686b
Merge branch 'develop' into t3chguy/jump_to_rr
2017-10-14 23:45:17 +01:00
Matthew Hodgson
f32ba0b54c
Merge pull request #1462 from pafcu/translation-fixes
...
Use standard subsitution syntax in _tJsx
2017-10-14 23:43:12 +01:00
Matthew Hodgson
71d25bf787
Merge pull request #1442 from turt2live/travis/no_grey
...
Don't suggest grey as a color scheme for a room
2017-10-14 23:41:32 +01:00
Travis Ralston
8a641c7173
Hide message pinning behind a labs setting
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:40:10 -06:00
Travis Ralston
c34b55c6c7
Merge branch 'develop' into travis/pinned_messages
2017-10-14 16:10:32 -06:00
Matthew Hodgson
9f64261707
Merge branch 'develop' into travis/alone_warning
2017-10-14 22:43:36 +01:00
Matthew Hodgson
3efa0d2a76
Merge pull request #1478 from turt2live/travis/unset-avatar
...
Buttons to remove room/self avatar
2017-10-14 22:13:32 +01:00
Matthew Hodgson
8d6f0db3e2
be explicit in remove button height
2017-10-14 22:13:00 +01:00
Matthew Hodgson
0284a582a1
Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist
...
T3chguy/fix memberlist
2017-10-14 22:09:55 +01:00
Travis Ralston
6cd07731c4
Add MemberPresenceAvatar and control presence ourselves
...
Includes rudimentary support for custom statuses and user-controlled status. Some minor tweaks have also been made to better control how we advertise our presence.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 14:37:47 -06:00
Michael Telatynski
c7c28c7ad2
make linter happy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 19:53:08 +01:00
Michael Telatynski
c1edc0c32e
add option to disable BigEmoji
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 19:40:45 +01:00
Michael Telatynski
b0b7472901
undo bad merge
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:14:57 +01:00
Michael Telatynski
e79f9ef011
=== > ==
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:10:51 +01:00
Michael Telatynski
6ad8532bed
lowerCase query so that searching for Erik
will actually find Erik
..
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:09:58 +01:00
Michael Telatynski
a000439948
pass search query to filter fn in _updateList
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:09:30 +01:00
Travis Ralston
6e7f0d649b
Add option to unset your own avatar
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 21:13:47 -06:00
Travis Ralston
e5c8e3e7ad
Add option to unset room avatar
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 20:57:15 -06:00
Stefan Parviainen
a84b42bf24
Departify RoomSettings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-13 21:10:50 +02:00
Stefan Parviainen
3b91ada4c8
Departify sending emails and text messages
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-13 20:44:01 +02:00
Luke Barnard
6f20445a42
Explain topic click stopPropagation
2017-10-13 17:57:28 +01:00
Luke Barnard
3468abc975
Use GeminiScrollbar instead of ScrollPanel
2017-10-13 17:49:52 +01:00
Luke Barnard
aaf32ac9a0
Lint
2017-10-13 16:57:52 +01:00
Luke Barnard
77418f535e
Modify GroupView UI
...
- Remove featured users/rooms
- Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode.
- Make the group view body scrollable
2017-10-13 16:46:33 +01:00
Stefan Parviainen
45137f030b
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-12 22:18:50 +02:00
Stefan Parviainen
9495ccdbb5
Don't hardcode ConfirmUserActionDialog title
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-12 22:15:53 +02:00
Stefan Parviainen
1f44233e05
Better translations in RoomList.js
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-12 21:24:45 +02:00
David Baker
047daec587
Merge pull request #1468 from matrix-org/dbkr/labs_config
...
enable/disable features in config.json
2017-10-12 18:38:18 +01:00
David Baker
e50478aa1d
enable/disable features in config.json
...
As per https://docs.google.com/document/d/1Kn-mz2dDce9Cqc4oUTl5yJXGvmTlky1_KezuwUg58x0/edit#
Replaces:
* enableLabs setting
* 'override' flag in labs
* 'default' flag in labs
Un-feature-flags matrix apps since this was now overidden to be
enabled.
2017-10-12 17:03:38 +01:00
Luke Barnard
b73e28add3
Merge pull request #1463 from turt2live/travis/peek_rr
...
Don't send RR or RM when peeking at a room
2017-10-12 17:29:26 +02:00
Travis Ralston
df7f1b46bf
Stop peeking if anything went wrong, not just explicit failure
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-12 07:24:20 -06:00
Travis Ralston
f1032bb115
Set isPeeking to false if peeking failed
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-12 07:05:09 -06:00
Luke Barnard
36bb8b7dc4
Fix bug that inserted emoji when typing
...
This was quite simple in the end -- the mouse doens't move, but on some browsers, the autocomplete appearing beneath the mouse would cause the `onMouseOver`, which is not `onMouseMove`.
The fix was to use `onMouseMove`.
Fixes vector-im/riot-web#4974
2017-10-12 11:31:31 +01:00
Travis Ralston
f3b1baa3c0
Suggest to invite people when speaking in an empty room
...
Adds vector-im/riot-web#1053
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 21:15:00 -06:00
Travis Ralston
6ce7eb952a
Don't send RR or RM when peeking at a room
...
Fixes vector-im/riot-web#696
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 18:43:24 -06:00
Stefan Parviainen
f694fb24ff
Fix merge-conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 20:02:14 +02:00
Luke Barnard
e0e5d51451
Merge pull request #1460 from matrix-org/dbkr/show_send_message_error
...
Show failures when sending messages
2017-10-11 19:46:32 +02:00
Luke Barnard
d3f9a3aeb5
Run eslint --fix
...
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
2017-10-11 17:56:17 +01:00
David Baker
5626c06b3c
Show failures when sending messages
...
This is useful for the spam checking where otherwise you don't
really know why your message has failed to send
2017-10-11 17:42:54 +01:00
Luke Barnard
8958be9321
Merge pull request #1441 from turt2live/travis/who_banned
...
Show who banned the user on hover
2017-10-11 17:33:53 +02:00