Commit graph

2388 commits

Author SHA1 Message Date
Michael Telatynski
fac89d9c58
Merge branch 'develop' into t3chguy/m.relates_to 2018-03-28 08:38:33 +00:00
Luke Barnard
39e9d52c04 Make sure to proxy special prop ref 2018-03-27 13:04:26 +01:00
Luke Barnard
b80568b1c5 Wrap GeminiScrollbar in a component, enabled forceGemini
Fixes https://github.com/vector-im/riot-web/issues/6294
2018-03-27 13:04:26 +01:00
Luke Barnard
69d9080dd5 Track duration of page changes
The duration measured is between
 - componentWillUpdate of MatrixChat and
 - componentDidUpdate of MatrixChat.

This does not account for *all* changes to the view that occur
when a room switch happens, for example. But it does at least
capture the difference between switching to a "big" room and
switching to a small test room.
2018-03-27 11:17:49 +01:00
Michael Telatynski
b5ed08eba2
Merge
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-24 17:52:49 +00:00
David Baker
580b68a1b6
Merge pull request #1652 from pvagner/dialog-a11y
Dialog a11y
2018-03-20 11:35:57 +00:00
Luke Barnard
6789a6ec25 Add missing trailing comma 2018-03-19 14:57:41 +00:00
Luke Barnard
0c125b3dff Merge branch 'develop' into luke/submit-debug-logs 2018-03-19 14:55:28 +00:00
Luke Barnard
aed7c2039d Update debug logs submission explanation 2018-03-19 14:54:50 +00:00
David Baker
f42769509f Merge remote-tracking branch 'origin/develop' into dbkr/remove_crypto_migrated_message 2018-03-16 15:48:02 +00:00
Luke Barnard
0d7099fd61
Merge pull request #1801 from matrix-org/luke/perf-room-list
Improve room list performance when receiving messages
2018-03-15 13:33:19 +00:00
David Baker
ba4626521f Remove the message on migrating crypto data
This was for when the new and old versions were available
concurrently on /develop and /app.

The various migration steps are still logged to the console in
js-sdk.
2018-03-15 10:09:12 +00:00
Luke Barnard
bc5699b3d7 Add change delay warning in GroupView settings 2018-03-14 18:17:15 +00:00
Luke Barnard
8672b97f9a Improve room list performance when receiving messages
In summary this makes RoomTiles (and RoomAvatars) do more for
themselves in terms of reacting individually to state changes in
the js-sdk.

Instead of force updating the entire room list for avatar changes
and room name changes, do this in the RoomTile and RoomAvatar
instead. This increases the number of listeners listening to the
matrix client, but allows us to properly implement a
shouldComponentUpdate for RoomTile (because the avatar, name and
notification count are now in component state)
2018-03-14 14:29:55 +00:00
Richard Lewis
b2d23b6999 Switch to 'm.sticker' message events. Allow whitelisting of wisget capabilities. 2018-03-12 13:56:02 +00:00
Luke Barnard
5ba55858e8 Use TintableSvg for TagPanel clear filter button 2018-03-08 17:06:48 +00:00
Richard Lewis
e2cedbe9d7 Pull in changes from develop 2018-03-05 16:43:59 +00:00
Luke Barnard
86295acba3 Merge branch 'develop' into luke/fix-group-avatar-update 2018-03-01 15:27:06 +00:00
David Baker
e91ae6b5ac
Merge pull request #1782 from matrix-org/luke/fix-drag-drop-click-weirdness
Workaround for atlassian/react-beautiful-dnd#273
2018-03-01 15:05:47 +00:00
Luke Barnard
61a6f140f5 onClientSync -> _onClientSync 2018-03-01 14:43:26 +00:00
Luke Barnard
4037a22492 Fix bug where avatar change not reflected in LLP
Fixes vector-im/riot-web#6189
2018-03-01 14:40:03 +00:00
Luke Barnard
64332b3021 Workaround for atlassian/react-beautiful-dnd#273
Fix two bugs in Riot due to a single bug in react-b-dnd

Fixes vector-im/riot-web#6253
Fixes vector-im/riot-web#6156
2018-03-01 13:48:46 +00:00
Luke Barnard
27c71f15b9 Add setting to disable TagPanel 2018-02-28 18:16:01 +00:00
Luke Barnard
2b49947e1e Add "Did you know:..." microcopy to groups view
To explain how to drag group avatars into the TagPanel
2018-02-27 09:20:06 +00:00
Richard Lewis
b2bf4d4709 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/snapshot 2018-02-23 15:37:33 +00:00
Matthew Hodgson
d8ef6f79b1 s/autoShow/autoshow/ 2018-02-23 10:14:02 +00:00
Luke Barnard
f08ec3498a Fix bug that prevented tint updates 2018-02-22 10:53:06 +00:00
Luke Barnard
ff868691c9 Only show "X" when filtering, add alt/title 2018-02-21 17:15:43 +00:00
Luke Barnard
fc73442cdc Change icon from "R" to "X" 2018-02-21 15:06:10 +00:00
Michael Telatynski
665ddccb0d
restrict to m.text for now
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-20 15:45:25 +00:00
Michael Telatynski
90f9badbf3
s/Reply/ReplyThread/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-20 15:40:19 +00:00
Luke Barnard
bc15303358 Factor out updateDmState 2018-02-20 14:10:34 +00:00
Luke Barnard
d21f55633d Fix DMs being marked as with the current user ("me")
Whilst testing various DM paths, @lukebarnard1 found that there were
many failures to add the room as a DM against the correct user. It
turned out most of the failures seen were because the user chosen
was the current user. If the user accepted an invite it would often
be marked as with themselves because we chose the sender of the
join event as the DM user.

This fix makes the DM room setting process the same for both the
inviting client and the invited client. A RoomState.members
event causes the DM room state to be set in the room, regardless
of whether we are currently `joining` (see previous impl.)

The two cases for setting a DM are:
 - this user accepting an invite with is_direct
 - this user inviting someone with is_direct

This should handle all cases for setting DM state.
2018-02-20 14:03:43 +00:00
Michael Telatynski
7048d85246
attach message_sent and replies to file uploads
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-19 23:42:04 +00:00
Luke Barnard
7a0c82a327 Fix click background to deselect 2018-02-16 18:08:29 +00:00
Luke Barnard
113fc696d8 Implement global filter to deselect all tags
and make TagPanel scrollable whilst we're at it.
2018-02-16 17:43:43 +00:00
Luke Barnard
1a880761e0
Merge pull request #1747 from matrix-org/luke/fix-scrollbars-on-jump-to-first
Change CSS class for message panel spinner
2018-02-15 14:51:12 +00:00
Luke Barnard
3948ee8ca1 Give each GroupTile avatar its own droppable
so that they can be dragged and dropped
without interacting with each other, as
they would do if GroupView contained
one droppable to contain them all.
2018-02-14 17:53:54 +00:00
Luke Barnard
74c8a74e7d Add Droppable to GroupView
to contain the GroupTiles as Draggables
2018-02-14 16:43:01 +00:00
Luke Barnard
b626420eb9 Move DND context to LoggedInView
so that we can drag things from any part of the logged in app to
another. (Specifically GroupView and TagPanel).
2018-02-14 16:40:58 +00:00
Luke Barnard
47c232b5b3 Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first 2018-02-14 11:00:27 +00:00
David Baker
7cc82a682c
Merge pull request #1745 from matrix-org/luke/fix-login-page-feedback
Give the login page its spinner back
2018-02-14 10:31:36 +00:00
Luke Barnard
36e8bf1f20 Change CSS class for message panel spinner
to stop scrollbars appearing when we
 - jump to a message or,
 - permalink that is to an not paginated in event
2018-02-13 14:13:47 +00:00
Luke Barnard
493116b17e Give the login page its spinner back 2018-02-13 11:43:22 +00:00
Luke Barnard
db0ea9eb0e Merge branch 'develop' into luke/room-list-flux 2018-02-13 10:18:24 +00:00
Luke Barnard
6d3634a06c Move groups button to TagPanel 2018-02-13 09:44:00 +00:00
Richard Lewis
55593416fa Hide apps drawer when viewining room settings. 2018-02-09 13:23:34 +00:00
Peter Vágner
410570936a Reimplement setting aria-hidden on the main app node by dispatching actions rather than assuming we can find and manipulate the node directly 2018-02-08 22:51:07 +01:00
Luke Barnard
0154772789 Change wording of debug log submission
Fixes https://github.com/vector-im/riot-web/issues/5985
2018-02-08 18:18:57 +00:00
Richard Lewis
234ca8b062 Remove top padding from app tile. 2018-02-08 17:50:30 +00:00
Richard van der Hoff
5823b32ab1
RoomView: guard against unmounting during peeking
it's possible for the user to change room before the peek operation completes. Check if we've been unmounted before setting state.
2018-02-08 10:01:24 +00:00
lukebarnard
45ad46b468 Fix HS/IS URL reset when switching to Registration 2018-02-07 15:58:29 +00:00
Luke Barnard
cf4ae681f4
Offline mode (#1723)
* Allow the client to run without connection to HS (i.e. using indexeddb)

Allows running without having pushRules (it's safe not to have these 
when running from indexeddb sync.)

This means rooms will be displayed with "unknown" notifcation state.

This assumes anything that uses the push rules will get pushRule state
again when the client starts syncing again.

For recovering from being disconnected, 
* If an avatar has fallen back, try again on reconnection
* If a thumbnail image failed to load, retry on reconnect
* Load joined groups when reconnecting

Update tests to give MELS a context.matrixClient
2018-02-06 17:50:53 +00:00
lukebarnard
73e3a594ac Prevent TagTiles from being dragged into other droppables
for the time being at least.
2018-01-25 22:52:19 +01:00
lukebarnard
d0e3319bd9 Remove DragDropContext from TagPanel and RoomList
So that we can have one context that can handle DND between
the TagPanel and RoomList.
2018-01-25 22:05:20 +01:00
lukebarnard
815f52587b Move TagPanel out of LoggedInView
(...and into LeftPanel in riot-web. Can we merge the projects yet?)
2018-01-25 21:53:34 +01:00
Will Hunt
5206c9d18b Show a warning if the user attempts to leave a room that is invite only 2018-01-19 22:52:43 +00:00
Luke Barnard
a8320fe7e2
Merge pull request #1711 from matrix-org/luke/roomlist-beautiful-dnd
Swap RoomList to react-beautiful-dnd
2018-01-19 14:49:49 +00:00
lukebarnard
00dc077271 Remove react-dnd, revert fa14bc9 as no longer needed 2018-01-19 13:34:56 +00:00
Richard Lewis
910623d287 Close context menu on resize. 2018-01-18 12:04:00 +00:00
Richard Lewis
917d85d603 Refer rest parameters 2018-01-18 12:03:24 +00:00
Matthew Hodgson
80d3edfbb3 simplify the 'send anyway' text, as 'mark devices known' is meaningless to users 2018-01-18 09:57:29 +00:00
Richard Lewis
f8d7ab10fa Handle non-m.room.message event types. 2018-01-17 17:19:20 +00:00
David Baker
c64b4e1b1c Merge remote-tracking branch 'origin/develop' into dbkr/dont_paginate_while_decrypting 2018-01-16 17:38:32 +00:00
Luke Barnard
62caa4f096
Merge pull request #1705 from matrix-org/luke/tag-panel-beautiful-dnd
Replace TagPanel react-dnd with react-beautiful-dnd
2018-01-16 11:26:44 +00:00
lukebarnard
f19dcd8114 Comment workaround to atlassian/react-beautiful-dnd#273 2018-01-16 11:07:25 +00:00
lukebarnard
bda2d6b0a6 Work around atlassian/react-beautiful-dnd#273
For some reason, after dragging an item
the parent draggable receives a mouse click. The workaround is
to use onMouseDown for deselecting tags
2018-01-16 10:44:11 +00:00
lukebarnard
16c13fb079 Replace TagPanel react-dnd with react-beautiful-dnd
This new library handles the simple case of an ordered vertical
(or horizontal) list of items that can be reordered.

It provides animations, handles positioning of items mid-drag
and exposes a much simpler API to react-dnd (with a slight loss
of potential function, but we don't need this flexibility here
anyway).

Apart from this, TagOrderStore had to be changed in a highly
coupled way, but arguably for the better. Instead of being
updated incrementally every time an item is dragged over
another and having a separate "commit" action, the
asyncronous action `moveTag` is used to reposition the tag in
the list and both dispatch an optimistic update and carry out
the request as before. (The MatrixActions.accountData is still
used to indicate a successful reordering of tags).

The view is updated instantly, in an animated way, and this
is handled at the layer "above" React by the DND library.
2018-01-15 18:12:27 +00:00
Michael Telatynski
b526fc057c Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep 2018-01-14 18:32:17 +00:00
David Baker
e42bea6277 Don't paginate whilst decrypting events
As comment hopefully explains. This meant loading the app on an e2e
room would often be very slow as it tried to pull hundreds of events
into the timeline.
2018-01-12 18:17:03 +00:00
David Baker
b152bd4ab9
Merge pull request #1625 from matrix-org/t3chguy/analytics_info
Add Analytics Info and add Piwik to SdkConfig.DEFAULTS
2018-01-11 11:02:34 +00:00
David Baker
efb96cdd2a
Merge pull request #1695 from matrix-org/dbkr/send_without_verifying
Add 'send without verifying' to status bar
2018-01-11 10:34:56 +00:00
Michael Telatynski
1a7dc22a8d
make wantsDateSeparator generic and throw into DateUtils
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-10 12:06:24 +00:00
Michael Telatynski
1bc9d344ae
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/views/messages/TextualBody.js
2018-01-10 11:54:58 +00:00
David Baker
9dd9a5be4b Wording tweak 2018-01-09 17:59:49 +00:00
David Baker
dbb8f878cb Tidy up imports 2018-01-09 17:57:18 +00:00
David Baker
4c101628b5 Add 'send without verifying' to status bar
Fixes other part of https://github.com/vector-im/riot-web/issues/5936
2018-01-09 13:52:37 +00:00
Richard Lewis
5df9a01e64 Use m.room.sticker event. 2018-01-08 12:06:32 +00:00
Luke Barnard
8c84c3f929
Merge pull request #1680 from matrix-org/t3chguy/hide_roomstatusbar
Hide status bar on visible->hidden transition
2018-01-05 15:26:22 +00:00
David Baker
845dda8f48
Merge pull request #1692 from matrix-org/t3chguy/pr-revival/turt2live/single_unsent
[revived] Singularise unsent message prompt, if applicable
2018-01-05 12:24:06 +00:00
Michael Telatynski
9f295b7a86
fix typo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-05 12:03:46 +00:00
Michael Telatynski
558a90a359
comment out RoomView.onStatusBarHidden
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-05 11:58:42 +00:00
David Baker
5aed77c752
Merge pull request #1677 from aidalgol/PropTypes
Remove use of deprecated React.PropTypes
2018-01-05 11:53:55 +00:00
Richard Lewis
54671ab67e Send m.sticker messages 2018-01-04 21:57:24 +00:00
Richard Lewis
eb4053bc99 Handle sticker message payloads 2018-01-04 18:41:47 +00:00
David Baker
b34f360f96
Merge pull request #1690 from matrix-org/luke/remove-selected-room-prop
Remove unused selectedRoom prop
2018-01-04 17:33:36 +00:00
David Baker
5961cf3958
Merge pull request #1684 from matrix-org/luke/fix-tag-panel-shift-ctrl-click
Fix shift and shift-ctrl click in TagPanel
2018-01-04 17:08:01 +00:00
Michael Telatynski
be48460595
Singularise unsent message prompt, if applicable
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-04 15:05:08 +00:00
lukebarnard
2282f5c26f Remove unused selectedRoom prop 2018-01-04 14:19:10 +00:00
Richard Lewis
e96d199b28 Inject stickers 2018-01-04 09:53:26 +00:00
David Baker
613e3b7ac1 Remove extra full stop 2018-01-03 11:57:49 +00:00
lukebarnard
85cdd888e8 Combine TagOrderStore and FilterStore
so that shift-click semantics can work. The store that computes the shift-click
rules has to be aware of the actual order of tags displayed, so they must be done
in the same store.
2018-01-03 11:33:59 +00:00
Luke Barnard
8eef09335a
Merge pull request #1667 from matrix-org/luke/fix-naive-tag-panel-group-profile-requesting
Get Group profile from TagTile instead of TagPanel
2018-01-02 19:02:33 +00:00
Michael Telatynski
875eb3d34f
Hide status bar on visible->hidden transition
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-01 21:15:26 +00:00
Aidan Gauland
35780f5ae0 Remove use of deprecated React.PropTypes
Replace all uses of React.PropTypes with PropTypes and importing PropTypes from
'prop-types'.
2017-12-26 14:03:18 +13:00
Matthew Hodgson
fa14bc9b8d don't gutwrench 2017-12-18 22:49:23 +00:00
Matthew Hodgson
e65c67ca15 fix https://github.com/vector-im/riot-web/issues/5841 2017-12-18 22:47:28 +00:00
Alexandr Korsak
78af02b29b Replace lodash/every by Array.prototype.every function 2017-12-18 15:51:01 +03:00
Alexandr Korsak
c07c4fd1cb Allow multiple file uploads on drag & drop 2017-12-18 13:20:18 +03:00
Luke Barnard
6f896098e3 Get Group profile from TagTile instead of TagPanel
So that instead of getting all group profiles everytime the tags
change order, get them when the TagTile mounts for a group tag.
2017-12-15 17:18:46 +00:00
Luke Barnard
8b11b10531 Avoid NPEs by using ref method for collecting loggedInView in MatrixChat 2017-12-15 15:24:37 +00:00
Richard Lewis
f410112983 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into rxl881/snapshot 2017-12-15 10:18:56 +00:00
Luke Barnard
9975941f3c
Merge pull request #1653 from matrix-org/luke/feature-ordered-tag-panel
DnD Ordered TagPanel
2017-12-14 10:36:16 +00:00
Luke Barnard
950f591b3f Clarify more docs 2017-12-13 15:50:20 +00:00
lukebarnard
f38690f265 Doc orderedGroupTagProfiles 2017-12-13 10:51:04 +00:00
lukebarnard
a8b245d0cf Add unmounted guard 2017-12-13 10:42:11 +00:00
lukebarnard
42c1f3cfe2 Fix incorrect bind 2017-12-13 10:41:24 +00:00
Michael Telatynski
5c229b9ef8
DRY matrix.to link generation so it is all changeable in one class
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-12 23:33:40 +00:00
Luke Barnard
13925db251 Refactor to allow dispatching of two kinds of Actions
They are:
 1. The existing type of Action, Objects with an `action` type.
 1. Asyncronous Actions, functions that accept a `dispatch` argument, which can be used to dispatch Actions asyncronously.
2017-12-12 17:32:43 +00:00
Luke Barnard
a120335130 Handle groups being joined and left 2017-12-11 18:03:19 +00:00
Luke Barnard
aa914098dc Return null if TagOrderStore is loading
The view should decide the default state.
2017-12-11 17:19:29 +00:00
Luke Barnard
991ea4ebe5 Fix a few bugs with TagOrderStore:
- Have TagOrderStore listen for MatrixSync actions so that it can initialise
   tag ordering state.
 - Expose an empty list until the client has done its first sync and has
   fetched list of joined groups
2017-12-11 17:17:05 +00:00
David Baker
bb9376098a
Merge pull request #1654 from matrix-org/dbkr/crypto_store_migrate_warning
Warn when migrating e2e data to indexeddb
2017-12-08 16:52:05 +00:00
David Baker
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
Luke Barnard
8f0774496f Remove redundant MatrixChat 2017-12-08 11:29:21 +00:00
Luke Barnard
72550961e5 Move 'commit_tags' to action creator 2017-12-08 10:52:20 +00:00
Luke Barnard
ee6df105fe Introduce action creators
These can be used to dispatch actions immediately, or after some asynchronous
work has been done. Also, create GroupActions.fetchJoinedGroups as an example.

The concept of async action creators can be used in the following cases:
 - stores or views that do async work, dispatching based on the results
 - actions that have complicated payloads, would make more sense as functions
   with documentation that dispatch created actions.
2017-12-07 14:17:32 +00:00
David Baker
1a3671d241 remove stray param 2017-12-06 19:04:29 +00:00
David Baker
5bca5a7a8e More underscore 2017-12-06 19:02:26 +00:00
David Baker
aa99b898ce Add that it might not work now either
also a comma
2017-12-06 18:57:48 +00:00
David Baker
4462694438 lint 2017-12-06 16:06:33 +00:00
David Baker
65c210cdde Warn when migrating e2e data to indexeddb 2017-12-06 15:28:20 +00:00
Luke Barnard
7e1f1cdbd9 Move DragDropContext to wrap LoggedInView
Becuase the tests rely on being able to inspect the state of MatrixChat
2017-12-06 15:01:16 +00:00
Luke Barnard
35a108eecc Simplify render of TagPanel - remove sorting 2017-12-06 14:17:26 +00:00
Luke Barnard
7aa5dcef69 Move DragDropContext to wrap entire app 2017-12-06 13:10:58 +00:00
Luke Barnard
a8a650c24a Move TagTile to separate file, and make it dragable 2017-12-06 11:25:46 +00:00
Luke Barnard
8178496457 Implement Store for ordering tags in the tag panel 2017-12-05 14:45:44 +00:00
Richard Lewis
c9b8aab0e0 Workings for future posterity - Can't access iframe content from parent. iframe needs to initiate. Postmessage data up the stack. 2017-12-03 19:44:59 +00:00
Luke Barnard
b26cf23574
Merge pull request #1641 from matrix-org/luke/tag-panel-shift-click-semantics
Implement shift-click and ctrl-click semantics for TP
2017-12-01 12:04:21 +00:00
Luke Barnard
363fe04a10 isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent 2017-12-01 10:44:00 +00:00
Luke Barnard
ddd0e161c0 Fix broken imports 2017-12-01 10:41:56 +00:00
Luke Barnard
fe81fcb8c6 Factor out isCtrlOrCmdKeyEvent, use that in TagPanel
as opposed to the incorrect ctrl || meta
2017-12-01 10:30:49 +00:00
Luke Barnard
eaaa9fe747 Don't show group when clicking tag panel 2017-11-30 15:35:40 +00:00
Luke Barnard
3bcb3195c4 Implement shift-click and ctrl-click semantics for TP 2017-11-30 14:48:54 +00:00
Luke Barnard
f708250d44 Add feature flag for Tag Panel 2017-11-29 18:00:42 +00:00
Luke Barnard
ead30fae9d Use unmounted instead of mounted 2017-11-29 17:07:43 +00:00
Luke Barnard
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
Luke Barnard
55b5f2b249
Merge branch 'develop' into luke/allow-guest-view-group 2017-11-28 14:06:43 +00:00
Luke Barnard
a8594a58e5 Allow guest to see MyGroups, show ILAG when creating a group 2017-11-28 13:32:46 +00:00
Luke Barnard
7ec4010881 Make GroupStore use MatrixClientPeg
To avoid weirdness with using a cached matrix client
2017-11-28 11:54:05 +00:00
Luke Barnard
1a3ad5a342 Allow guests to view individual groups
For homeservers that still disallow guests (running synapse without https://github.com/matrix-org/synapse/pull/2715), start ILAG.
2017-11-28 11:52:46 +00:00
David Baker
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
Richard van der Hoff
8be3862e68 Merge branch 'master' into develop 2017-11-28 10:29:40 +00:00
David Baker
81ae081f15
Merge pull request #1617 from turt2live/travis/granular-theme
Pull the theme through the default process
2017-11-27 18:07:09 +00:00
lukebarnard
9ed9422af8 Move group publication toggles to UserSettings 2017-11-27 17:24:42 +00:00
Richard van der Hoff
80b8cbb473 Ignore unrecognised login flows
Update the Login component so that if it sees an unrecognised login flow, it
just ignores it and uses another one, so that riot can still be used with
homeservers supporting custom login types.
2017-11-27 16:47:49 +00:00
David Baker
e2f5e16fa7 Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-20 10:00:47 +00:00
Michael Telatynski
f61f858cf7
Add Analytics Info and add Piwik to SdkConfig.DEFAULTS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-19 15:33:07 +00:00
David Baker
1675737e7d Merge remote-tracking branch 'origin/master' into develop 2017-11-17 17:48:42 +00:00
David Baker
6d23182f5f Fix the force TURN option
The call object is created within the js-sdk for inbound calls, so
we never got the chance to set it.
2017-11-17 14:54:44 +00:00
Travis Ralston
33a3b07d88 Pull the theme through the default process
This is to ensure the `config` level is respected.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-16 20:52:12 -07:00
David Baker
196eafdc7f Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-16 15:59:16 +00:00
Luke Barnard
b54e563cb6 Merge branch 'develop' into luke/linting-keyword-spacing 2017-11-16 13:23:42 +00:00
Luke Barnard
dad797d4a2 Run linting --fix 2017-11-16 13:19:36 +00:00
Matthew Hodgson
f62b04c3be
Merge branch 'develop' into travis/granular_bugs 2017-11-16 13:12:03 +00:00
Travis Ralston
10a1d9cb29 Language is a local setting
Fixes https://github.com/vector-im/riot-web/issues/5611

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 21:16:12 -07:00
Travis Ralston
022e40a127 Use SettingsStore for default theme
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 19:04:49 -07:00
Stefan Parviainen
2c1618bc10 Fix conflict and update strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:40:51 +01:00
David Baker
aeca83ff2e Unused import 2017-11-15 15:20:45 +00:00
David Baker
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
David Baker
f8fc6dc83e Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-15 12:11:33 +00:00
Matthew Hodgson
060a890275
Merge pull request #1516 from turt2live/travis/granular-settings
Granular settings
2017-11-15 10:55:55 +00:00
David Baker
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
Matthew Hodgson
e91e94fd42 fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601 2017-11-15 09:56:44 +00:00
Travis Ralston
bd4102eb3d Merge branch 'develop' into travis/granular-settings 2017-11-14 19:12:48 -07:00
Matthew Hodgson
546b062d82 automatically and correctly retint when changing theme 2017-11-15 01:45:51 +00:00
Matthew Hodgson
f05958e334
Merge pull request #1482 from turt2live/travis/presence
Implement user-controlled presence
2017-11-14 23:53:16 +00:00
Stefan Parviainen
df6d5cc2b4 Pass plain components, rather than functions returning them 2017-11-14 20:09:52 +01:00
Matthew Hodgson
7c98558b6a fix neglible race when loading CSS 2017-11-14 16:07:48 +00:00
Matthew Hodgson
1fd7ac30e4 turns out i made up the .complete property on link elements 2017-11-14 16:04:11 +00:00
Matthew Hodgson
8d6e3dd27d fix lint 2017-11-14 15:37:03 +00:00
Matthew Hodgson
dcfbe93409 fix race when loading CSS
fixes https://github.com/vector-im/riot-web/issues/5590
2017-11-14 15:28:34 +00:00
Matthew Hodgson
8c218557df fix disable_custom_urls 2017-11-14 15:17:50 +00:00
David Baker
55260becc9 Revert "Lowercase all usernames" 2017-11-14 14:13:22 +00:00
Travis Ralston
d92cba25ef Use the SettingsStore to get the theme
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 13:14:00 -07:00
Travis Ralston
63bebe9dfd Split out avatar and display name hiding
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 12:58:10 -07:00
Travis Ralston
0648b3eae7 Merge branch 'develop' into travis/granular-settings 2017-11-13 12:29:36 -07:00
Stefan Parviainen
3afbaf61e7 Refactor i18n stuff a bit 2017-11-13 20:19:33 +01:00
Travis Ralston
c5c346f0b7 Merge branch 'develop' into travis/granular-settings 2017-11-13 12:18:41 -07:00
David Baker
0659ac1ccb Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-13 17:45:57 +00:00
Matthew Hodgson
46387e135e
Merge branch 'develop' into matthew/status 2017-11-11 23:50:48 +00:00
Matthew Hodgson
2827bc0718 replace some of the status.im theme with general config options 2017-11-11 23:46:43 +00:00
David Baker
39763d668c
Revert "Lowercase all usernames" 2017-11-11 15:59:43 +00:00
David Baker
bce4815851 Initialise unread messages value correctly 2017-11-11 15:57:20 +00:00
Matthew Hodgson
a0cdaf29f9 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-10 15:29:42 -08:00
Luke Barnard
0d174ffe9a Fix tests 2017-11-10 11:13:52 +00:00
Luke Barnard
f4428267a1 Refactor onboarding redirect, add groups to the onboarding starters 2017-11-10 10:51:28 +00:00
Luke Barnard
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
David Baker
b1ec430523 Remove now-unused dispatches 2017-11-09 16:09:12 +00:00
David Baker
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
Travis Ralston
030633fa90 Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings 2017-11-08 17:43:38 -07:00
Travis Ralston
f7da5836e1 Make blacklistUnverifiedDevices override the level order
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-08 17:41:32 -07:00
Matthew Hodgson
58ee4d0a76 rewrite the tinter to be ES6, and correctly cache fixups per theme 2017-11-08 06:55:07 -08:00
Matthew Hodgson
e729bc431d Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-08 04:29:52 -08: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
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
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
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
Luke Barnard
9019fee49e Adjust long desc placeholder text 2017-11-07 10:48:56 +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
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
Matthew Hodgson
68115f5b9c tint when theming correctly 2017-11-05 00:40:38 +00:00
Matthew Hodgson
e72e30197a calculate new CSS tinting when we change theme 2017-11-04 23:50:57 +00: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
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
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
Luke Barnard
71c59eff2c Add a GeminiScrollbar to Your Communities 2017-11-03 11:19:29 +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
Matthew Hodgson
64d8c81897 Merge branch 'develop' into matthew/status 2017-11-01 15:24:30 +00:00
Stefan Parviainen
d6f1e12bee Fix merge conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 15:50:45 +01: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
Luke Barnard
45e15fd865
Merge branch 'develop' into luke/groups-expose-ready-state 2017-10-31 11:50:12 +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
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
Luke Barnard
14d600a69f Fix initial in GroupAvatar in GroupView 2017-10-30 15:04:12 +00: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
Matthew Hodgson
5d0629ff73 resolve matrix.status.im v. matrix.org confusion 2017-10-27 14:23:16 +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
Andrew (anoa)
b4868a6846
showWidget->hideWidgetDrawer and remove logs
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-26 11:27:58 -07:00
Matthew Hodgson
655d0c615a remove spurious Sign In button and legacy Return to App buttons 2017-10-26 17:57:49 +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
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
Stefan Parviainen
53e983f9c7 Fix merge conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-25 18:19:27 +02: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
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
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
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
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
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
Stefan Parviainen
4ff369c884 Merge branch 'develop' into departify 2017-10-24 18:27:24 +02:00
Luke Barnard
459ffc47d6 Prevent editing of UI requiring user privilege if user unprivileged 2017-10-24 15:25:35 +01:00
Stefan Parviainen
115772d526 Fix merge conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-23 19:57:52 +02: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
b0f8619754 Improve MyGroups UI
as per design layed out by @tur2live!
2017-10-19 17:24:45 +01:00
Luke Barnard
2be0ebdd1d More Groups->Communities 2017-10-19 15:01:16 +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
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
Luke Barnard
df9e037bfc Default values when GETing instead of when POSTing 2017-10-17 18:11:00 +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