Travis Ralston
482e6b57da
Merge pull request #2331 from matrix-org/travis/mto-via
...
Don't consider ACL'd servers as permalink candidates
2018-12-07 10:59:50 -07:00
David Baker
d7319d7e4f
Merge pull request #2330 from matrix-org/travis/fix-pinned-rooms
...
Fix pinning of rooms without badges
2018-12-07 17:44:36 +00:00
David Baker
6d58296fa6
Merge pull request #2329 from matrix-org/travis/sort-i18n-2
...
Sort translations by file name
2018-12-07 17:43:57 +00:00
Travis Ralston
95d15b7863
Fix tinting of notification icon and use a more reliable notification source
...
The js-sdk's placement of the notification change was unreliable and could cause stuck notifications. The new location (piggybacking the Notifier) is a lot more reliable.
The tinting has been changed fairly invasively in order to support the changing of the `fill` attribute. What was happening before was the `fill` property would happily get set to the forced color value, but when it came time to reset it it wouldn't be part of the colors array and fail the check, therefore never being changed back. By using a second field we can ensure we are checking the not-forced value where possible, falling back to the potentially forced value if needed.
In addition to fixing which color the Tinter was checking against, something noticed during development is that `this.colors` might not always be a set of hex color codes. This is problematic when the attribute we're looking to replace is a rgb color code but we're only looking at `keyHex` - the value won't be reset. It appears as though this happens when people use custom tinting in places as `this.colors` often gets set to the rgb values throughout the file. To fix it, we just check against `keyHex` and `keyRgb`.
2018-12-06 22:26:51 -07:00
Travis Ralston
173669b375
Show the number of unread notifications above the bell on the right
...
Fixes https://github.com/vector-im/riot-web/issues/3383
This achieves the result by counting up the number of highlights across all rooms and setting that as the badge above the icon. If there are no highlights, nothing is displayed. The red highlight on the bell is done by abusing how the Tinter works: because it has access to the properties of the SVG that we'd need to override it, we give it a collection of colors it should use instead of the theme/tint it is trying to apply. This results in the Tinter using our warning color instead of whatever it was going to apply.
The RightPanel now listens for events to update the count too, otherwise when the user receives a ping they'd have to switch rooms to see the change.
2018-12-06 16:18:02 -07:00
Travis Ralston
ca1313099f
Show the IncomingCallBox if the call is for the RoomSubList
...
Fixes https://github.com/vector-im/riot-web/issues/4369
Previously the RoomSubList would filter its list of rooms to verify that the incoming call belongs to it. This causes problems when the sub list is being told some rooms don't exist (ie: the list is filtered). It is trivial for the RoomList to instead track which RoomSubList (tag) it should be handing the call off to so we do that instead now. The RoomSubList trusts that the caller has already filtered it and will render the IncomingCallBox if it has an incoming call.
2018-12-06 11:45:58 -07:00
Travis Ralston
31b7a0ddcb
Merge pull request #2259 from matrix-org/t3chguy/account_deactivation_preferences
...
Remove temporary account_deactivation_preferences
2018-12-06 10:45:04 -07:00
Travis Ralston
45bc1f7dbd
Appease the linter
2018-12-05 18:14:22 -07:00
Travis Ralston
f08a54ed1e
Don't consider ACL'd servers as permalink candidates
...
and fix the bug where it was picking 4 servers instead of 3. This was due to `<=` instead of `<` in the `MAX_SERVER_CANDIDATES` loop. Added tests for all the things.
Fixes https://github.com/vector-im/riot-web/issues/7752
Fixes https://github.com/vector-im/riot-web/issues/7682
2018-12-05 18:00:09 -07:00
Travis Ralston
93c90896b5
Regenerate en_EN.json
2018-12-05 14:00:09 -07:00
Travis Ralston
79ad95c853
Merge remote-tracking branch 'origin/develop' into travis/sort-i18n-2
2018-12-05 13:58:18 -07:00
Travis Ralston
daa0ddd21d
Merge pull request #2306 from matrix-org/travis/cors-on-join
...
Suppress CORS errors in the 'failed to join room' dialog
2018-12-05 13:53:24 -07:00
Travis Ralston
216fc6412a
Fix pinning of rooms without badges
...
Fixes https://github.com/vector-im/riot-web/issues/7723
This adds consideration for rooms that are "mentions only" (or "unread-muted" as internally referenced).
2018-12-05 13:52:27 -07:00
Travis Ralston
a2b825ba92
Sort translations by file name
...
This keeps the strings close together and roughly in the same area as the others, and makes it easier to maintain the translation file.
2018-12-05 11:52:10 -07:00
Travis Ralston
c46bae59b2
Merge branch 'develop' into travis/cors-on-join
2018-12-05 11:30:19 -07:00
Travis Ralston
7e817f4aa9
Add a helpful comment
2018-12-05 11:29:53 -07:00
Travis Ralston
28f4752c5b
Rename returned completion states to be something sensible
2018-12-05 11:27:48 -07:00
Travis Ralston
0f348a7c78
Merge branch 'develop' into travis/invite-errors
2018-12-05 11:25:45 -07:00
Richard van der Hoff
c553323d5a
Factor out common login code ( #2307 )
...
Removes the duplication between the various points where we send off a login
request and parse the response.
2018-12-05 17:39:38 +01:00
Besnik Bleta
c8aa53cabd
Translated using Weblate (Albanian)
...
Currently translated at 99.3% (1374 of 1383 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-12-05 15:58:22 +00:00
Szimszon
9f25c39a53
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1383 of 1383 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-12-05 12:53:53 +00:00
Kévin C
5764622eba
Translated using Weblate (French)
...
Currently translated at 100.0% (1383 of 1383 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-12-05 10:58:06 +00:00
Weblate
28dc6f6da0
Merge remote-tracking branch 'origin/develop' into develop
2018-12-05 10:56:38 +00:00
Karol Kosek
817f78ecd5
Translated using Weblate (Polish)
...
Currently translated at 88.2% (1219 of 1382 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-12-05 10:56:38 +00:00
David Baker
dad8e6a261
Merge pull request #2326 from jryans/group-users-error
...
Allow group summary to load when /users fails
2018-12-05 10:56:32 +00:00
Kévin C
573cb8a380
Translated using Weblate (French)
...
Currently translated at 100.0% (1382 of 1382 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-12-05 10:40:19 +00:00
Travis Ralston
633be5061c
Introduce a default_server_name for aesthetics and rework .well-known
...
Fixes https://github.com/vector-im/riot-web/issues/7724
The `default_server_name` from the config gets displayed in the "Login with my [server] matrix ID" dropdown when the default server is being used. At this point, we also discourage the use of the `default_hs_url` and `default_is_url` options because we do an implicit .well-known lookup to configure the client based on the `default_server_name`. If the URLs are still present in the config, we'll honour them and won't do a .well-known lookup when the URLs are mixed with the new server_name option. Users will be warned if the `default_server_name` does not match the `default_hs_url` if both are supplied. Users are additionally prevented from logging in, registering, and resetting their password if the implicit .well-known check fails - this is to prevent people from doing actions against the wrong homeserver.
This relies on https://github.com/matrix-org/matrix-js-sdk/pull/799 as we now do auto discovery in two places. Instead of bringing the .well-known out to its own utility class in the react-sdk, we might as well drag it out to the js-sdk.
2018-12-04 23:34:57 -07:00
Jeff Huang
7f4ee2b1ca
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1382 of 1382 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-12-05 03:54:42 +00:00
J. Ryan Stinnett
22ff76e6b7
Add error to UI when group member list fails to load
...
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-04 18:46:15 -06:00
J. Ryan Stinnett
5fc25fd6ba
Only mark group as failed to load for summary
...
Currently, any error in the `GroupStore`s several requests can cause the whole
`GroupView` component to hide and be mark the group as failed to load.
Since it is known that group members may fail to load in some cases, let's only
show failed to load for the whole group when the summary fails.
This also strengthens the `GroupView` test by ensuring we wait for multiple
updates for checking results.
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-04 18:32:16 -06:00
Szimszon
cf9fbe041a
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1382 of 1382 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-12-04 18:53:44 +00:00
Weblate
bfe8f3a440
Merge remote-tracking branch 'origin/develop' into develop
2018-12-04 16:49:55 +00:00
David Baker
c849a2389c
Show correct text if passphrase is skipped
...
Also set 'downloaded' state in a couple more places
2018-12-04 16:38:32 +00:00
Besnik Bleta
6ab9ae7aa5
Translated using Weblate (Albanian)
...
Currently translated at 99.3% (1372 of 1381 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-12-04 15:32:55 +00:00
Szimszon
3f7a3b8cfb
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1381 of 1381 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-12-04 13:42:44 +00:00
Weblate
c5daf14869
Merge remote-tracking branch 'origin/develop' into develop
2018-12-04 11:50:48 +00:00
Besnik Bleta
98b2398923
Translated using Weblate (Albanian)
...
Currently translated at 99.3% (1346 of 1355 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-12-04 11:50:46 +00:00
David Baker
5d94da07af
Merge pull request #2294 from matrix-org/dbkr/zxcvbn
...
Add password strength meter to backup creation UI
2018-12-04 11:50:42 +00:00
David Baker
5b2c2a0adf
comment typo
2018-12-04 11:41:04 +00:00
Kévin C
c4ad15f919
Translated using Weblate (French)
...
Currently translated at 100.0% (1355 of 1355 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-12-04 07:45:06 +00:00
Szimszon
8510fe721c
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1355 of 1355 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-12-04 07:08:14 +00:00
Jeff Huang
e131a76e80
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1355 of 1355 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-12-04 03:16:38 +00:00
Weblate
35ef2cde61
Merge remote-tracking branch 'origin/develop' into develop
2018-12-04 00:31:21 +00:00
Karol Kosek
dbc3e87e53
Translated using Weblate (Polish)
...
Currently translated at 88.5% (1198 of 1353 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-12-04 00:31:21 +00:00
Akarshan Biswas
e25df6afd8
Translated using Weblate (Hindi)
...
Currently translated at 26.3% (356 of 1353 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
2018-12-04 00:31:20 +00:00
Krombel
f7a8e144f2
Translated using Weblate (German)
...
Currently translated at 98.3% (1330 of 1353 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-12-04 00:31:20 +00:00
Besnik Bleta
c163773248
Translated using Weblate (Albanian)
...
Currently translated at 99.2% (1343 of 1353 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-12-04 00:31:19 +00:00
Osoitz
0834985ff4
Translated using Weblate (Basque)
...
Currently translated at 100.0% (1353 of 1353 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-12-01 16:58:24 +00:00
Will Hunt
2b077b4f5d
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
2018-12-01 16:24:43 +00:00
Travis Ralston
84b568a235
Appease the linter
2018-11-29 15:16:45 -07:00
Travis Ralston
987ad0b0db
Check if users exist before inviting them and communicate errors
...
Fixes https://github.com/vector-im/riot-web/issues/3283
Fixes https://github.com/vector-im/riot-web/issues/3968
Fixes https://github.com/vector-im/riot-web/issues/4308
Fixes https://github.com/vector-im/riot-web/issues/1597
Fixes https://github.com/vector-im/riot-web/issues/6790
This does 3 things:
* Makes the `MultiInviter` check for a user profile before attempting an invite. This is to prove the user exists.
* Use the `MultiInviter` everywhere to avoid duplicating the logic. Although a couple places only invite one user, it is still worthwhile.
* Communicate errors from the `MultiInviter` to the user in all cases. This is done through dialogs, where some existed previously but were not invoked.
Specifically to the 403 error not working: What was happening was the `MultiInviter` loop was setting the `fatal` flag, but that didn't resolve the promise it stored. This caused a promise to always be open, therefore never hitting a dialog.
2018-11-29 15:05:53 -07:00
Szimszon
3aa768f776
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1353 of 1353 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-11-29 07:23:00 +00:00
Kévin C
2d8a07224c
Translated using Weblate (French)
...
Currently translated at 100.0% (1353 of 1353 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-11-27 23:56:53 +00:00
Travis Ralston
2b027b716f
Suppress CORS errors in the 'failed to join room' dialog
...
This isn't pretty, but it does address https://github.com/vector-im/riot-web/issues/7526
Tested with Chrome and Firefox to ensure the message is stable enough to parse.
2018-11-27 14:23:28 -07:00
Weblate
438b940b00
Merge remote-tracking branch 'origin/develop' into develop
2018-11-27 20:51:50 +00:00
Karol Kosek
f58cf6ccd1
Translated using Weblate (Polish)
...
Currently translated at 88.6% (1197 of 1350 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-11-27 20:51:50 +00:00
Akarshan Biswas
ec3173c8dd
Translated using Weblate (Hindi)
...
Currently translated at 24.0% (325 of 1350 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
2018-11-27 20:51:49 +00:00
Travis Ralston
e3f2e69087
Merge pull request #2227 from matrix-org/travis/well-known
...
Support .well-known discovery
2018-11-27 13:51:44 -07:00
Travis Ralston
015af7d771
Use sensible logging
2018-11-27 13:41:34 -07:00
Osoitz
e27f3f0c4b
Translated using Weblate (Basque)
...
Currently translated at 100.0% (1350 of 1350 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-11-24 09:56:26 +00:00
David Baker
075c13a5bd
Add password strength meter to backup creation UI
...
https://github.com/vector-im/riot-meta/issues/227
2018-11-23 15:50:23 +00:00
Weblate
25a4aaf749
Merge remote-tracking branch 'origin/develop' into develop
2018-11-23 11:19:28 +00:00
David Baker
4f8c4f1c6e
Make create key backup dialog async
...
So we can add zxcvbn to it without inflating the main bundle size
2018-11-23 10:55:18 +00:00
Weblate
02d950bd59
Merge remote-tracking branch 'origin/develop' into develop
2018-11-23 07:46:09 +00:00
Osoitz
7d45994c07
Translated using Weblate (Basque)
...
Currently translated at 95.8% (1294 of 1350 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-11-23 07:46:08 +00:00
David Baker
d443d6173d
Forgot to enable continue button on download
2018-11-22 19:06:58 +00:00
Karol Kosek
c6f317b83b
Translated using Weblate (Polish)
...
Currently translated at 88.5% (1195 of 1350 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-11-22 16:55:57 +00:00
Kévin C
328ab4d824
Translated using Weblate (French)
...
Currently translated at 100.0% (1350 of 1350 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-11-22 10:19:39 +00:00
Besnik Bleta
5810f596b8
Translated using Weblate (Albanian)
...
Currently translated at 99.1% (1339 of 1350 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-11-22 08:41:14 +00:00
Travis Ralston
5600a9d02a
Validate the identity server
2018-11-21 14:14:08 -07:00
Travis Ralston
4cfefe4c3c
Introduce an onUsernameBlur and fix hostname parsing
2018-11-21 14:13:56 -07:00
Szimszon
d324c31027
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1350 of 1350 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-11-21 21:07:42 +00:00
Travis Ralston
6f0f930e0a
Merge branch 'develop' into travis/well-known
2018-11-21 13:30:57 -07:00
Weblate
0252cf4332
Merge remote-tracking branch 'origin/develop' into develop
2018-11-21 18:37:49 +00:00
David Baker
d714176fcd
Merge pull request #2169 from matrix-org/dbkr/e2e_backups
...
Online incremental megolm backups (v2)
2018-11-21 18:37:43 +00:00
David Baker
b529c98095
Merge pull request #2284 from matrix-org/dbkr/e2e_backups_download_recovery_key
...
Add recovery key download button
2018-11-21 18:25:33 +00:00
David Baker
3828798099
lint
2018-11-21 18:17:26 +00:00
David Baker
40ef2e0cf4
another missed translation
2018-11-21 18:08:44 +00:00
David Baker
1c06d781ae
Missed translation
2018-11-21 18:06:37 +00:00
David Baker
08e2ba8c6c
Don't allow enter to submit if field invalid
2018-11-21 18:02:58 +00:00
Weblate
c40f6095a0
Merge remote-tracking branch 'origin/develop' into develop
2018-11-21 17:49:02 +00:00
David Baker
2ba4d8a2d9
Remove outdated logging & log on failure
2018-11-21 17:35:28 +00:00
David Baker
985966f8be
Update async dialog interface to use promises
...
Hopefully makes the syntax a bit nicer. Also uses ES6 async import
rather than require.ensure which is now deprecated. Also also
displays an error if the component fails to load rather than falling
over in a heap, which is nice.
2018-11-21 16:56:44 +00:00
David Baker
ed5d87e797
Add recovery key download button
2018-11-21 13:57:31 +00:00
David Baker
6fe2c9c2bb
Merge branch 'dbkr/e2e_backups' into dbkr/e2e_backups_passphrase
2018-11-20 18:10:57 +00:00
David Baker
8ccaf53d20
Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups
2018-11-20 18:08:39 +00:00
David Baker
63a7ff5273
lint
2018-11-20 16:20:31 +00:00
David Baker
132408cf02
Add e2e backup recovery with passphrase
2018-11-20 16:16:24 +00:00
David Baker
fbab8ceeef
Passphrase based key backups
...
Add passphrase support to backup creation stage
2018-11-20 13:11:58 +00:00
Kévin C
3a91f00335
Translated using Weblate (French)
...
Currently translated at 100.0% (1281 of 1281 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-11-20 07:56:43 +00:00
Szimszon
4e18635840
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1281 of 1281 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-11-19 13:32:47 +00:00
Weblate
0eeafa368d
Merge remote-tracking branch 'origin/develop' into develop
2018-11-19 13:14:27 +00:00
Besnik Bleta
414ff55fe6
Translated using Weblate (Albanian)
...
Currently translated at 99.0% (1269 of 1281 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-11-19 13:14:25 +00:00
Richard van der Hoff
c61031d3e1
Merge pull request #2279 from matrix-org/rav/sso_login_type
...
Support for m.login.sso
2018-11-19 14:14:21 +01:00
Szimszon
dbb8de50d0
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1281 of 1281 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-11-17 19:00:30 +00:00
Besnik Bleta
9697d759c8
Translated using Weblate (Albanian)
...
Currently translated at 99.2% (1272 of 1281 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-11-17 17:11:56 +00:00
Besnik Bleta
3ab8adc8e4
Translated using Weblate (Albanian)
...
Currently translated at 97.9% (1255 of 1281 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-11-17 16:29:36 +00:00
Kévin C
e18dc4bcdd
Translated using Weblate (French)
...
Currently translated at 100.0% (1281 of 1281 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-11-17 08:30:11 +00:00
Weblate
1d4f95ad78
Merge remote-tracking branch 'origin/develop' into develop
2018-11-16 20:25:45 +00:00
Travis Ralston
7dd610b41e
Merge pull request #2235 from MaxwellKepler/develop
...
Added badge to non-autoplay GIFs
2018-11-16 13:25:40 -07:00