f8fc6dc83e
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-15 12:11:33 +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
e91e94fd42
fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601
2017-11-15 09:56:44 +00: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
f05958e334
Merge pull request #1482 from turt2live/travis/presence
...
Implement user-controlled presence
2017-11-14 23:53:16 +00:00
df6d5cc2b4
Pass plain components, rather than functions returning them
2017-11-14 20:09:52 +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
8c218557df
fix disable_custom_urls
2017-11-14 15:17:50 +00:00
55260becc9
Revert "Lowercase all usernames"
2017-11-14 14:13:22 +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
63bebe9dfd
Split out avatar and display name hiding
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 12:58:10 -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
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
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
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
030633fa90
Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings
2017-11-08 17:43:38 -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
58ee4d0a76
rewrite the tinter to be ES6, and correctly cache fixups per theme
2017-11-08 06:55:07 -08:00
e729bc431d
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-08 04:29:52 -08: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
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
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
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
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
9019fee49e
Adjust long desc placeholder text
2017-11-07 10:48:56 +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
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
10519f9465
Fix the tests
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 14:56:41 -07:00
7ce4316cc8
Initial support for notification settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 21:47:18 -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
68115f5b9c
tint when theming correctly
2017-11-05 00:40:38 +00:00
e72e30197a
calculate new CSS tinting when we change theme
2017-11-04 23:50:57 +00:00
358298e4ee
Support room color in settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 16:10:25 -06: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
6747390333
merge
2017-11-03 15:12:24 +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
71c59eff2c
Add a GeminiScrollbar to Your Communities
2017-11-03 11:19:29 +00:00
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
64d8c81897
Merge branch 'develop' into matthew/status
2017-11-01 15:24:30 +00:00
d6f1e12bee
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 15:50:45 +01:00
16dca08b77
Use constants instead of string literals
2017-10-31 16:13:13 +00:00
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
d6cbc44e0f
If groupRoomsLoading, replace RoomDetailList entirely with Spinner
2017-10-31 14:21:00 +00:00
45e15fd865
Merge branch 'develop' into luke/groups-expose-ready-state
2017-10-31 11:50:12 +00:00
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
20bf69c3c2
Prevent non-members from opening group settings
2017-10-31 10:54:44 +00:00
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
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
14d600a69f
Fix initial in GroupAvatar in GroupView
2017-10-30 15:04:12 +00:00
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
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
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
e8acb0e102
Use getValueAt()
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 16:02:51 -06:00
ae10a11ac4
Convert synced settings to granular settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 01:43:52 -06:00
bf815f4be9
Support labs features
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-28 20:21:50 -06:00
672fbb2873
hopefully fix NPE on toLowerCase
2017-10-28 18:33:38 +01:00
858c3a2548
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-10-27 18:59:57 +01:00
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
5209f29a5c
Use "crop" method to scale group avatars in MyGroups
2017-10-27 18:27:54 +01:00
95b2392104
Merge branch 'develop' into departify
2017-10-27 19:23:13 +02:00
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
5d0629ff73
resolve matrix.status.im v. matrix.org confusion
2017-10-27 14:23:16 +01:00
e094c32c62
Simplify GroupStore listener registration
2017-10-27 11:38:10 +01:00
e3f896c5e0
don't forget login prompt class
2017-10-27 01:35:21 +01:00
1bf3ef6de4
fix password reset
2017-10-27 01:23:50 +01:00
b4868a6846
showWidget->hideWidgetDrawer and remove logs
...
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-26 11:27:58 -07:00
655d0c615a
remove spurious Sign In button and legacy Return to App buttons
2017-10-26 17:57:49 +01:00
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
9643784f85
Only show group settings cog to members
...
Non-members have no settings to change.
2017-10-26 14:31:27 +01:00
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
5c32b5b11a
fix i18n
2017-10-26 02:10:03 +01:00
deb0f902e3
linting
2017-10-26 01:59:18 +01:00
1237de3ef0
Merge branch 'develop' into matthew/status
2017-10-26 01:47:22 +01:00
5a9dae5ff1
use generic 'text button' for delete buttons in UserSettings
2017-10-26 01:44:05 +01:00
ac7a94afb2
apply theme tint at launch
2017-10-26 01:43:42 +01:00
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
3ae97348f8
Add option to mirror local video feed
2017-10-25 18:17:33 +01:00
53e983f9c7
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-25 18:19:27 +02:00
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
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
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
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
37b55984ec
Fix group Leave button tooltip
2017-10-25 12:09:13 +01:00
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
ae40ef4460
fix error layouts
2017-10-25 02:18:14 +01:00
eb4b7c78a0
skin register screen
2017-10-25 02:04:02 +01:00
67cc02df3b
hide header when error is up
2017-10-25 01:37:06 +01:00
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
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
4ff369c884
Merge branch 'develop' into departify
2017-10-24 18:27:24 +02:00
459ffc47d6
Prevent editing of UI requiring user privilege if user unprivileged
2017-10-24 15:25:35 +01:00
115772d526
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-23 19:57:52 +02:00
e89371fb1c
Add click-to-open-settings functionality to GroupAvatar
2017-10-23 14:54:57 +01:00
f09fbccc19
WIP
2017-10-23 00:56:15 +01:00
37fd19290f
concept of default theme
2017-10-20 18:42:29 +01:00
1a7710c192
Adjust wording on placeholder
2017-10-20 18:10:14 +01:00
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
a85a011db9
Fix faulty translation in GroupView
2017-10-19 18:06:32 +01:00
b0f8619754
Improve MyGroups UI
...
as per design layed out by @tur2live!
2017-10-19 17:24:45 +01:00
2be0ebdd1d
More Groups->Communities
2017-10-19 15:01:16 +01:00
bafa2c6be0
Fix typo
2017-10-19 12:03:59 +01:00
c3f143acc3
Merge branch 'develop' into luke/groups-are-communities
2017-10-19 11:31:00 +01:00
7fe8c9cb01
fix lint
2017-10-19 01:48:49 +02:00
1087b36597
fix editing visuals on groupview header
2017-10-18 17:49:49 +01:00
a40704f085
Merge branch 'develop' into luke/groups-are-communities
2017-10-18 15:57:37 +01:00
677c8e95ee
Merge branch 'develop' into luke/groups-move-buttons
2017-10-18 10:31:54 +02:00
df9e037bfc
Default values when GETing instead of when POSTing
2017-10-17 18:11:00 +01:00
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
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
0415869b8c
Add useful functions to GroupView to inspect user flags
2017-10-17 16:08:19 +01:00
626f007f4e
Move membership section above long description textarea
2017-10-17 12:00:31 +01:00
7df3335570
Only show membership settings when editing
2017-10-17 11:59:52 +01:00
495465e865
Put invite accept/decline buttons in correct div to align them to the right
2017-10-17 11:59:16 +01:00
0c34e943fb
Merge branch 'develop' into luke/groups-are-communities
2017-10-16 17:34:06 +01:00
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
e4a3309752
Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque
...
Modify GroupView UI
2017-10-16 10:17:44 +01:00
9a5cffb5eb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into departify
2017-10-15 16:49:27 +02:00
03800b7476
Support more positioning options on context menus
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 21:43:47 -06:00
c34b55c6c7
Merge branch 'develop' into travis/pinned_messages
2017-10-14 16:10:32 -06:00
9f64261707
Merge branch 'develop' into travis/alone_warning
2017-10-14 22:43:36 +01:00
3efa0d2a76
Merge pull request #1478 from turt2live/travis/unset-avatar
...
Buttons to remove room/self avatar
2017-10-14 22:13:32 +01:00
David Baker