nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
62,959 Commits 258 Branches 582 Tags
f52d7a8e207301ac62497ca7cd25bf64b6834d81
Commit Graph

62959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Barnard
5544270bc4 Merge pull request #5131 from vector-im/luke/groups-button 
Add button to get to MyGroups
 2017-09-29 11:00:29 +01:00
Luke Barnard
0a53630806 Merge pull request #1435 from matrix-org/luke/groups-button 
Add button to get to MyGroups (view_my_groups or path #/groups)
 2017-09-29 11:00:22 +01:00
Luke Barnard
c8b2158156 Lint 2017-09-29 10:42:23 +01:00
Luke Barnard
47919bc291 Honour the Groups feature flag 2017-09-29 10:39:49 +01:00
Luke Barnard
18e0d8da86 Rename Flair feature to Groups 2017-09-29 10:27:40 +01:00
Szimszon
412affefb9 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2017-09-29 05:11:34 +00:00
Luke Barnard
739ddb8410 Merge branch 'develop' into luke/groups-button 2017-09-28 12:11:26 +01:00
Luke Barnard
6a988a0d08 Merge pull request #1436 from matrix-org/luke/lint-jsx-curly-spacing 
Add eslint rule to disallow spaces inside of curly braces
 2017-09-28 12:09:46 +01:00
Luke Barnard
07b6040c39 Update travis script to use lintwithexclusions 2017-09-28 11:33:36 +01:00
Luke Barnard
f3d155b62c Merge pull request #1437 from matrix-org/lukebarnard1-patch-fix-inviting 
Fix ability to invite existing mx users
 2017-09-28 11:27:07 +01:00
Weblate
e2b7ff3675 Merge remote-tracking branch 'origin/develop' into develop 2017-09-28 10:26:58 +00:00
Luke Barnard
bb64e9a18b Merge pull request #5137 from vector-im/luke/fix-header-button-key-prop-warning 
Remove `key` prop pass-thru on HeaderButton
 2017-09-28 11:26:54 +01:00
Luke Barnard
010b8d8be6 Merge branch 'luke/lint-jsx-curly-spacing' of github.com:matrix-org/matrix-react-sdk into luke/lint-jsx-curly-spacing 2017-09-28 11:23:19 +01:00
Luke Barnard
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
Luke Barnard
3c99b2af3d Fix ability to invite existing mx users 
Bug introduced by https://github.com/matrix-org/matrix-react-sdk/pull/1432

We should really not be using string constant literals all over the place. 
We'd be less likely to run into this sort of bug these address types weren't copied literals.
 2017-09-28 10:55:09 +01:00
Luke Barnard
e70336af11 Add rule to enforce JSX tag spacing 2017-09-28 10:27:03 +01:00
Luke Barnard
1699c37fcf Merge pull request #1434 from matrix-org/luke/fix-address-picker-error-message 
Construct address picker message using provided `validAddressTypes`
 2017-09-28 10:08:36 +01:00
Luke Barnard
6eedf8b073 Add eslint rule to disallow spaces inside of curly braces 2017-09-28 10:06:51 +01:00
Luke Barnard
e9cf25f946 Remove "You have entered an invalid contact..." from translations 2017-09-28 10:06:51 +01:00
Luke Barnard
38fdd155f0 Construct address picker message using provided validAddressTypes 2017-09-28 10:06:51 +01:00
Luke Barnard
c7728bd9ad Add eslint rule to disallow spaces inside of curly braces 2017-09-28 10:02:40 +01:00
Luke Barnard
f9a92ad15a Lint 2017-09-28 10:02:16 +01:00
Luke Barnard
ce13837216 Remove key prop pass-thru on HeaderButton 
This is redundant and throws a warning
 2017-09-28 09:46:10 +01:00
Carlos
26ce62250b Translated using Weblate (Portuguese) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt/
 2017-09-28 00:31:27 +00:00
Stefan Parviainen
25cf115533 Update docs with _td() and some other recommendations 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-27 22:01:56 +02:00
Luke Barnard
1f66baca4b Remove "You have entered an invalid contact..." from translations 2017-09-27 17:55:09 +01:00
Luke Barnard
9c86a655ca Add button to get to MyGroups 2017-09-27 17:46:53 +01:00
Luke Barnard
929c8627d3 Add button to get to MyGroups (view_my_groups or path #/groups) 2017-09-27 17:45:49 +01:00
Luke Barnard
3a8bfbf7e0 Construct address picker message using provided validAddressTypes 2017-09-27 17:11:30 +01:00
Luke Barnard
19e4e245c2 Merge pull request #1433 from matrix-org/luke/fix-groups-summary-rooms-with-no-avatar 
Fix GroupView summary rooms displaying without avatars
 2017-09-27 16:34:03 +01:00
Luke Barnard
ac76154518 Merge pull request #1432 from matrix-org/luke/groups-add-rooms-by-id 
Implement adding rooms to a group (or group summary) by room ID
 2017-09-27 16:20:32 +01:00
Luke Barnard
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
Luke Barnard
d52355f80e Implement adding rooms to a group (or group summary) by room ID 2017-09-27 15:30:58 +01:00
David Baker
2d8bc783b0 Merge pull request #1431 from matrix-org/luke/feature-flair-tooltip 
Give flair avatars a tooltip = the group ID
 2017-09-27 14:44:25 +01:00
Luke Barnard
3d30cc3733 Merge pull request #1430 from matrix-org/luke/groups-fix-feature-self 
Fix ability to feature self in a group summary
 2017-09-27 14:43:50 +01:00
Luke Barnard
f528e147e3 Give flair avatars a tooltip = the group ID 2017-09-27 14:36:22 +01:00
Weblate
1d5f2bec65 Merge remote-tracking branch 'origin/develop' into develop 2017-09-27 13:15:32 +00:00
Luke Barnard
1740319b7a Add margin to flair avatars to separate them 2017-09-27 14:15:21 +01:00
Luke Barnard
e3405cfd95 shouldOmitSelf -> includeSelf 2017-09-27 11:52:05 +01:00
Luke Barnard
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
Riot Administration
540885474a Translated using Weblate (English (United States)) 
Currently translated at 99.6% (852 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/

<<<i>>>>xss
 2017-09-27 09:36:53 +00:00
Luke Barnard
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
Weblate
fb344bc606 Merge remote-tracking branch 'origin/develop' into develop 2017-09-27 09:32:13 +00:00
Luke Barnard
2adf08dee0 CSS for GroupView: align "save"/"cancel" buttons in settings 2017-09-27 10:31:35 +01:00
Stefan Parviainen
35cb52febc Fix merge conflict 2017-09-27 08:41:37 +02:00
Jeff Huang
fcd4a1c7c6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
 2017-09-27 06:30:53 +00:00
Riot Administration
6bbf751f4b Translated using Weblate (English (United States)) 
Currently translated at 99.5% (851 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2017-09-27 02:37:22 +00:00
Roger Pueyo Centelles
42840c1e3c Translated using Weblate (Catalan) 
Currently translated at 52.9% (118 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2017-09-27 00:09:20 +00:00
Andrey
c99299ab6f Translated using Weblate (Russian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2017-09-26 17:22:52 +00:00
Weblate
e446f50618 Merge remote-tracking branch 'origin/develop' into develop 2017-09-26 17:16:02 +00:00