1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-27 04:21:52 +03:00
Commit Graph

243 Commits

Author SHA1 Message Date
24705d02b7 Replace DM logic in view_start_chat_or_reuse
Part of https://github.com/vector-im/riot-web/issues/10416

This code is used by the welcome bot logic and the groups/communities section of the app. goHomeOnCancel can be removed because no matter what happens we'll end up in a room with the user (and we aren't showing a dialog anymore).
2019-08-07 12:13:59 -06:00
4ec7a8ddff Fix casing of TooltipButton
My brain can't deal with two different ways to write "Tooltip", so this
converges the naming to match the rest of the code base. Separate commits will
fix up the file names for case-insensitive file systems.
2019-06-19 11:26:13 +01:00
bc5227a191 Fix some source strings noticed as incorrect by translators 2019-05-16 14:35:56 -06:00
23f22617ed Only show hosting link if group admin 2019-03-06 10:32:30 +00:00
7aa451067e Add utm_campaign to the hosting links
According to where in the app the link was clicked
2019-03-05 18:33:22 +00:00
dc0eff38fd Lint 2019-03-05 18:33:16 +00:00
d888445ec7 Support linking to hosting providers
From link in app config
2019-03-05 18:32:56 +00:00
e6bf9fe9bf Fix share community for guests
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-02-24 03:25:02 +00:00
e1edd56643 Allow theming group header buttons 2019-02-13 10:47:04 +00:00
68ae72f855 Spell homeserver correctly 2019-01-31 18:52:39 -06:00
be0de104ff make group header as tall as top left menu/room header 2019-01-30 16:24:02 +01:00
20e296b20e Convert image URLs in React to require calls
This allows Webpack to insert the proper image URL after builds steps like
adding a hash and so on. The path you supply to `require` is relative to the JS
source file, just like any other would be.
2019-01-17 22:06:49 -06:00
8e4d8ccca7 Add spaces back to async arrow functions
As per https://github.com/matrix-org/matrix-js-sdk/pull/821

Requires https://github.com/matrix-org/matrix-js-sdk/pull/821
2019-01-09 18:10:35 +00:00
8017f0a4a1 Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real 2019-01-03 16:00:23 -07:00
f928be6f59 Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental"
This reverts commit ad47144355.
2019-01-03 15:37:03 -07:00
7d161de35b Partial merge of develop to experimental
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
2019-01-03 15:02:58 +00:00
92c598dbcf remove group header expand right panel button 2018-12-18 15:38:15 +01:00
c6da61f1de Make sure to grab the InlineSpinner object 2018-12-17 18:47:33 -07:00
a734fb9d35 dont set initial phase, show panel when collapsed 2018-12-17 15:55:26 +01:00
5fc25fd6ba Only mark group as failed to load for summary
Currently, any error in the `GroupStore`s several requests can cause the whole
`GroupView` component to hide and be mark the group as failed to load.

Since it is known that group members may fail to load in some cases, let's only
show failed to load for the whole group when the summary fails.

This also strengthens the `GroupView` test by ensuring we wait for multiple
updates for checking results.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-04 18:32:16 -06:00
c6751e25e0 fix lint 2018-11-05 12:15:03 +01:00
46389457e3 add input styling for light and dark panels (leftpanel vs room header) 2018-11-05 09:32:37 +01:00
9be4598a0e use main element for room/group view 2018-11-02 15:05:55 +01:00
b4dd739771 Merge branch 'experimental' into bwindels/rightpanelbelowheader 2018-10-31 14:57:16 +01:00
870280c6c7 move rightpanel into group view 2018-10-31 12:09:24 +01:00
e80a1c5051 move room/group panel header buttons into room/group header 2018-10-30 17:15:19 +01:00
49ce4ef117 eslint --fix src/
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 22:50:38 -05:00
fe901142aa Split long string over two lines
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-23 17:20:57 -05:00
92bfb42784 Use one string instead of two
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-23 13:11:36 -05:00
a6c78ace4f Add warning when administrator leaves community
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-23 12:25:12 -05:00
27fa21e403 Replace view_set_mxid with require_registration
To put all the other flows through the to-ilag-or-not-to-ilag flow
2018-09-05 18:08:49 +01:00
29d48e5dad guests trying to join communities should fire the ILAG flow.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-15 22:48:25 +01:00
a918d73c29 Merge pull request #1973 from matrix-org/t3chguy/fix_react_proptypes_warnings
fix a bunch of instances of react console spam
2018-06-18 10:47:20 +01:00
43681026b8 s/onClick/onChange because react cries about it
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-15 19:01:12 +01:00
a2219472f6 inline redundant bodyNodes, fixes react no unique key warning too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-15 18:47:15 +01:00
7f1ce52dd3 link to ShareDialog from GroupView, RoomView, UserSettings & MemberInfo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:01 +01:00
da9fe9917b Fix click on faded left/right/middle panel -> close settings
- implement generic dispatch to close user/room/group settings
 - use dispatch to allow clicks on disabled left/right/middle panel to
   close settings

A much more maintainable approach would be to use dedicate routing
instead of doing different things depending on what page of the app is
currently being viewed. At the very least we could make the concept of a
settings page generic.
2018-05-29 13:16:39 +01:00
25690336c3 Prevent user getting trapped in group settings when an error occurs 2018-05-01 11:52:02 +01:00
023daef4b7 Refactor GroupStores into one global GroupStore
Take a step closer to a flux-like architecture for group data, for
the purposes of providing features that require it.

Now the app has a single GroupStore that can be poked to fetch
updates for a particular group.
2018-05-01 11:24:17 +01:00
fca7325b20 Change comments 2018-04-10 15:56:57 +01:00
31e9979285 Add 500ms delay to show membershipBusy for longer
to avoid a UI that flashes quickly
2018-04-10 15:31:04 +01:00
de1073aacb Factor out _closeSettings for cleanliness 2018-04-10 13:28:42 +01:00
24d4df87d1 Show membership spinner next to Leave/Join button when leaving/joining 2018-04-10 11:49:59 +01:00
0681df71b0 Hide settings after leaving a group 2018-04-10 11:49:35 +01:00
42141f7da7 Fetch group data when leaving or joining to update the view 2018-04-10 10:03:54 +01:00
2da45277cd Update group join button to match new API 2018-04-09 16:57:27 +01:00
1e586428ac Update to match is_openly_joinable API 2018-04-06 14:58:10 +01:00
03747b8287 Update to use new join_policy API 2018-04-05 16:56:35 +01:00
c9283ad988 Merge branch 'luke/feature-group-set-joinable' of github.com:matrix-org/matrix-react-sdk into luke/feature-group-set-joinable 2018-03-29 17:28:44 +01:00
2bc8d6d3a4 Use less confusing values on radio buttons 2018-03-29 17:25:06 +01:00