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

7688 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bamstam
955362ee2d Translated using Weblate (German) 
Currently translated at 99.4% (929 of 934 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-15 01:01:24 +00:00
Weblate
247df92f17 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 23:53:21 +00:00
Matthew Hodgson
f05958e334
Merge pull request #1482 from turt2live/travis/presence 
Implement user-controlled presence
 2017-11-14 23:53:16 +00:00
Szimszon
3a6e89584c Translated using Weblate (Hungarian) 
Currently translated at 100.0% (933 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-11-14 20:33:16 +00:00
Weblate
26e5271d81 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 20:20:37 +00:00
Richard Lewis
bd8caebe41
Merge pull request #1609 from matrix-org/rxl881/editIcon 
Edit widget icon styling
 2017-11-14 20:20:32 +00:00
Richard Lewis
58966c5c3d Make edit icon green by default 2017-11-14 19:53:59 +00:00
Richard Lewis
e87940f63c Make app tile title stronger 2017-11-14 19:53:32 +00:00
Weblate
4c4220e9dd Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 16:07:56 +00:00
Matthew Hodgson
7c98558b6a fix neglible race when loading CSS 2017-11-14 16:07:48 +00:00
Weblate
869a2d158f Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 16:04:19 +00:00
Matthew Hodgson
1fd7ac30e4 turns out i made up the .complete property on link elements 2017-11-14 16:04:11 +00:00
Weblate
299a32fa98 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 15:37:12 +00:00
Matthew Hodgson
8d6e3dd27d fix lint 2017-11-14 15:37:03 +00:00
Weblate
54b430c465 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 15:28:42 +00:00
Matthew Hodgson
dcfbe93409 fix race when loading CSS 
fixes https://github.com/vector-im/riot-web/issues/5590
 2017-11-14 15:28:34 +00:00
Matthew Hodgson
805796e4e0 force the tinter to refresh when we change theme 2017-11-14 15:27:28 +00:00
Weblate
72754cf49c Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 15:17:59 +00:00
Peter Vágner
07addbe1e0 Translated using Weblate (Slovak) 
Currently translated at 99.7% (931 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2017-11-14 15:17:58 +00:00
Bamstam
eb2d5d0ac5 Translated using Weblate (German) 
Currently translated at 99.4% (928 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-14 15:17:58 +00:00
Matthew Hodgson
8c218557df fix disable_custom_urls 2017-11-14 15:17:50 +00:00
Weblate
d6de8b8d58 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 14:27:34 +00:00
Peter Vágner
1038e44672 Translated using Weblate (Slovak) 
Currently translated at 99.7% (931 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2017-11-14 14:27:34 +00:00
Bamstam
20beb7990f Translated using Weblate (German) 
Currently translated at 99.4% (928 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-14 14:27:33 +00:00
Matthew Hodgson
b58514f427 Stop FF quantum exploding on CSS edits 2017-11-14 14:27:27 +00:00
Kévin C
64958d05b9 Translated using Weblate (French) 
Currently translated at 100.0% (933 of 933 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-11-14 14:18:25 +00:00
Weblate
c1d70f28d7 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 14:05:54 +00:00
Peter Vágner
3d677d84fe Translated using Weblate (Slovak) 
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2017-11-14 14:05:54 +00:00
Luke Barnard
c644e7d673
Merge pull request #1607 from matrix-org/luke/fix-restrict-power-level-options 
Attempt to improve textual power levels
 2017-11-14 14:05:50 +00:00
Peter Vágner
9d19496011 Translated using Weblate (Slovak) 
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2017-11-14 13:23:15 +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
3fa1bece0a Simplify further 
Also fix not-i18n-friendly "of" to be "=".
 2017-11-14 13:06:54 +00:00
Weblate
61ee39b3b2 Merge remote-tracking branch 'origin/develop' into develop 2017-11-14 12:43:00 +00:00
Andrey
85f002b21c Translated using Weblate (Russian) 
Currently translated at 98.4% (918 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-11-14 12:43:00 +00:00
David Baker
e7c99a71b6
Merge pull request #1606 from matrix-org/luke/fix-member-info-power-level-display 
Determine whether power level is custom once Roles have been determined
 2017-11-14 12:42:55 +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
Luke Barnard
d2ef6bffa8 Remove reverseRoles 
This variable seemed redundant in hindsight, it seemed better to remove it than to worry about where it went in the component.
 2017-11-14 12:02:37 +00:00
Kévin C
acd2be4b68 Translated using Weblate (French) 
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-11-14 10:53:57 +00:00
Szimszon
6c8283b3a8 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (932 of 932 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-11-14 06:41:28 +00:00
Weblate
a44d717783 Merge remote-tracking branch 'origin/develop' into develop 2017-11-13 19:22:39 +00:00
Bamstam
beebe6b92b Translated using Weblate (German) 
Currently translated at 100.0% (928 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-13 19:22:38 +00:00
Matthew Hodgson
ddd230d798
Merge pull request #1605 from matrix-org/matthew/status 
Status.im theme
 2017-11-13 19:22:34 +00: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
Krombel
a97f530999 Translated using Weblate (German) 
Currently translated at 100.0% (928 of 928 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-13 14:05:02 +00:00
Luke Barnard
88010fa26c Determine whether power level is custom once Roles have been determined 
Instead of potentially inspecting an empty {} before mounting.

This fixes an issue where "Custom of N" would appear on the first mount of MemberInfo - part of https://github.com/vector-im/riot-web/issues/5107#issuecomment-331882294
 2017-11-13 11:57:34 +00:00
Matthew Hodgson
ca531f83d2 remove needless case-squash on login, castrating https://github.com/matrix-org/matrix-react-sdk/pull/1550 2017-11-13 10:34:38 +00:00
Matthew Hodgson
6942e94394 unbreak tests 2017-11-12 00:00:46 +00:00
Matthew Hodgson
46387e135e
Merge branch 'develop' into matthew/status 2017-11-11 23:50: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
Weblate
25a1dccffc Merge remote-tracking branch 'origin/develop' into develop 2017-11-11 16:08:33 +00:00