7118f7a38f
gen-18n
2017-11-29 18:41:08 +00:00
1c71983610
Implement UI for using bulk device deletion API
2017-11-28 15:32:40 +00:00
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
d4f5e7e6d7
Deal with errors, lack of groups, loading
2017-11-28 10:46:20 +00:00
8be3862e68
Merge branch 'master' into develop
2017-11-28 10:29:40 +00:00
9ed9422af8
Move group publication toggles to UserSettings
2017-11-27 17:24:42 +00:00
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
e07c7e404e
Merge pull request #1632 from matrix-org/luke/rename-related-communities
...
Rename Related Groups to improve readability
2017-11-27 14:34:02 +00:00
3635997090
Rename Related Groups to improve readability
2017-11-27 14:13:44 +00:00
df921438f3
Make PresenceLabel more easily translatable
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-16 18:36:54 +01:00
f62b04c3be
Merge branch 'develop' into travis/granular_bugs
2017-11-16 13:12:03 +00:00
d0a0a9ce7f
Fix URL preview string not being translated
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 22:33:23 -07:00
2c1618bc10
Fix conflict and update strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:40:51 +01:00
bd4102eb3d
Merge branch 'develop' into travis/granular-settings
2017-11-14 19:12:48 -07:00
f05958e334
Merge pull request #1482 from turt2live/travis/presence
...
Implement user-controlled presence
2017-11-14 23:53:16 +00:00
12d9f05883
Merge branch 'develop' into luke/fix-restrict-power-level-options
2017-11-14 13:08:31 +00:00
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
63bebe9dfd
Split out avatar and display name hiding
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 12:58:10 -07:00
0648b3eae7
Merge branch 'develop' into travis/granular-settings
2017-11-13 12:29:36 -07:00
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
2827bc0718
replace some of the status.im theme with general config options
2017-11-11 23:46:43 +00:00
030633fa90
Merge remote-tracking branch 'matrix-org/develop' into travis/granular-settings
2017-11-08 17:43:38 -07:00
e729bc431d
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-08 04:29:52 -08:00
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
289b0c2b6a
Merge branch 'develop' into travis/granular-settings
2017-11-07 14:55:12 -07:00
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
edc744067f
Add checkbox to GroupAddressPicker for determining visibility of group rooms
2017-11-07 18:51:41 +00:00
62305a1ccd
Implement tooltip for group rooms
2017-11-07 14:07:31 +00:00
9019fee49e
Adjust long desc placeholder text
2017-11-07 10:48:56 +00:00
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
137f1311b3
Add useful placeholder for the long description textarea
2017-11-06 18:35:23 +00:00
893c39bfbe
Merge branch 'develop' into travis/granular-settings
2017-11-03 22:00:07 -06:00
6747390333
merge
2017-11-03 15:12:24 +00:00
49ee78dab1
Merge remote-tracking branch 'origin/develop' into dbkr/composer_at_room_pills
2017-11-03 14:39:52 +00:00
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
112c74a255
Add NotifProvider to offer @room as a completion
2017-11-02 18:54:25 +00:00
982e87e01c
Communities are communities, wrap div for label alignment
2017-11-02 15:04:40 +00:00
bf77b51b5e
Merge branch 'develop' into luke/groups-room-publicity
2017-11-02 13:39:33 +00:00
790db94fd7
Add toggle to alter the visibility of a room-group association
2017-11-02 13:31:11 +00:00
e909d859ab
Merge branch 'develop' into luke/groups-room-info
2017-11-02 10:56:33 +00:00
80f79e6b84
Generate translations
2017-11-01 17:58:45 +00:00
64d8c81897
Merge branch 'develop' into matthew/status
2017-11-01 15:24:30 +00:00
d6f1e12bee
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 15:50:45 +01:00
f53a12d904
Generate en_EN translations
2017-10-31 10:25:48 +00:00
f44622b3d8
i18n for URL previews
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 21:50:22 -06:00
858c3a2548
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-10-27 18:59:57 +01:00
95b2392104
Merge branch 'develop' into departify
2017-10-27 19:23:13 +02:00
1d5b4a9d50
Merge branch 'develop' into t3chguy/mention_user
2017-10-26 18:10:10 +01:00
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
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
Luke Barnard