Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,618 Commits 3 Branches 492 Tags 100 MiB
675bebee33
Commit Graph

3706 Commits

Author SHA1 Message Date
Richard Lewis
d7ceddfe61 Revert unintended merge commit. 2017-11-10 21:43:34 +00:00
Richard Lewis
42bb54b202 Set widget menu bar background colour. 2017-11-10 21:41:35 +00:00
Richard Lewis
7a42e844d1 Remove unused styling. 2017-11-10 20:16:32 +00:00
Richard Lewis
43fb359d8f Vertically align menu bar items. 2017-11-10 20:12:30 +00:00
Richard Lewis
31e0cde900 Improve hover border. 2017-11-10 20:12:12 +00:00
Richard Lewis
53143cb033 Center icons in menu bar. 2017-11-10 17:26:57 +00:00
Richard Lewis
7eeb7babc4 White edit icon (to avoid having to use css filters to invert). 2017-11-10 17:26:33 +00:00
Richard Lewis
883ec159e2 Add yellow warning triangle image. 2017-11-10 17:25:56 +00:00
Weblate
1b21b8cce2 Merge remote-tracking branch 'origin/develop' into develop 2017-11-10 16:24:25 +00:00
Richard Lewis
83373bcf6e Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/visualCue 2017-11-10 16:22:33 +00:00
Richard Lewis
29abb5eed0 Center mixed content warnings in panel. 2017-11-10 16:15:31 +00:00
Luke Barnard
277a6dee10 Make groups a fully-fleged baked-in feature 2017-11-10 15:38:50 +00:00
Tong Hui
71d0ecf37d Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
 2017-11-10 14:14:56 +00:00
Richard Lewis
cf1beb1d94 Fix right marign. 2017-11-10 00:16:41 +00:00
Richard Lewis
bfa4f59f3d Lint space. 2017-11-09 22:47:23 +00:00
Richard Lewis
63f520b5ee Fix app tile margins. 2017-11-09 22:45:35 +00:00
Luke Barnard
a0b0b6f053
Merge pull request #5549 from vector-im/rxl881/roomTopic 
Fix wrapping of long room topics (and overlap with apps)
 2017-11-09 17:40:55 +00:00
Luke Barnard
88cd46bfcf
Merge pull request #5555 from vector-im/rxl881/widgetrendering 
Don't display widget iframes whilst loading.
 2017-11-09 17:36:56 +00:00
Peter Vágner
1f524f3085 Translated using Weblate (Slovak) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
 2017-11-09 16:49:31 +00:00
bldrzzy
405504dca4 Translated using Weblate (Polish) 
Currently translated at 98.6% (214 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
 2017-11-09 16:49:31 +00:00
Marek Suchánek
2bb13fba7e Translated using Weblate (Czech) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-11-09 15:53:39 +00:00
Richard Lewis
d45940f204 Don't display widget iframes whilst loading. 2017-11-09 10:02:00 +00:00
Xose M
81b085fbb8 Translated using Weblate (Galician) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
 2017-11-09 06:21:33 +00:00
Jeff Huang
910a5f7e6c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
 2017-11-08 22:56:35 +00:00
Richard Lewis
092ec1cc6c Prevent long topics from overflowing fixed height header. 2017-11-08 20:03:35 +00:00
Richard Lewis
106430f7b6 Move margin to AppTile elements so that it is only present with app tiles. 
Comment unused classes.
 2017-11-08 19:48:53 +00:00
Richard Lewis
76570a0f14 Make long topics overflow in to a second, hidden column. 2017-11-08 17:02:17 +00:00
Richard Lewis
e7fbad2236 Increase height to avoid content from overflowing (mx_RoomHeader_name.height + mx_RoomHeader_topic.max-height) 2017-11-08 16:44:45 +00:00
Matthew Hodgson
2fa1f16284 use new theme-aware tinter api 2017-11-08 06:55:30 -08:00
Matthew Hodgson
d4128af224 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-08 04:29:44 -08:00
Peter Vágner
e90419e40d Translated using Weblate (Slovak) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
 2017-11-08 12:11:57 +00:00
Peter Vágner
16991a8f68 Added translation using Weblate (Slovak) 2017-11-08 12:10:20 +00:00
Weblate
b788e759da Merge remote-tracking branch 'origin/develop' into develop 2017-11-08 10:24:01 +00:00
Luke Barnard
3ee45b21b8
Merge pull request #5543 from vector-im/luke/groups-inviter-profile 
Adjust CSS for GroupView
 2017-11-08 10:23:57 +00:00
Weblate
8af90b052b Merge remote-tracking branch 'origin/develop' into develop 2017-11-08 10:04:44 +00:00
Luke Barnard
60de1dbffb
Merge pull request #5546 from vector-im/luke/groups-add-rooms-with-visibility 
CSS for adding rooms to a group with visibility
 2017-11-08 10:04:38 +00:00
Weblate
38b5b27aa9 Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 18:52:43 +00:00
Luke Barnard
26d9677bbe CSS for adding rooms to a group with visibility 
Also, make chat invite error looks slightly more normal
 2017-11-07 18:49:28 +00:00
Travis Ralston
beddf3a2cb
Get rid of accidental merge stuff 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-07 11:05:29 -07:00
Travis Ralston
144cbd144e
Merge branch 'develop' into travis/more-pinned-css 2017-11-07 11:04:22 -07:00
Luke Barnard
1bdc666197 Adjust CSS for GroupView 
Part of showing the group inviter profile: https://github.com/matrix-org/matrix-react-sdk/pull/1585
 2017-11-07 16:43:02 +00:00
Weblate
a72cc77e24 Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 15:54:51 +00:00
Krombel
4c22f9a549 Translated using Weblate (German) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-11-07 15:54:50 +00:00
Luke Barnard
4c0e956cc1 Name things in a sane way 2017-11-07 15:13:17 +00:00
Luke Barnard
e1d16acddb Implement general-purpose tooltip "(?)"-style 2017-11-07 14:09:04 +00:00
Krombel
a45ae588e5 Translated using Weblate (German) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-11-07 13:34:54 +00:00
Weblate
c8edaf1ba9 Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 10:44:07 +00:00
Luke Barnard
aa4feb0563 Info plinth CSS variables 2017-11-06 18:57:08 +00:00
Luke Barnard
d87d6cbc64 CSS for improving group creation UX, namely setting long description 2017-11-06 18:38:47 +00:00
Weblate
3633f55e20 Merge remote-tracking branch 'origin/develop' into develop 2017-11-06 15:49:46 +00:00
Luke Barnard
a8bdde9f55
Merge pull request #5531 from vector-im/dbkr/composer_at_room_pills 
CSS for room notif pills in composer
 2017-11-06 15:49:41 +00:00
David Baker
e1eba559fe CSS for room notif pills in composer 2017-11-06 15:12:28 +00:00
Weblate
01401fe4f8 Merge remote-tracking branch 'origin/develop' into develop 2017-11-06 14:10:32 +00:00
Walter
ba1ab9bdd1 Translated using Weblate (Ukrainian) 
Currently translated at 99.5% (216 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
 2017-11-06 14:10:32 +00:00
Bamstam
25782404d4 Translated using Weblate (German) 
Currently translated at 98.6% (214 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-11-06 14:10:32 +00:00
Luke Barnard
cd26f63315 Do not init a group store when no groupId specified 
(in RightPanel), otherwise the store will happily send requests to the server for the `undefined` group.
 2017-11-06 10:16:03 +00:00
Szimszon
68bb61d281 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2017-11-05 18:49:35 +00:00
Travis Ralston
63607f29e7 Use SettingsStore for notification settings 
Signed-off-by: Travis Ralstron <travpc@gmail.com>
 2017-11-04 22:27:34 -07:00
Matthew Hodgson
d14285eb08 fix secondary accent color tinting 2017-11-05 02:20:12 +00:00
Matthew Hodgson
555847e5e9 make default theme actually work 2017-11-05 00:40:13 +00:00
Matthew Hodgson
816042d3a8 Merge branch 'develop' into matthew/status 2017-11-04 23:51:20 +00:00
Matthew Hodgson
9a0bbfb871 tint the colours in the theme rather than hardcode vector green 2017-11-04 23:43:34 +00:00
Matthew Hodgson
adedf23cfb remove unnamespaced CSS fail 2017-11-04 22:19:06 +00:00
Andrey
b4b4fefffb Translated using Weblate (Russian) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2017-11-04 08:11:22 +00:00
Kévin C
2b49b68ba5 Translated using Weblate (French) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2017-11-04 07:26:28 +00:00
Travis Ralston
69939e2fe3 Merge branch 'develop' into travis/granular 2017-11-03 21:56:46 -06:00
Travis Ralston
5a1498dec3 CSS for pinned indicators 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-03 20:01:54 -06:00
Weblate
441aa91831 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 23:10:35 +00:00
Matthew Hodgson
31c5122fa6
Merge pull request #5293 from turt2live/travis/pinned-led-css 
CSS for new pinned events indicator
 2017-11-03 23:10:31 +00:00
Weblate
f290569487 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 23:10:05 +00:00
Matthew Hodgson
c0b343c89f
Merge pull request #5471 from vector-im/t3chguy/devtools-1 
T3chguy/devtools 1
 2017-11-03 23:10:00 +00:00
Weblate
a42414eabd Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 22:44:46 +00:00
Matthew Hodgson
c90834114b
Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms 
Use margin to separate "perms" in the room directory
 2017-11-03 22:44:41 +00:00
Weblate
038b3ed1eb Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 16:14:59 +00:00
Luke Barnard
290a501523 Use prefixed class names to avoid collisions with other libraries 2017-11-03 16:02:25 +00:00
Luke Barnard
67bc346ebb Add CSS for CreateGroupDialog to give group ID input suffix and prefix style 2017-11-03 15:39:24 +00:00
Matthew Hodgson
923295973b Merge branch 'develop' into matthew/status 2017-11-03 15:11:23 +00:00
Weblate
8518e2b056 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 14:40:10 +00:00
Luke Barnard
04c866ce9c Fix #5359 - unbreakable topics not breaking 
The room directory CSS has `word-break: break-word` applied to the entire mx_RoomDirectory, which is questionable. For now, add the same rule to RoomDetailList
 2017-11-03 14:39:24 +00:00
Weblate
f59ea648f0 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 14:11:16 +00:00
Luke Barnard
3192c345be rethemedex 
Needed, having removed _GroupInviteTile.scss
 2017-11-03 14:11:07 +00:00
Weblate
6432792d86 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 13:54:01 +00:00
Luke Barnard
22b82182a7
Merge pull request #5504 from vector-im/luke/fix-groups-invites-appearance 
Fix group invites such that they look similar to room invites
 2017-11-03 13:53:56 +00:00
Luke Barnard
c60ff5d283 Fix group invites such that they look similar to room invites 
- Remove CSS for GroupInviteTile - the component should be using RoomTile CSS
 - Added extra tiles to roomCount of RoomSubList header

Part of fixing https://github.com/vector-im/riot-web/issues/5226
 2017-11-03 12:17:49 +00:00
Weblate
a3d15e05b1 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 12:03:16 +00:00
Luke Barnard
4d11e739b5 Comment 0px height and margin on joinBox 2017-11-03 11:42:06 +00:00
Luke Barnard
f6974407e3 CSS for Your Communities scrollbar 
and also attempt to fix GroupTile flex weirdness.
 2017-11-03 11:22:29 +00:00
Weblate
61287b5f08 Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 15:37:58 +00:00
David Baker
69a82f7859
Merge pull request #5497 from vector-im/luke/groups-room-info 
Add toggle to alter visibility of room-group association
 2017-11-02 15:37:52 +00:00
Luke Barnard
ee71c72685 Use margin to separate "perms" in the room directory 
instead of a space.
 2017-11-02 15:13:55 +00:00
Luke Barnard
06ce467876 Add CSS for group room visibility label alignment 2017-11-02 15:05:08 +00:00
Luke Barnard
c01ea56676 Add toggle to alter visibility of room-group association 2017-11-02 13:40:07 +00:00
Weblate
ac89b5dc5e Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 12:53:34 +00:00
Luke Barnard
fb8e41a9c1
Merge pull request #5494 from vector-im/dbkr/pillify_at_room 
CSS for room notification pills
 2017-11-02 12:53:29 +00:00
Weblate
7ab3be0a11 Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 11:07:06 +00:00
David Baker
65ea7a8460 Use more spercific selector instead of !important 2017-11-02 10:37:25 +00:00
Kévin C
819122c111 Translated using Weblate (French) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2017-11-01 20:04:22 +00:00
David Baker
cd84d86fd1 CSS for room notification pills 2017-11-01 19:45:59 +00:00
Luke Barnard
2163a54617 Implement simple GroupRoomInfo 
See matrix-org/matrix-react-sdk#1563
 2017-11-01 17:32:01 +00:00
Matthew Hodgson
8ef3811f28 Merge branch 'develop' into matthew/status 2017-11-01 15:25:50 +00:00
Matthew Hodgson
8f289519e1 fix chevron cosmetics 2017-11-01 15:25:23 +00:00
Matthew Hodgson
df58bdd529 use absolute url for og:image 2017-10-31 22:56:57 +00:00
Matthew Hodgson
1b7e42f5e8 add og:image 2017-10-31 22:45:19 +00:00
Weblate
62d249442e Merge remote-tracking branch 'origin/develop' into develop 2017-10-31 18:02:38 +00:00
Kévin C
007ff8d177 Translated using Weblate (French) 
Currently translated at 96.2% (207 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2017-10-31 18:02:37 +00:00
Richard Lewis
56c6a15ddf
Merge pull request #5458 from vector-im/rxl881/widgetTitleBorder 
Add back bottom border to widget title bar
 2017-10-31 18:02:32 +00:00
Weblate
ea785aa888 Merge remote-tracking branch 'origin/develop' into develop 2017-10-31 13:52:25 +00:00
David Baker
841503f907
Merge pull request #5478 from vector-im/luke/css-header-name-clickable-for-members 
Prevent group name looking clickable for non-members
 2017-10-31 13:52:19 +00:00
Luke Barnard
ba1ad84d59 Prevent group name looking clickable for non-members 2017-10-31 10:56:14 +00:00
Weblate
1ffa7ae906 Merge remote-tracking branch 'origin/develop' into develop 2017-10-31 10:29:24 +00:00
Walter
2d69595beb Translated using Weblate (Ukrainian) 
Currently translated at 99.5% (214 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
 2017-10-31 10:29:24 +00:00
Enrico Bacis
cd6a3d2293 Translated using Weblate (Italian) 
Currently translated at 96.7% (208 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
 2017-10-31 10:29:23 +00:00
Bamstam
d86841c1c8 Translated using Weblate (German) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-31 10:29:23 +00:00
grrgui
58b9b04e35 Translated using Weblate (French) 
Currently translated at 96.2% (207 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2017-10-31 10:29:23 +00:00
Jan Kudrik
71fc072301 Translated using Weblate (Czech) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-10-31 10:29:22 +00:00
Michael Telatynski
c39044f397
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/fix_typecheck_warn 2017-10-30 15:27:20 +00:00
Michael Telatynski
71c8dca91a
Fix instanceof check, was checking against the Package rather than class 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 15:12:03 +00:00
Michael Telatynski
6da2f88dc5
Devtools styling tweaks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 13:32:31 +00:00
Michael Telatynski
ea9b630082
Refactor and add Account Data stuffs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 12:44:50 +00:00
Travis Ralston
f1c81be633 Import the right SettingsStore 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 22:18:34 -06:00
Travis Ralston
ccf52b2a69 Convert local settings to granular settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 17:05:27 -06:00
Travis Ralston
f6177cd7b5 Use granular settings instead of synced settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 01:51:02 -06:00
Matthew Hodgson
5d3caf8157 tweak badges 2017-10-27 23:45:10 +01:00
Matthew Hodgson
b87fad991f get rid of hardcoded colour >:( 2017-10-27 22:47:51 +01:00
Richard Lewis
19320c37df Add back bottom border to widget title bar 2017-10-27 19:57:05 +01:00
David Baker
5063fef4f5 Redirect to instructions page if user on mobile 2017-10-27 19:08:35 +01:00
David Baker
b9e2b59504 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-10-27 19:01:34 +01:00
Weblate
159343dd23 Merge remote-tracking branch 'origin/develop' into develop 2017-10-27 15:10:38 +00:00
Luke Barnard
c74e6c3c0c Merge pull request #5455 from vector-im/luke/groups-fix-invite-button 
Use correct group store state when rendering "Invite to this community"
 2017-10-27 16:10:33 +01:00
Weblate
4c7d07c109 Merge remote-tracking branch 'origin/develop' into develop 2017-10-27 14:40:14 +00:00
Krombel
c971aab453 Translated using Weblate (German) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-27 14:40:14 +00:00
Luke Barnard
3dcc397f67 Fix AuxPanel floating in the middle 
When there is no RoomView_body to push it to the top of the flex container
 2017-10-27 15:40:03 +01:00
Debendra Oli
0a81419978 Added translation using Weblate (Nepali) 2017-10-27 14:00:39 +00:00
Luke Barnard
7bae7fe9e5 Use correct group store state when rendering "Invite to this community" 
This required slight rework of how RightPanel uses the group store, and now it knows an unfortunate amount about the group store. Food for thought on stores in general, I think.
 2017-10-27 14:33:28 +01:00
Matthew Hodgson
8ad9728bef css for HS userid warnings 2017-10-27 14:23:33 +01:00
Matthew Hodgson
d4696345d1 fix more visited state of links 2017-10-27 12:17:04 +01:00
Matthew Hodgson
7e9b63822b fix visited state of links 2017-10-27 11:12:03 +01:00
Matthew Hodgson
ce2d40b775 more tweaks from Denis 2017-10-27 10:47:15 +01:00
Weblate
52ae5ba5dc Merge remote-tracking branch 'origin/develop' into develop 2017-10-27 08:15:28 +00:00
Jan Kudrik
de3a384513 Translated using Weblate (Czech) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-10-27 08:15:27 +00:00
Matthew Hodgson
3df1808fd0 Merge pull request #5453 from VickyKoblinski/es6-notifications 
Leverages ES6 in Notifications
 2017-10-27 09:15:22 +01:00
Vicky Koblinski
d188fdb9fe Changes requires to imports for consistancy, removes 'use strict' 2017-10-26 21:23:16 -04:00
Vicky Koblinski
7588814ec5 Leverages ES6 and fixes typo 2017-10-26 20:37:15 -04:00
Matthew Hodgson
c26aaa8d01 revert previous & fix font size 2017-10-27 01:35:06 +01:00
Matthew Hodgson
ca0092469b tweak spacing for login 2017-10-27 01:31:14 +01:00
Matthew Hodgson
3ffebfbf0b fix spacing of login aux buttons 2017-10-27 01:24:11 +01:00
Matthew Hodgson
b65ee5f28e tg hoverover 2017-10-27 01:09:46 +01:00
Matthew Hodgson
1798bff8f5 cosmetic fixes & hoverovers 2017-10-27 01:02:43 +01:00
Matthew Hodgson
26d142f893 fix snafu on login submit button 2017-10-27 00:14:12 +01:00
Matthew Hodgson
468f8ccab8 dirty hack to make FF work 2017-10-27 00:02:52 +01:00
Matthew Hodgson
50b348c68e try for slightly prettier redaction 2017-10-26 18:59:05 +01:00
Matthew Hodgson
ca74b09867 fix fugly noperm error 2017-10-26 18:27:34 +01:00
Matthew Hodgson
ad9d78684e tweak emptySubListTip visuals 2017-10-26 18:08:36 +01:00
Matthew Hodgson
e5b1ded7e3 fix default colour of loginbox text 2017-10-26 17:31:36 +01:00
Matthew Hodgson
8f0f34e761 fix buttons in other skins 2017-10-26 14:42:52 +01:00
Weblate
ffd526af1a Merge remote-tracking branch 'origin/develop' into develop 2017-10-26 08:55:24 +00:00
Andrey
0453b1c422 Translated using Weblate (Russian) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2017-10-26 08:55:23 +00:00
Jan Kudrik
15466f02ed Translated using Weblate (Czech) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-10-26 08:55:22 +00:00
Matthew Hodgson
13c1829cd4 fix droptarget 2017-10-26 02:09:56 +01:00
Matthew Hodgson
225c7ee621 Merge branch 'develop' into matthew/status 2017-10-26 01:46:06 +01:00
Matthew Hodgson
f86b616769 status homepage 2017-10-26 01:38:07 +01:00
Matthew Hodgson
ea19096db3 skin all the buttons 2017-10-25 23:56:31 +01:00
Matthew Hodgson
a152eba023 fix panel-divider-color 2017-10-25 22:55:32 +01:00
Matthew Hodgson
953398b486 statusify main chat 2017-10-25 22:48:13 +01:00
Matthew Hodgson
79a9f2168b get rid of hardcoded font 2017-10-25 22:47:55 +01:00
Travis Ralston
6c796cd311 Re-add i18n post-merge 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-25 11:28:57 -06:00
Travis Ralston
45ca890f68 Merge remote-tracking branch 'vector-im/develop' into travis/presence 2017-10-25 11:27:22 -06:00
Travis Ralston
53185fc23d Remove i18n for making the merge easier 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-25 11:27:16 -06:00
Luke Barnard
044519f9ea Add more specific css class to allow for optional flipping 2017-10-25 18:18:37 +01:00
Luke Barnard
5db44bd4ae Merge branch 'develop' into TheLastProject-reverse-video 2017-10-25 18:06:16 +01:00
Weblate
3fc0c455fa Merge remote-tracking branch 'origin/develop' into develop 2017-10-25 15:52:03 +00:00
Bamstam
4a8729dd1d Translated using Weblate (German) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-25 15:52:02 +00:00
Luke Barnard
f6a920a018 Merge pull request #5387 from vector-im/t3chguy/devtools-filter-case-sens 
Devtools: make filtering case-insensitive
 2017-10-25 16:51:57 +01:00
Weblate
7e7acb6922 Merge remote-tracking branch 'origin/develop' into develop 2017-10-25 14:41:14 +00:00
Luke Barnard
a627784c41 Merge pull request #5432 from vector-im/luke/fix-group-members-info-icon-highlight 
Highlight group members icon in group member info
 2017-10-25 15:41:09 +01:00
Weblate
fcfec1694e Merge remote-tracking branch 'origin/develop' into develop 2017-10-25 14:30:43 +00:00
Bamstam
a3b82bcd3d Translated using Weblate (German) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-25 14:30:43 +00:00
Luke Barnard
7c7ae3a31f Merge pull request #5422 from vector-im/luke/fix-interactable-greyed-ui 
Use CSS to stop greyed Right/LeftPanel UI from being interactable
 2017-10-25 15:30:38 +01:00
Luke Barnard
cd0888ce5a Highlight group members icon in group member info 2017-10-25 15:27:50 +01:00
Luke Barnard
9679051269 Introduce mx_RoomView_body for fadable things in the RoomView 
Part of simplifying use of mx_fadable
 2017-10-25 15:16:28 +01:00
Luke Barnard
0561c5bd4f Swap ui_opacity for panel_disabled 
Simplify the API for disabling panels in the UI. `mx_fadable_faded` is applied instead of setting opacity.
 2017-10-25 10:29:57 +01:00
Matthew Hodgson
9d86716b0f remove non-overridden stuff, and add dot svg 2017-10-25 02:26:53 +01:00
Matthew Hodgson
eedcda1d0e add dotty background 2017-10-25 02:18:04 +01:00
Matthew Hodgson
29cfbba2ce tweak error layout 2017-10-25 02:04:17 +01:00
Matthew Hodgson
73e7fe2764 finishish login page 2017-10-25 01:30:39 +01:00
Matthew Hodgson
b053f08991 switch to a LoginPage wrapper component 
>
> as it's much nicer in the CSS to wrap the LoginBox as needed rather than have separate header & footer divs floating above and below it which need to be correctly vertically centered
 2017-10-24 23:42:52 +01:00
Ruben Barkow
313f4f03b7 Translated using Weblate (German) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-24 22:18:57 +00:00
Weblate
3bff844a62 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 16:48:15 +00:00
Luke Barnard
a747a78e06 CSS to allow multi-line "Add rooms to this community" 2017-10-24 17:48:06 +01:00
Luke Barnard
bd15a88c89 Use CSS to stop greyed Right/LeftPanel UI from being interactable 2017-10-24 17:10:29 +01:00
Weblate
e2b80e9e80 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 16:01:07 +00:00
Luke Barnard
858e1fa341 Fix #5361 
Make it possible to click on the camera icon under group icon
 2017-10-24 17:00:57 +01:00
Weblate
a58ea58380 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 14:51:12 +00:00
Balaji
e2924d30df Translated using Weblate (Tamil) 
Currently translated at 78.6% (169 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ta/
 2017-10-24 14:51:12 +00:00
Luke Barnard
01d6577abd CSS for preventing editing of UI requiring user privilege if user unprivileged 2017-10-24 15:27:11 +01:00
Weblate
43f1951f37 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 10:19:34 +00:00
Luke Barnard
6a0ecfba7f Merge branch 'develop' into luke/fix-privileged-group-ui-1 2017-10-24 11:09:05 +01:00
Weblate
6e5ae0c664 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 10:03:49 +00:00
Luke Barnard
f1a700ef99 Only show UI for adding rooms/users to groups to privileged users 2017-10-24 10:38:40 +01:00
Luke Barnard
cc1fb8ac94 Only show "Invite to this community" when viewing group members 2017-10-24 10:22:13 +01:00
Weblate
d91c652590 Merge remote-tracking branch 'origin/develop' into develop 2017-10-23 16:11:26 +00:00
Richard Lewis
8672939f0c Merge pull request #5397 from vector-im/rxl881/deleteWidget 
Add trash can icon for delete widget
 2017-10-23 17:11:21 +01:00
Richard Lewis
c8f89fbc9b Added delete widget icon. 2017-10-23 17:07:25 +01:00
Jan Kudrik
61e06d8cf3 Translated using Weblate (Czech) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-10-23 15:38:52 +00:00
Weblate
e05ec68a61 Merge remote-tracking branch 'origin/develop' into develop 2017-10-23 13:55:46 +00:00
Matthew Hodgson
c7d18ff52e improve flair cosmetics 2017-10-23 14:55:36 +01:00
Weblate
ec12b8ee93 Merge remote-tracking branch 'origin/develop' into develop 2017-10-23 13:46:36 +00:00
Luke Barnard
0e20b20fb2 Fix CSS for room avatar "remove" icon 2017-10-23 14:46:28 +01:00
Weblate
052c00bd86 Merge remote-tracking branch 'origin/develop' into develop 2017-10-23 13:08:14 +00:00
Bamstam
146a75f7e7 Translated using Weblate (German) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-23 13:08:13 +00:00
Luke Barnard
d9fa11d03a Fix MyGroups placeholder colours on dark theme 2017-10-23 14:08:02 +01:00
Michael Telatynski
b16d4280b7
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-23 11:42:06 +01:00
Michael Telatynski
eb45b00b32
fix bad tab completion 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-23 11:40:25 +01:00
Michael Telatynski
84d1f838f0
make filtering case-insensitive 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-23 11:39:21 +01:00
Jeff Huang
16cd69f7dd Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
 2017-10-23 01:09:22 +00:00
Matthew Hodgson
190811ac1c WIP 2017-10-23 00:57:02 +01:00
Matthew Hodgson
01b3d6128c move status theme into a dedicated dir, and make fonts work 2017-10-22 17:03:39 +01:00
Matthew Hodgson
b28192cc0b fix (C) 2017-10-22 15:21:58 +01:00
Andrey
9d56f7e214 Translated using Weblate (Russian) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2017-10-20 19:35:53 +00:00
Matthew Hodgson
cd31e6532b initial wip theme 2017-10-20 18:43:06 +01:00
Matthew Hodgson
6fa2d35630 support concept of default theme 2017-10-20 18:41:39 +01:00
Weblate
5898a972a8 Merge remote-tracking branch 'origin/develop' into develop 2017-10-20 17:16:37 +00:00
Luke Barnard
14b5006645 Merge pull request #5375 from vector-im/luke/groups-my-groups-placeholder 
CSS to improve MyGroups in general, and add placeholder
 2017-10-20 18:16:33 +01:00
Luke Barnard
94454333d5 CSS to improve MyGroups in general, and add placeholder 2017-10-20 17:38:38 +01:00
Krombel
060b5d100f Translated using Weblate (German) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-20 15:35:27 +00:00
Szimszon
3e435e4581 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2017-10-20 13:51:09 +00:00
Weblate
95b5bcc6b0 Merge remote-tracking branch 'origin/develop' into develop 2017-10-20 13:03:53 +00:00
Krombel
25a7fb07a3 Translated using Weblate (German) 
Currently translated at 99.5% (214 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-20 13:03:52 +00:00
David Baker
667556f3ce Custom server text was i18ned by key 
And therefore got replaced by the key by the i18n script
 2017-10-20 13:48:00 +01:00
David Baker
a76fdc750a Run prunei18n 2017-10-20 11:40:05 +01:00
Weblate
0e3fbb6770 Merge branch 'develop' of https://github.com/vector-im/riot-web into develop 
Conflicts:
	src/i18n/strings/de_DE.json
	src/i18n/strings/hu.json
	src/i18n/strings/ru.json
	src/i18n/strings/zh_Hant.json
 2017-10-20 10:29:12 +00:00
Richard Lewis
528a856d54 Add class to identify non-scalar widget instances 2017-10-20 09:46:45 +01:00
Luke Barnard
c6f75fbf37 Adjust CSS in MyGroups, justify-content:space-around 2017-10-19 18:08:52 +01:00
Szimszon
7369719492 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2017-10-19 16:41:38 +00:00
Luke Barnard
62fd98245d Merge pull request #5360 from vector-im/luke/groups-my-groups 
CSS for improved MyGroups page
 2017-10-19 17:41:34 +01:00
Luke Barnard
8317bcbb9f CSS for improved MyGroups page 2017-10-19 17:27:21 +01:00
David Baker
b2e9b36978 Merge pull request #5346 from vector-im/dbkr/dialog_pad_right 
Add padding-right to Dialogs
 2017-10-19 16:19:40 +01:00
David Baker
ea459c84ba Other dialog subclasses have padding-right 2017-10-19 15:48:56 +01:00
David Baker
86226bc22d Add padding-right to Dialogs 
The "groups will be public" warning was apparently the first thing
long enough to reach the right hand edge
 2017-10-19 15:32:28 +01:00
Luke Barnard
289743c5fe Merge pull request #5344 from vector-im/dbkr/error_warning_color 
Add div.warning and use the scss var
 2017-10-19 15:31:03 +01:00
Luke Barnard
acb678afbd Merge pull request #5343 from vector-im/luke/groups-are-communities 
Groups->Communities
 2017-10-19 15:30:39 +01:00
David Baker
42ca840fef Add div.warning and use the scss var 
rather than the css color name
 2017-10-19 15:17:09 +01:00
Luke Barnard
e5df06b2ab Groups->Communities 2017-10-19 15:07:22 +01:00
David Baker
9d8b59e082 Make the 'add rooms' button clickable 
SVG was swallowing pointer events
 2017-10-19 14:54:56 +01:00
Bamstam
7395d866f6 Translated using Weblate (German) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-19 13:40:12 +00:00
Matthew Hodgson
c4de42c6af switch back to tint-friendly luke room icons 2017-10-19 15:40:00 +02:00
David Baker
4e31aea402 Switch to gen-i18n script 2017-10-19 10:53:02 +01:00
Krombel
987072b25a Translated using Weblate (German) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-19 09:08:54 +00:00
David Baker
6910b83c20 Merge pull request #5334 from vector-im/dbkr/use_t_normally 
Use _t as _t
 2017-10-19 10:08:51 +01:00
David Baker
42ddafcfd4 comment 2017-10-19 10:03:47 +01:00
David Baker
137cf32d3b Use _t as _t 
Rather than through a languageHandler object. This way our
translation script knows about it.
 2017-10-18 19:39:51 +01:00
Matthew Hodgson
7bb0ed4a66 fix room add icon 2017-10-18 19:56:39 +02:00
Matthew Hodgson
6b589c4945 fix room icon up 2017-10-18 19:40:31 +02:00
Matthew Hodgson
fe490341d0 replace placeholder groups icon with a themable one 2017-10-18 19:28:19 +02:00
Matthew Hodgson
6e24f4ba09 fix editing visuals 2017-10-18 17:31:46 +01:00
Travis Ralston
f3b1c6cc5b Add newlines to end of file 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-18 08:50:34 -06:00
Luke Barnard
e5c128fcb8 Move group ui buttons to group settings 2017-10-18 13:47:59 +01:00
Luke Barnard
2effdfb840 CSS: GroupView headershould be at least 70px in height 2017-10-17 11:56:51 +01:00
Szimszon
55b14d5d5d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2017-10-16 20:19:05 +00:00
Luke Barnard
85307ffd23 CSS for invited group members section 2017-10-16 17:21:40 +01:00
David Baker
e85f205e8f Merge pull request #5302 from vector-im/luke/fix-overflow-entity-tile 
Handle long names in EntityTiles by overflowing correctly
 2017-10-16 16:42:44 +01:00
Luke Barnard
fdf07f6d89 Handle long names in EntityTiles by overflowing correctly 2017-10-16 16:32:09 +01:00
Luke Barnard
102651332a Merge pull request #5295 from vector-im/luke/groups-room-directory-esque 
CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475
 2017-10-16 13:52:38 +02:00
Luke Barnard
12ebe91f83 "Add room..." -> "Add rooms..." 2017-10-16 11:53:35 +01:00
Luke Barnard
0807a2a26d rethemendex.sh 2017-10-16 11:47:34 +01:00
Luke Barnard
2cefa58d5d CSS for Modifying GroupView UI matrix-org/matrix-react-sdk#1475 2017-10-16 11:44:38 +01:00
Travis Ralston
18faa2d8ba CSS for new pinned events indicator 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-15 21:18:39 -06:00
Travis Ralston
ef5fc7347a Don't update presence status if the user is clicks twice 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-15 20:20:43 -06:00
Krombel
498ae90040 Translated using Weblate (German) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-15 20:22:05 +00:00
Jeff Huang
da67a2c078 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
 2017-10-15 05:57:19 +00:00
Andrey
f9186ae8fc Translated using Weblate (Russian) 
Currently translated at 100.0% (215 of 215 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2017-10-15 05:31:08 +00:00
Travis Ralston
deb50b2d43 Add presence context menu and styling 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 23:15:26 -06:00
Travis Ralston
e2b02ad60d Merge branch 'develop' into travis/presence 2017-10-14 21:45:59 -06:00
Travis Ralston
1ca041c59c CSS for more positioning options on context menus 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 21:45:29 -06:00
Weblate
b71bcb4e9b Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:02:53 +00:00
Matthew Hodgson
f143315618 Merge pull request #5142 from turt2live/travis/pinned_messages 
Message/event pinning
 2017-10-15 01:02:49 +01:00
Travis Ralston
6f968522f5 Merge branch 'develop' into travis/presence 2017-10-14 17:27:18 -06:00
Bamstam
4a5e2e347b Translated using Weblate (German) 
Currently translated at 100.0% (210 of 210 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2017-10-14 23:11:20 +00:00
Travis Ralston
6926c96f36 Hide pinning messages behind a labs settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:41:44 -06:00
Matthew Hodgson
6f819606c1 Merge pull request #4054 from ollieh/issues/3771 
Sorting of networks within a protocol based on name
 2017-10-14 23:21:51 +01:00
Travis Ralston
3e066d3aef Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:11:17 -06:00
Matthew Hodgson
2667ed2561 Merge pull request #4988 from vector-im/t3chguy/hide_notification_body 
allow hiding of notification body for privacy reasons
 2017-10-14 23:07:31 +01:00
Matthew Hodgson
5bb2992f93 Merge pull request #5281 from turt2live/travis/display-name-lightbox 
Don't use MXIDs on the lightbox if possible
 2017-10-14 22:46:13 +01:00
Matthew Hodgson
b70bd1987a Merge pull request #5267 from turt2live/travis/alone_warning_css 
CSS for lonely room message
 2017-10-14 22:44:58 +01:00
Matthew Hodgson
5c1e2a8a82 Merge pull request #5037 from turt2live/travis/code_block_border 
Bring back dark theme code block border
 2017-10-14 22:32:45 +01:00
Travis Ralston
9d17ed7407 CSS for presence member avatar 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 14:33:55 -06:00
Travis Ralston
56e775c56a Remove user avatar button CSS 2017-10-13 21:14:08 -06:00
Travis Ralston
c7723ba0b0 Remove room avatar button CSS 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 20:56:39 -06:00
Travis Ralston
1adb63ac74 Don't use MXIDs on the lightbox if possible 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 20:18:55 -06:00
David Baker
398e0839f1 Hide the join group button 
Until it actually does something
 2017-10-13 16:15:17 +01:00
Luke Barnard
bbcf46bb69 Merge branch 'develop' of github.com:vector-im/riot-web into develop 2017-10-12 18:12:14 +01:00
David Baker
832465655b Merge pull request #5203 from vector-im/t3chguy/riot.im-logos 
switch to new logos, and use import rather than VAR
 2017-10-12 17:49:29 +01:00
Weblate
8216d8999c Merge branch 'develop' of https://github.com/vector-im/riot-web into develop 
Conflicts:
	src/i18n/strings/cs.json
	src/i18n/strings/fr.json
	src/i18n/strings/nb_NO.json
	src/i18n/strings/nl.json
	src/i18n/strings/pt_BR.json
 2017-10-12 16:24:36 +00:00
Carlos Marques
7d12e2f64b 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-10-12 16:22:01 +00:00
Kevin Brubeck Unhammer
bbf859aad7 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 54.7% (122 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nb_NO/
 2017-10-12 16:22:01 +00:00
Travis Ralston
783aebe5eb CSS for lonely room message 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-11 21:13:55 -06:00
Michael Telatynski
6df69138a2
switch to new logos, and use import rather than VAR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-11 16:46:05 +01:00
Luke Barnard
ca0d8e425e Merge branch 'develop' of github.com:vector-im/riot-web into develop 2017-10-11 16:00:34 +01:00
Luke Barnard
ae1a5a50b0 Move inline CSS for flair 
Also, move vertical align from mx_Flair to img otherwise the SenderProfile has increased height when Flair is present, causing bug with scroll position
 2017-10-11 16:00:26 +01:00
Luke Barnard
e405d6cbd6 Merge pull request #5167 from vector-im/t3chguy/quickfix 
Remove trailing comma in JSON
 2017-10-11 16:40:29 +02:00