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
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
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
f1032bb115
Set isPeeking to false if peeking failed
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-12 07:05:09 -06:00
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
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
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
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
ffb9dd844a
Merge pull request #868 from psaavedra/set_default_federate_by_settings
...
Added TextInputWithCheckbox dialog
2017-10-11 16:28:03 +02:00
92be3af990
Make it clearer which HS you're logging into
...
Otherwise there's no indication without clicking 'custom server'
2017-10-10 19:16:42 +01:00
7492f2dffa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings
2017-10-04 22:35:29 +01:00
4017fa7f1d
Factor-out GroupStore and create GroupStoreCache
...
In order to provide feedback when adding a room to a group, the group summarry store needs to be extended to store the list of rooms in a group. This commit is the first step required.
The next step is to get the GroupRoomList listening to updates from GroupStore and expose the list of rooms from GroupStore.
(We're running out of words to describe the hierachy of things that store things)
2017-10-04 16:56:35 +01:00
a96169e80e
Fix merge conflict
2017-10-02 17:57:22 +02:00
739ddb8410
Merge branch 'develop' into luke/groups-button
2017-09-28 12:11:26 +01:00
6b9a2909df
Add rule to enforce spacing in curly brackets in JSX children
...
This required an updated in version of eslint-plugin-react to 7.4.0.
2017-09-28 11:21:06 +01:00
929c8627d3
Add button to get to MyGroups (view_my_groups or path #/groups)
2017-09-27 17:45:49 +01:00
f3b6b2cc06
Fix GroupView summary rooms displaying without avatars
...
- GroupView can now render with rooms in the summary that do not have an avatar
- RoomAvatar no longer has a redundant fallback avatar (this is handled by BaseAvatar)
- RoomAvatar was delinted
2017-09-27 16:18:15 +01:00
d52355f80e
Implement adding rooms to a group (or group summary) by room ID
2017-09-27 15:30:58 +01:00
6bc9b32ab7
Fix ability to feature self in a group summary
...
By default the AddressPicker would omit the currently logged-in user. This adds a property to override that to allow "self" to be picked.
2017-09-27 11:04:41 +01:00
1ca9102442
Fix spinner appearing above RP header
...
By wrapping the spinner in the mx_MemberList class. Also, use mx_RoomHeader_cancelButton for group settings cancel
2017-09-27 10:36:44 +01:00
35cb52febc
Fix merge conflict
2017-09-27 08:41:37 +02:00
8d0983ab02
Fix group membership publicity
...
* Read the new flag in the summary API (the one we were reading
was actually whether the group server listed you as a member to
non-members).
* Remove call to now-dead _loadGroupFromServer andf use the store
instead
2017-09-26 14:46:57 +01:00
af2df77b8e
Merge pull request #1418 from matrix-org/luke/groups-summary-store
...
Create GroupSummaryStore for storing group summary stuff
2017-09-25 14:59:32 +01:00
83e6218930
Remove listeners from group summary store on unmount
2017-09-25 14:49:12 +01:00
8e7d58797d
_loadGroupFromServer -> _initGroupSummaryStore
2017-09-25 14:48:49 +01:00
1a82f121c0
lint
2017-09-25 13:17:07 +01:00
b8dca58f4f
Pass matrixClient as an argument to GSS constructor
2017-09-25 10:02:13 +01:00
14bce1119c
Make theme names translatable
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-09-23 21:36:10 +02:00
d4929b558e
Add dummy translation function to mark translatable strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-09-22 21:43:27 +02:00
af73f1c3bb
Add status & toggle for publicity
...
This doesn't work at the moment because it looks like it's broken
in synapse as per https://github.com/matrix-org/sytest/pull/391
But if it did work, the client side code might look something
like this.
2017-09-22 19:27:02 +01:00
791bc5e7ac
Create GroupSummaryStore for storing group summary stuff
...
- Acts as a layer between GroupView and the group APIs that modify the summary individually. This allows for abstraction of getting the new summary once a successful API hit has been done.
- The plan is to also control the avatar, topic, body of the summary via the same class
2017-09-22 18:52:06 +01:00
4c1a85cb71
Merge pull request #1415 from matrix-org/luke/groups-remove-featured-rooms-and-users
...
Implement removal function of features users/rooms
2017-09-22 16:32:40 +01:00
3f9d20de97
Implement removal function of features users/rooms
...
With the appeareance of a "X" in the top right of each featured item when editing.
NB: No reloading of summary is done after adding/removing a user/room. The plan is to better than threading a callback all the way down.
2017-09-22 15:56:35 +01:00
c19ee66565
Merge pull request #1408 from matrix-org/luke/groups-membership-section-redesign
...
Redesign membership section in GroupView
2017-09-21 17:49:47 +01:00
3351770b54
Fix dodgy merge
2017-09-21 17:26:16 +01:00
d75efb83f1
Merge branch 'develop' into luke/groups-membership-section-redesign
2017-09-21 17:25:12 +01:00
cf23ac5931
Merge branch 'develop' into luke/groups-add-feature-rooms
2017-09-21 17:20:12 +01:00
3c2e6fdf9e
Honour the is_privileged flag in GroupView
2017-09-21 16:55:56 +01:00
5f840a3031
Implement adding rooms to the group summary
...
This includes making UserPickerDialog more generic such that it can also pick rooms from groups.
2017-09-21 16:53:10 +01:00
16f5a667c6
Redesign membership section in GroupView
2017-09-21 15:03:30 +01:00
3f0e596e97
Only show "Add" button when editing the group
2017-09-21 12:44:17 +01:00
4d9c43b3c8
Display dialog when errors occur whilst featuring users
2017-09-21 12:34:16 +01:00
03ddb63507
Remove redundant slice
2017-09-21 10:34:11 +01:00
5471431ee5
Disable "Add a Room" button for when we have a room picker
2017-09-20 17:02:20 +01:00
adf0a79585
Implement avatar, displayname for featured users
...
Profile data has been added to the API response for users in the group summary
2017-09-20 16:54:12 +01:00
1c1bf82c2a
Add users to group summary using new API
2017-09-20 16:32:02 +01:00
44c38652ab
Implement UserPickerDialog for adding users
...
Also, use AccessibleButtons.
2017-09-20 15:44:42 +01:00
1c6cecbd43
Add "Add a User/Room" buttons and always display default lists
2017-09-20 14:41:29 +01:00
e9fb5712bd
Merge branch 'develop' into dbkr/group_userlist
2017-09-19 13:26:55 +01:00
658285ebbf
Merge pull request #1396 from matrix-org/dbkr/3pid_invite_update_when_joined
...
Fix RoomView stuck in 'accept invite' state
2017-09-19 10:34:39 +01:00
David Baker