Matthew Hodgson
3b8e5073b5
improve layout
2016-01-18 19:57:32 +00:00
Matthew Hodgson
a775086e81
wording from amandine
2016-01-18 19:57:17 +00:00
Matthew Hodgson
eb7144ef85
improve layout
2016-01-18 19:56:56 +00:00
Matthew Hodgson
0a79b0f9e2
fix NPE from kegan's memberlist branch
2016-01-18 19:56:47 +00:00
Matthew Hodgson
7b91d3c5f8
wording changes from Amandine to settings
2016-01-18 19:56:38 +00:00
Matthew Hodgson
765174a600
merge conflict
2016-01-18 19:56:35 +00:00
Matthew Hodgson
d5c291ae62
Merge branch 'kegan/invite-search' into matthew/roompreview
2016-01-18 18:00:58 +00:00
David Baker
e68972fb1a
Remove generateClientSecret and use the one the js sdk gives us.
2016-01-18 17:50:27 +00:00
Matthew Hodgson
491ba94230
WIP: try to support non-guest room peek. Rename visibility permissions in room settings a bit, and fix how they are persisted.
2016-01-18 17:39:23 +00:00
Kegan Dougal
a8643ff039
Move power level stuff to EntityTile for now
2016-01-18 17:37:17 +00:00
Matthew Hodgson
d6f6f32c74
WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now
2016-01-18 17:37:13 +00:00
Kegan Dougal
317e1fb9cd
Merge branch 'develop' into kegan/invite-search
2016-01-18 17:33:26 +00:00
Kegan Dougal
0465323ca6
Merge branch 'develop' into kegan/invite-search
2016-01-18 17:31:26 +00:00
manuroe
37e8a35967
Merge pull request #641 from vector-im/push-rules-settings
...
Push rules settings
2016-01-18 18:25:31 +01:00
manuroe
6182c983ab
PushRules settings: Applied review remarks (2/2)
2016-01-18 18:24:53 +01:00
Kegan Dougal
ac4b221690
More CSS fun for border bottom
2016-01-18 17:22:02 +00:00
Kegan Dougal
f1042bd1c4
UI tweaks
2016-01-18 17:21:28 +00:00
manuroe
fdf5b0a4fc
Merge branch 'develop' into push-rules-settings
...
# Conflicts:
# src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
2016-01-18 18:14:20 +01:00
Kegan Dougal
36616a97a1
Add ability to click-to-invite
2016-01-18 17:12:35 +00:00
manuroe
7c0fffa79b
PushRules settings: Applied easy review remarks
2016-01-18 18:07:33 +01:00
manuroe
772470a0ee
Merge pull request #97 from matrix-org/push-rules-settings
...
Push rules settings
2016-01-18 18:02:34 +01:00
manuroe
33edeccb43
Merge branch 'develop' into push-rules-settings
...
# Conflicts:
# src/component-index.js
# src/components/views/rooms/RoomSettings.js
2016-01-18 18:00:41 +01:00
Kegan Dougal
165adde0c8
Use EntityTile for 3PID entities rather than munging MemberTile
2016-01-18 16:55:51 +00:00
Kegan Dougal
c758c0f84f
Add invite button JSX
2016-01-18 16:47:31 +00:00
Kegan Dougal
fef02f2fd1
s/MemberTile/EntityTile/
2016-01-18 16:43:00 +00:00
manuroe
bdcf683942
PushRules settings: Create a dedicated rule for "Messages sent to group".
...
The default fallback rule cannot be used because it matches with too much events.
2016-01-18 16:41:48 +01:00
manuroe
ae14210763
PushRules settings: Put keywords in the right position
2016-01-18 16:31:18 +01:00
manuroe
830160f074
PushRules settings: Enabled all radio buttons of the table.
...
Each rule is described in the code so that if the server does not have it in its default rules or if the user wants to use actions different from the hs one, the code will create a new rule that will override the hs one.
2016-01-18 16:24:06 +01:00
Kegan Dougal
71009d81b6
Factor out common code between MemberTile and UserTile into EntityTile. Use EntityTile.
2016-01-18 15:19:49 +00:00
David Baker
cc3d27bd4b
Merge pull request #98 from matrix-org/message_composer_arrows_keys
...
Fix history scrolling with multiline input
2016-01-18 14:25:57 +00:00
David Baker
880ae0f3fa
Fix typo
2016-01-18 14:25:23 +00:00
David Baker
0ac997491e
Clarify comment
2016-01-18 14:23:31 +00:00
Matthew Hodgson
795d782410
Merge pull request #100 from matrix-org/matthew/roomsettings2
...
Finish off RoomSettings (part 2)
2016-01-18 14:02:27 +00:00
Matthew Hodgson
51648b9bf0
merge develop
2016-01-18 14:02:19 +00:00
Matthew Hodgson
17fdfa0c8f
incorporate kegan PR feedback
2016-01-18 14:00:47 +00:00
Matthew Hodgson
0ef03c5ca4
Merge pull request #653 from vector-im/matthew/roomsettings2
...
Finish off RoomSettings (part 2)
2016-01-18 13:39:55 +00:00
Matthew Hodgson
5a1b0a1dab
Merge pull request #657 from vector-im/matthew/memberlist
...
Fix up MemberList and MemberInfo cosmetics a bit
2016-01-18 13:39:42 +00:00
Matthew Hodgson
9fae4d4ecd
Merge pull request #101 from matrix-org/matthew/memberlist
...
MemberInfo and MemberTile UI/UX fixups
2016-01-18 13:39:29 +00:00
Matthew Hodgson
aa412bed0f
reindent promises as per dave's PR feedback
2016-01-18 13:38:40 +00:00
Matthew Hodgson
d0eedb4faa
merge develop
2016-01-18 13:34:09 +00:00
Kegan Dougal
fd99b260f4
Merge branch 'develop' into kegan/invite-search
2016-01-18 12:07:36 +00:00
Kegan Dougal
77621fe035
Add missing CSS from #638
2016-01-18 12:06:46 +00:00
Kegan Dougal
2a64d0feb3
Merge branch 'develop' into matthew/roomsettings2
2016-01-18 10:49:45 +00:00
Kegsay
6e42d00727
Merge pull request #95 from matrix-org/kegan/base-avatar
...
Factor out common Avatar code
2016-01-18 10:18:04 +00:00
Kegsay
7e40d81a44
Merge pull request #638 from vector-im/kegan/base-avatar
...
CSS for BaseAvatar
2016-01-18 10:17:57 +00:00
Matthew Hodgson
8f83621c4c
hide Mod button for muted users
2016-01-18 01:40:19 +00:00
Matthew Hodgson
6e3245a3b0
make linkify userid jump to memberinfo
2016-01-18 01:26:15 +00:00
Matthew Hodgson
8792be4db2
moar space
2016-01-18 01:25:57 +00:00
Matthew Hodgson
1fef91b82c
MemberInfo lipstick
2016-01-18 01:18:11 +00:00
Matthew Hodgson
8e1ab8e6b4
vaguely skin MemberInfo correctly
2016-01-18 01:18:02 +00:00
