Commit graph

13104 commits

Author SHA1 Message Date
Weblate
fab257798c Merge remote-tracking branch 'origin/develop' into develop 2018-12-19 18:11:21 +00:00
Travis Ralston
2e1e536d5c
Merge pull request #2347 from matrix-org/travis/custom-status
Custom status messages
2018-12-19 11:11:15 -07:00
Weblate
6db4e32f19 Merge remote-tracking branch 'origin/develop' into develop 2018-12-19 18:10:26 +00:00
J. Ryan Stinnett
fd94dc686f Handle errors when fetching commits for changelog
It's possible to get errors when fetching commits (for example, if the rate
limit is exceeded), so this will handle the error case and display it instead of
an infinite spinner.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 18:10:21 +00:00
Weblate
694093c775 Merge remote-tracking branch 'origin/develop' into develop 2018-12-19 17:46:44 +00:00
J. Ryan Stinnett
37256d2976 Use primary styling on download / clipboard key actions
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
J. Ryan Stinnett
24f0123ded Convert pass phrase entry to flexbox
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
J. Ryan Stinnett
a597ad10b0 Add a few more zxcvbn strings
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
J. Ryan Stinnett
9c4ff4048a Convert show recovery key to flexbox
This allows the buttons to fit on a single line and flows a bit better at low
widths.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
J. Ryan Stinnett
a22a9492a0 Remove duplicate CSS file for CreateKeyBackupDialog
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
Travis Ralston
a1347add95 Merge branch 'develop' into travis/custom-status 2018-12-19 10:33:34 -07:00
Travis Ralston
45f05092ed Add a comment to describe why we're not using the property we should be 2018-12-19 10:21:43 -07:00
Jeff Huang
b9793af90c Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1411 of 1411 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-12-19 13:40:52 +00:00
Bruno Windels
ad4991cd8b
Merge pull request #2376 from matrix-org/bwindels/redesignfeedbackdialog
Redesign: add feedback dialog & button in tag panel
2018-12-19 12:37:00 +00:00
Bruno Windels
f7ed1ff046 avoid buttons being deformed in collapsed state
unsure what this was doing before,
I suspect the BottomLeftMenu which is gone now.
2018-12-19 12:59:03 +01:00
Bruno Windels
b3a12867a6 remove extra blank lines 2018-12-19 12:56:08 +01:00
Bruno Windels
b826b0d998 Add redesign feedback dialog + button in tag panel 2018-12-19 12:27:05 +01:00
Bruno Windels
8b406eab3b
Merge pull request #2371 from matrix-org/bwindels/rmdot
Redesign: add badge with dot to rm button, to see it catches your eye better
2018-12-19 09:49:19 +00:00
Weblate
7c0cfa6f5f Merge remote-tracking branch 'origin/develop' into develop 2018-12-19 09:48:11 +00:00
Akarshan Biswas
73e20ebf9f Translated using Weblate (Hindi)
Currently translated at 36.8% (520 of 1411 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
2018-12-19 09:48:10 +00:00
David Baker
1ca91370f3
Merge pull request #2372 from matrix-org/dbkr/electron_sandbox
React-sdk changes to support sandboxed electron
2018-12-19 09:48:05 +00:00
Bruno Windels
c75c482cd0
Merge pull request #2374 from matrix-org/nadonomy/add-icon-fix
Fix misaligned (+) icon
2018-12-19 09:34:19 +00:00
Nad Chishtie
e09121556d Use a more sane SVG. 2018-12-19 09:28:33 +00:00
Kévin C
8c36e725c4 Translated using Weblate (French)
Currently translated at 100.0% (1411 of 1411 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-12-19 09:16:55 +00:00
Travis Ralston
04c9fff6ce Add a feature flag for custom status messages 2018-12-18 15:11:08 -07:00
Bruno Windels
e9ebc05eee
Merge pull request #2373 from matrix-org/nadonomy/gradient-fix
Avoid 'transparent black' gradients in left panel
2018-12-18 19:03:35 +00:00
Travis Ralston
d20a934642 Appease the linter 2018-12-18 11:04:16 -07:00
Nad Chishtie
a829bc901c Updated CSS syntax to avoid 'transparent black'. 2018-12-18 17:59:46 +00:00
David Baker
3a8b9ab850 unused import 2018-12-18 17:57:23 +00:00
Travis Ralston
ef60a34180 Clean up and follow code style 2018-12-18 10:53:37 -07:00
David Baker
37b3644fd9 React-sdk changes to support sandboxed electron 2018-12-18 17:40:30 +00:00
Bruno Windels
fc516cac76
Merge pull request #2370 from matrix-org/nadonomy/icons
Normalised icons
2018-12-18 17:33:49 +00:00
Bruno Windels
1d43712a8f Merge branch 'experimental' into nadonomy/icons 2018-12-18 18:22:24 +01:00
Weblate
8c93a6f4a3 Merge remote-tracking branch 'origin/develop' into develop 2018-12-18 17:01:42 +00:00
Besnik Bleta
618ed725c8 Translated using Weblate (Albanian)
Currently translated at 99.2% (1401 of 1411 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-12-18 17:01:41 +00:00
J. Ryan Stinnett
b036e59021 Enable ESLint rule to require defined components in JSX
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-18 17:01:37 +00:00
Bruno Windels
2ad9f45655 add badge with dot to rm button, so it catches your eye better 2018-12-18 17:56:05 +01:00
Nad Chishtie
074c96cd3e First pass of normalising icons. 2018-12-18 16:48:20 +00:00
Bruno Windels
8df139bfab
Merge pull request #2369 from matrix-org/bwindels/rhsdefaultsize
Redesign: give right panel default width
2018-12-18 16:20:51 +00:00
Bruno Windels
6653236543
Merge pull request #2368 from matrix-org/bwindels/fixloginfield
Redesign:  Fix login field looking inline
2018-12-18 16:19:52 +00:00
Bruno Windels
23f24a987c
Merge pull request #2367 from matrix-org/bwindels/selectqueryonclick
Redesign: select search query on focus
2018-12-18 16:19:24 +00:00
Bruno Windels
5e2ee883aa
Merge pull request #2366 from matrix-org/bwindels/fixrhscollapse
Redesign: fix remaining right panel collapse issues.
2018-12-18 16:19:02 +00:00
Bruno Windels
fd5ad56886 give right panel default width of 350px 2018-12-18 17:12:32 +01:00
Bruno Windels
c917b4038b scope default input style rules to MatrixChat 2018-12-18 17:02:48 +01:00
Bruno Windels
dd6dd7a4fc select search query on focus 2018-12-18 16:37:37 +01:00
Bruno Windels
4b788fcb7e fix lint 2018-12-18 16:29:31 +01:00
Bruno Windels
c0ab74d5f1 reemit view_right_panel_phase when showing rhs, so right tab is active 2018-12-18 16:27:17 +01:00
Weblate
cc980014b7 Merge remote-tracking branch 'origin/develop' into develop 2018-12-18 14:57:52 +00:00
Travis Ralston
66f5d0612c
Merge pull request #2363 from matrix-org/travis/fix-group-view
Make sure to grab the InlineSpinner object
2018-12-18 07:57:46 -07:00
Bruno Windels
92c598dbcf remove group header expand right panel button 2018-12-18 15:38:15 +01:00