4b68ca141c
Merge pull request #2455 from matrix-org/dbkr/key_backup_status_unknown_device
...
Say when backup is signed by unknown device
2019-01-18 10:58:26 +00:00
622d7427f7
Merge pull request #2458 from matrix-org/travis/upgrade-command
...
Add an /upgraderoom command to make upgrading easier for development
2019-01-18 10:00:53 +00:00
20e296b20e
Convert image URLs in React to `require` calls
...
This allows Webpack to insert the proper image URL after builds steps like
adding a hash and so on. The path you supply to `require` is relative to the JS
source file, just like any other would be.
2019-01-17 22:06:49 -06:00
989227d435
Fix line length lint warnings
...
I am about to run some code replacements that might make lines too long, so with
this change I know we're starting from 0 line length warnings.
2019-01-17 22:06:49 -06:00
b2387f4cff
Define SCSS variable for resource dir
...
Adds a `$res` SCSS variable set to the path from the root SCSS file to the `res`
directory.
This is a different base path than previously used in CSS URLs (it goes up 3
directories instead of 2), because Webpack will now be resolving images relative
to the root SCSS file, so the path corresponds to a source tree location,
instead of a path in the build output tree.
Defining this variable has two main goals:
* URLs are a bit easier to read
* The path can be overridden, which is needed for external (riot-web) themes
2019-01-17 22:06:49 -06:00
7678b9c43b
Lift font SCSS partials to theme root
...
This means that themes which include `light/css/_base.scss` (currently Dark and
Status) won't be forced to have Light's font-faces included. This only really
matters for Status, which uses different fonts throughout.
2019-01-17 21:50:45 -06:00
9a7a8da6c0
Use font-family from theme in all components
2019-01-17 21:50:45 -06:00
91c0d8bae3
Merge pull request #2457 from matrix-org/travis/develop2
...
Merge develop->experimental
2019-01-17 16:19:30 -07:00
7f6ce69c3e
Merge branch 'experimental' into travis/develop2
2019-01-17 16:03:45 -07:00
9b6ef8af72
Add an /upgraderoom command to make upgrading easier for development
2019-01-17 15:59:05 -07:00
2920deaefe
better naming
2019-01-17 18:52:22 +01:00
146e651dae
add comments
2019-01-17 18:52:14 +01:00
1db6f1b652
remove logging
2019-01-17 18:32:46 +01:00
d787d3d821
clear typing bar when receiving event from user
2019-01-17 18:26:11 +01:00
23e7811f33
Merge pull request #2454 from matrix-org/bwindels/topleftcursor
...
Fix: show hand cursor in topleft menu so its clear you can click it
2019-01-17 16:58:12 +00:00
b551d2f43a
Say when backup is signed by unknown device
...
rather than say it isn't signed by any devices
https://github.com/vector-im/riot-web/issues/8142
Requires https://github.com/matrix-org/matrix-js-sdk/pull/826
2019-01-17 16:45:00 +00:00
7df8951efa
wait to hide typing bar until event arrives or 5s timeout
2019-01-17 16:30:55 +01:00
9b01120499
Merge pull request #2453 from matrix-org/bwindels/searchfix
...
Fix: search makeover missing icons
2019-01-17 13:31:37 +00:00
2bec088591
show hand cursor in topleft menu so its clear you can click it
2019-01-17 14:07:33 +01:00
921906897f
css url paths are relative to location of compiled file, not project structure
2019-01-17 13:49:52 +01:00
89b576936b
Merge pull request #2448 from matrix-org/bwindels/searchmakeover
...
Redesign: search makeover
2019-01-17 12:12:26 +00:00
e7359ff115
Merge pull request #2451 from matrix-org/bwindels/revertgridview
...
Revert "Tiled room UI"
2019-01-17 12:09:37 +00:00
d04c33960b
Merge pull request #2452 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2019-01-17 10:26:29 +00:00
506ee39a09
Translated using Weblate (Albanian)
...
Currently translated at 99.2% (1417 of 1427 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2019-01-17 10:17:09 +00:00
a7d21ebb8e
re-apply Timer linting fixes that happened in the tiled ui PR
2019-01-17 10:44:12 +01:00
8c30d05eb8
Revert "Merge pull request #2348 from matrix-org/bwindels/roomgridview-experimental"
...
This reverts commit ece5cb1fcc64a3d2521c
2019-01-17 10:29:37 +01:00
7d9f84c873
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1427 of 1427 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-01-16 19:19:44 +00:00
e199d5384e
Translated using Weblate (French)
...
Currently translated at 100.0% (1427 of 1427 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-01-16 19:07:37 +00:00
2e8368ce0b
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (1427 of 1427 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2019-01-16 16:32:22 +00:00
859f2a8646
Show spinner while waiting on status message to commit
...
It can take some time to actually set the status message and see it play back as
a committed event. This adds a spinner for immediate feedback so it's clear
that something is happening.
Fixes https://github.com/vector-im/riot-web/issues/8135 .
2019-01-16 09:33:39 -06:00
d627660aaf
Merge remote-tracking branch 'origin/develop' into develop
2019-01-16 15:31:19 +00:00
8c3cff40b4
Merge pull request #2450 from matrix-org/dbkr/users_may_not_exist
...
Change wording of 'invite anyway' setting
2019-01-16 15:31:14 +00:00
55889d5491
Change wording of 'invite anyway' setting
...
https://github.com/vector-im/riot-web/issues/7922
2019-01-16 15:07:30 +00:00
fa943aa114
Merge remote-tracking branch 'origin/develop' into develop
2019-01-16 14:01:21 +00:00
11f1b71cc6
Translated using Weblate (Slovak)
...
Currently translated at 95.2% (1357 of 1425 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2019-01-16 14:01:20 +00:00
7551f3102a
Translated using Weblate (Lithuanian)
...
Currently translated at 69.4% (990 of 1425 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2019-01-16 14:01:20 +00:00
6dcee227a9
Translated using Weblate (Albanian)
...
Currently translated at 98.9% (1410 of 1425 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2019-01-16 14:01:19 +00:00
82e043638e
Merge pull request #2449 from matrix-org/dbkr/fix_lint_develop
...
Minimal lint-fixes to make develop CI build
2019-01-16 14:01:15 +00:00
4da4e0c37a
Iminimal lint-fixes to make develop CI build
2019-01-16 13:57:18 +00:00
1082f548d3
hack nunito italics for now with CSS skew
...
fixes https://github.com/google/fonts/issues/1726
2019-01-16 12:53:46 +00:00
622b11fd91
remove commented out code from shifting things around
2019-01-16 13:04:49 +01:00
0229453482
Merge pull request #2440 from matrix-org/bwindels/smarterresizer
...
Improve room sublist resizing
2019-01-16 10:55:53 +00:00
313bbaaeaa
remove obsolete comments
2019-01-16 11:33:41 +01:00
fed256cbaa
Update src/resizer/distributors/roomsublist.js
...
Co-Authored-By: bwindels <bruno@windels.cloud>
2019-01-16 10:29:30 +00:00
98aa657052
Update src/resizer/distributors/collapse.js
...
Co-Authored-By: bwindels <bruno@windels.cloud>
2019-01-16 10:29:22 +00:00
2bd65e14b7
Update src/resizer/distributors/fixed.js
...
Co-Authored-By: bwindels <bruno@windels.cloud>
2019-01-16 10:29:15 +00:00
a5424f32a5
Update src/resizer/item.js
...
Co-Authored-By: bwindels <bruno@windels.cloud>
2019-01-16 10:29:05 +00:00
899ee265e3
Merge branch 'experimental' into bwindels/searchmakeover
2019-01-16 11:17:38 +01:00
924e1f9e4a
don't show event search results with underline/blue
2019-01-16 11:14:30 +01:00
b14d436e98
make cancel button icon slightly larger
2019-01-16 11:14:19 +01:00
David Baker