c8a489ca77
Merge pull request #1541 from matrix-org/luke/groups-only-show-settings-icon-to-members
...
Only show group settings cog to members
2017-10-26 14:52:16 +01:00
9643784f85
Only show group settings cog to members
...
Non-members have no settings to change.
2017-10-26 14:31:27 +01:00
c5c74749b7
Merge remote-tracking branch 'origin/develop' into develop
2017-10-26 13:23:11 +00:00
1012d118fe
Merge pull request #1540 from matrix-org/luke/fix-dark-theme-cancel-icon
...
Use correct icon for group room deletion and make themeable
2017-10-26 14:23:06 +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
8a9750bccb
Translated using Weblate (Russian)
...
Currently translated at 100.0% (910 of 910 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-26 10:44:03 +00:00
d3af886093
Merge remote-tracking branch 'origin/develop' into develop
2017-10-26 10:35:49 +00: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
3a8b036687
Translated using Weblate (Russian)
...
Currently translated at 100.0% (909 of 909 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-26 10:17:25 +00:00
8fdc0432b0
Merge remote-tracking branch 'origin/develop' into develop
2017-10-26 09:36:11 +00:00
93008272dd
Translated using Weblate (Russian)
...
Currently translated at 100.0% (908 of 908 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-26 09:36:11 +00:00
d0ba79996f
Translated using Weblate (German)
...
Currently translated at 99.8% (907 of 908 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-26 09:36:10 +00:00
bf4289632b
Merge pull request #1539 from matrix-org/luke/feature-optionally-mirror-local-video
...
Add option to mirror local video feed
2017-10-26 10:36:03 +01:00
591a7f4b86
Default to false
2017-10-26 10:06:04 +01:00
97b9cf6402
Actually use the synced setting
2017-10-26 09:58:46 +01:00
e6c3483c8b
Add correct telegram link
2017-10-26 09:58:05 +01:00
5c32b5b11a
fix i18n
2017-10-26 02:10:03 +01:00
deb0f902e3
linting
2017-10-26 01:59:18 +01:00
1237de3ef0
Merge branch 'develop' into matthew/status
2017-10-26 01:47:22 +01:00
5a9dae5ff1
use generic 'text button' for delete buttons in UserSettings
2017-10-26 01:44:05 +01:00
ac7a94afb2
apply theme tint at launch
2017-10-26 01:43:42 +01:00
b3a8593468
make tinter coarsely theme aware
2017-10-25 22:48:27 +01:00
935e6baf88
Translated using Weblate (Russian)
...
Currently translated at 100.0% (908 of 908 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-25 17:52:03 +00:00
24000ee456
Re-add i18n for labs
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:23:04 -06:00
e773585a02
Merge remote-tracking branch 'matrix-org/develop' into travis/presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:21:39 -06:00
5c9970950b
Undo i18n change to make merge easier
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:21:12 -06:00
3ae97348f8
Add option to mirror local video feed
2017-10-25 18:17:33 +01:00
a382834e56
Merge remote-tracking branch 'origin/develop' into develop
2017-10-25 16:47:29 +00:00
841e274b07
Translated using Weblate (German)
...
Currently translated at 99.8% (906 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-25 16:47:28 +00:00
9b93804afa
Translated using Weblate (Czech)
...
Currently translated at 60.1% (546 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-10-25 16:47:28 +00:00
4cfbd66729
Merge pull request #1538 from matrix-org/luke/fix-redaction-sender-tooltip
...
Use the correct userId when displaying who redacted a message
2017-10-25 17:47:22 +01:00
cedc0b27a9
Handle redaction with no sender
2017-10-25 17:37:20 +01:00
5990e41bd7
Use the correct userId when displaying who redacted a message
2017-10-25 17:24:45 +01:00
53e983f9c7
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-25 18:19:27 +02:00
45632b4191
Translated using Weblate (Russian)
...
Currently translated at 100.0% (907 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-25 15:48:44 +00:00
fd7e057ec0
Merge branch 'develop' into t3chguy/invite_in_memberinfo
2017-10-25 16:33:50 +01:00
f8229b7d59
Merge remote-tracking branch 'origin/develop' into develop
2017-10-25 14:52:56 +00:00
8ed3474b64
Merge pull request #1529 from matrix-org/luke/fix-can-edit-editable-item-lists
...
Only show editing UI for aliases/related_groups for users /w power
2017-10-25 15:52:51 +01:00
379dbe2ff5
Merge remote-tracking branch 'origin/develop' into develop
2017-10-25 14:47:22 +00:00
39fa866d68
Merge pull request #1535 from matrix-org/luke/fix-interactable-greyed-ui
...
Swap from `ui_opacity` to `panel_disabled`
2017-10-25 15:47:18 +01:00
b1f2a6c1e9
Dramatically simplify use of mx_fadable
...
by applying it to parent elements of things that need to be faded.
2017-10-25 15:15:49 +01:00
9149475f1d
Merge remote-tracking branch 'origin/develop' into develop
2017-10-25 13:25:55 +00:00
19364c25ee
Merge pull request #1536 from matrix-org/luke/fix-room-address-picker-default-name
...
Fix room address picker tiles default name
2017-10-25 14:25:51 +01:00
0592f36d2b
Merge remote-tracking branch 'origin/develop' into develop
2017-10-25 13:10:06 +00:00
fbe0cc4927
Merge pull request #1531 from matrix-org/t3chguy/hide_level_change_on_50
...
T3chguy/hide level change on 50
2017-10-25 14:09:59 +01:00
feff4e85d4
Merge remote-tracking branch 'origin/develop' into develop
2017-10-25 13:07:34 +00:00
813d0cd64c
Merge pull request #1537 from matrix-org/t3chguy/missing_date_sep
...
fix missing date sep caused by hidden event at start of day
2017-10-25 14:07:28 +01:00
f3c8951d4e
remove unused lastPresenceTs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-25 12:56:23 +01:00
1bbc26a27f
fix missing date sep caused by hidden event at start of day
...
if first event in day was hidden, the date sep would go missing as the next event would compare its date to the hidden one instead of the one before it
due to naive N-1 check rather than a previous valid event comparison, now fixed by comparing date against the first event in MELS instead.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-25 12:52:51 +01:00
27f845a7aa
Match on any alias
2017-10-25 12:42:58 +01:00
David Baker