gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,330 Commits 2 Branches 0 Tags 25 MiB
Commit Graph

3486 Commits

Author SHA1 Message Date
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
Luke Barnard 508ff4f917 Merge pull request #3849 from psaavedra/set_default_federate_by_settings 
Added default_federate property
 2017-10-11 16:28:25 +02:00
David Baker 27a81c25d2 CSS for greying out login form 2017-10-11 14:06:12 +01:00
Andrey 415ffac978 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-10-10 17:29:36 +00:00
Morgan Bazalgette 16764382a5 Translated using Weblate (Italian) 
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/it/
 2017-10-10 17:29:36 +00:00
Xose M fd7ddd9ec8 Translated using Weblate (Galician) 
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/gl/
 2017-10-10 17:29:36 +00:00
David Baker 20d2a6685f Remove spurious comma 2017-10-10 18:28:15 +01:00
Morgan Bazalgette 25413b2b35 Translated using Weblate (Italian) 
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/it/
 2017-10-08 20:27:21 +00:00
Xose M e1f17e2cdc Translated using Weblate (Galician) 
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/gl/
 2017-10-06 13:35:38 +00:00
Michael Telatynski a5e41102bc Remove trailing comma in JSON 2017-10-04 23:42:27 +01:00
Michael Telatynski 85a590ad5a Remove trailing comma in JSON 2017-10-04 23:41:54 +01:00
Michael Telatynski bf6a3470b4
Merge branch 'develop' of github.com:vector-im/riot-web into set_default_federate_by_settings 2017-10-04 22:35:58 +01:00
Luke Barnard 70bbf2df7a Fix bug that made sub list placeholders not show for ILAG etc. 2017-10-04 15:58:40 +01:00
Luke Barnard 56c366ebd3 Merge pull request #5161 from vector-im/luke/refactor-editable-list-from-alias-settings 
Factor out EditableItemList component from AliasSettings
 2017-10-04 10:56:21 +01:00
Luke Barnard a9d308004e Factor out EditableItemList component from AliasSettings 2017-10-04 10:30:09 +01:00
Walter a75fa7fd3e 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-10-04 09:24:42 +00:00
Danilo Resende 44162d5c8a Translated using Weblate (Portuguese (Brazil)) 
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_BR/
 2017-10-04 09:24:42 +00:00
Luke Barnard ec414147d1 Merge pull request #5110 from pafcu/mark-and-remove-translations 
Mark and remove some translations
 2017-10-04 10:24:36 +01:00
Danilo Resende 23c1a3233b Translated using Weblate (Portuguese (Brazil)) 
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_BR/
 2017-10-03 22:19:54 +00:00