PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
7272 commits 1 branch 0 tags 338 MiB
Commit graph

319 commits

Author SHA1 Message Date
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
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
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
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
Michael Telatynski
5514d81683
Add Mention button to MemberInfo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-24 23:01:40 +01:00
Stefan Parviainen
bc034f3083 Update strings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-24 19:34:32 +02:00
David Baker
8447d15013 Don't include the |other in the translation value 2017-10-24 14:26:30 +01:00
David Baker
f9c45d2c45 Re-run gen-i18n after fixing https://github.com/matrix-org/matrix-react-sdk/pull/1521 2017-10-24 13:40:44 +01:00
Richard Lewis
11d4a63a32 Update text and split across multiple lines. 2017-10-23 23:59:36 +01:00
Richard Lewis
ee60155846 Add delete widget confirmation dialog. 2017-10-23 17:05:44 +01:00
Luke Barnard
a133fd1cf4 Fix "failed to create community" message 2017-10-23 14:57:40 +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
David Baker
f829012045 Fix creation of DM rooms 
The check on whether a new chat was being started as a DM room got
broken, so we weren't using the trusted_private_chat preset or
setting the appropriate DM flags.

Fixes https://github.com/vector-im/riot-web/issues/5318 and
probably https://github.com/vector-im/riot-web/issues/3987
 2017-10-20 10:16:51 +01:00
Luke Barnard
a85a011db9 Fix faulty translation in GroupView 2017-10-19 18:06:32 +01:00
Luke Barnard
d4aac4a69c Merge pull request #1507 from matrix-org/dbkr/groupid_only_enter_localpart 
Group create dialog: only enter localpart
 2017-10-19 17:37:56 +01:00
Luke Barnard
877f213057 Merge pull request #1509 from matrix-org/luke/groups-my-groups 
Improve MyGroups UI
 2017-10-19 17:35:48 +01:00
Luke Barnard
b0f8619754 Improve MyGroups UI 
as per design layed out by @tur2live!
 2017-10-19 17:24:45 +01:00
David Baker
b9574ff382 Group create dialog: only enter localpart 
Since we currently can only create groups on the local server anyway,
there's no point making the user jump through the hoop of forming the
whole group ID and telling them off if they got the server name wrong.
 2017-10-19 16:47:43 +01:00
David Baker
4abaa93cf0 Add clientside error for non-alphanumeric group ID 2017-10-19 16:28:02 +01:00
David Baker
f98fe7fa87 Add warning when adding group rooms/users 2017-10-19 15:37:35 +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
2db0eab5c5 s/Groups/Communities 2017-10-19 11:29:03 +01:00
David Baker
12d6722265 Re-run the fun 2017-10-18 15:48:33 +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
David Baker
e4a3309752 Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque 
Modify GroupView UI
 2017-10-16 10:17:44 +01:00
Matthew Hodgson
2b367edccf Merge pull request #1439 from turt2live/travis/pinned_messages 
Message/event pinning
 2017-10-15 01:03:18 +01:00
Matthew Hodgson
e57d9e686b Merge branch 'develop' into t3chguy/jump_to_rr 2017-10-14 23:45:17 +01:00
Matthew Hodgson
f32ba0b54c Merge pull request #1462 from pafcu/translation-fixes 
Use standard subsitution syntax in _tJsx
 2017-10-14 23:43:12 +01:00
Travis Ralston
8a641c7173 Hide message pinning behind a labs setting 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:40:10 -06:00
Travis Ralston
c34b55c6c7 Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:10:32 -06:00
Matthew Hodgson
9f64261707 Merge branch 'develop' into travis/alone_warning 2017-10-14 22:43:36 +01:00
Matthew Hodgson
3efa0d2a76 Merge pull request #1478 from turt2live/travis/unset-avatar 
Buttons to remove room/self avatar
 2017-10-14 22:13:32 +01:00
Michael Telatynski
c1edc0c32e
add option to disable BigEmoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 19:40:45 +01:00
Travis Ralston
97ebd27175 Add missing translation 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 23:08:41 -06:00
Luke Barnard
83e7fc242a Merge branch 'develop' into luke/groups-room-directory-esque 2017-10-13 17:48:35 +02:00