lukebarnard
9ed9422af8
Move group publication toggles to UserSettings
2017-11-27 17:24:42 +00:00
Matthew Hodgson
f62b04c3be
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:12:03 +00:00
Travis Ralston
d0a0a9ce7f
Fix URL preview string not being translated
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:33:23 -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
Travis Ralston
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
Matthew Hodgson
f05958e334
Merge pull request #1482 from turt2live/travis/presence
...
Implement user-controlled presence
2017-11-14 23:53:16 +00:00
Luke Barnard
12d9f05883
Merge branch 'develop' into luke/fix-restrict-power-level-options
2017-11-14 13:08:31 +00:00
Luke Barnard
c3492634bd
Merge branch 'luke/fix-member-info-power-level-display' into luke/fix-restrict-power-level-options
2017-11-14 12:41:36 +00: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
Luke Barnard
52af7a7659
Attempt to clarify the affect that the users_default has on power levels
...
This modifies displayed power levels such that:
- If users_default is !== 0:
- the power level 0 is displayed as "Restricted (0)"
- the power level users_default is displayed as "Default ({users_default})"
- Otherwise:
- the power level 0 is displayed as "Default (0)"
When changing users_default, to say, 10, when the textual powers are rendered
again, they will take users_default into account. So those previously at 10
and which would have previously have been rendered "Custom of 10" will now
read "Default (10)". Conversely, those that were "Default (0)" will now read
"Restricted (0)".
2017-11-13 17:03: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
Travis Ralston
030633fa90
Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings
2017-11-08 17:43:38 -07:00
Matthew Hodgson
e729bc431d
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-08 04:29:52 -08: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
edc744067f
Add checkbox to GroupAddressPicker for determining visibility of group rooms
2017-11-07 18:51:41 +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
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
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
49ee78dab1
Merge remote-tracking branch 'origin/develop' into dbkr/composer_at_room_pills
2017-11-03 14:39:52 +00:00
Luke Barnard
151f9917b1
Fix group invites such that they look similar to room invites
...
- Change GroupInviteTile to use RoomTile CSS
- Give group invites their own sub list, with heading "Community Invites"
2017-11-03 12:19:37 +00:00
David Baker
112c74a255
Add NotifProvider to offer @room as a completion
2017-11-02 18:54:25 +00:00
Luke Barnard
982e87e01c
Communities are communities, wrap div for label alignment
2017-11-02 15:04:40 +00:00
Luke Barnard
bf77b51b5e
Merge branch 'develop' into luke/groups-room-publicity
2017-11-02 13:39:33 +00:00
Luke Barnard
790db94fd7
Add toggle to alter the visibility of a room-group association
2017-11-02 13:31:11 +00:00
Luke Barnard
e909d859ab
Merge branch 'develop' into luke/groups-room-info
2017-11-02 10:56:33 +00:00
Luke Barnard
80f79e6b84
Generate translations
2017-11-01 17:58:45 +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
f53a12d904
Generate en_EN translations
2017-10-31 10:25:48 +00:00
Travis Ralston
f44622b3d8
i18n for URL previews
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 21:50:22 -06:00
David Baker
858c3a2548
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-10-27 18:59:57 +01:00
Stefan Parviainen
95b2392104
Merge branch 'develop' into departify
2017-10-27 19:23:13 +02:00
Michael Telatynski
1d5b4a9d50
Merge branch 'develop' into t3chguy/mention_user
2017-10-26 18:10:10 +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
David Baker
5871a74228
Merge pull request #1534 from matrix-org/t3chguy/invite_in_memberinfo
...
Add invite button to MemberInfo if user has left or wasn't in room
2017-10-26 11:35:45 +01:00
Matthew Hodgson
5c32b5b11a
fix i18n
2017-10-26 02:10:03 +01:00
Matthew Hodgson
1237de3ef0
Merge branch 'develop' into matthew/status
2017-10-26 01:47:22 +01:00
Travis Ralston
24000ee456
Re-add i18n for labs
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:23:04 -06:00
Luke Barnard
3ae97348f8
Add option to mirror local video feed
2017-10-25 18:17:33 +01:00
Luke Barnard
cedc0b27a9
Handle redaction with no sender
2017-10-25 17:37:20 +01:00
Stefan Parviainen
53e983f9c7
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-25 18:19:27 +02:00
Michael Telatynski
fd7e057ec0
Merge branch 'develop' into t3chguy/invite_in_memberinfo
2017-10-25 16:33:50 +01:00
Richard Lewis
fd85c74bc5
Merge pull request #1520 from matrix-org/rxl881/deleteWidget
...
Add a delete confirmation dialog for widgets
2017-10-25 10:45:52 +01:00
Michael Telatynski
b3463146ba
Add invite button to MemberInfo if user has left or wasn't in room
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-25 01:00:13 +01:00
