Commit graph

2823 commits

Author SHA1 Message Date
Richard van der Hoff
d176e83e94 Bump matrix-js-sdk and react-sdk 2017-02-03 15:34:15 +00:00
David Baker
c2d2287541 v0.9.7-rc.2 2017-02-03 13:19:22 +00:00
David Baker
4d8bdfa07e Prepare changelog for v0.9.7-rc.2 2017-02-03 13:19:22 +00:00
David Baker
51de4a3347 Bump js-sdk & react-sdk 2017-02-03 13:08:20 +00:00
David Baker
3d45aa7455 v0.9.7-rc.1 2017-02-03 12:17:28 +00:00
David Baker
8f86cfa2d3 Prepare changelog for v0.9.7-rc.1 2017-02-03 12:17:28 +00:00
David Baker
cad2d72bfe Release js-sdk & react-sdk 2017-02-03 12:15:36 +00:00
Richard van der Hoff
0c8223da03 Merge branch 'rav/hotkey-ux' into develop 2017-02-03 12:01:50 +00:00
Richard van der Hoff
7ceaabb166 RightPanel: remove superfluous divs 2017-02-03 12:00:33 +00:00
Richard van der Hoff
67e14ff363 Merge branch 'develop' into rav/hotkey-ux 2017-02-03 11:43:32 +00:00
Richard van der Hoff
b20f6ff8c1 Silence webpack dev server
Configure the dev server not to spew module lists all over the console.

(Arguably the fact our module list is so long that I have to do this is a bug,
but my life is too short)
2017-02-03 11:40:07 +00:00
Matthew Hodgson
0050e1557d fix darktheme for close button 2017-02-03 02:06:50 +00:00
Matthew Hodgson
654a025a9f fix button width for unkdevdialog 2017-02-03 02:06:50 +00:00
Richard van der Hoff
5368c87dc1 Fix tests to run crypto code
Return a device_id from /login requests, so that all the crypto logic works.
2017-02-02 23:41:49 +00:00
Richard van der Hoff
1c2de1e483 Refactor karma config
- rename test:multi npm target to test-multi, for consistency with react-sdk
- base karma webpack config on the distribution one
- include Olm if we have it
- don't use the karma source loader - it's pointless given we webpack
  everything.
- turn off module listing in the webpack stats to shorten the console output
2017-02-02 23:33:12 +00:00
Richard van der Hoff
a64e1cb936 Merge pull request #3118 from vector-im/dbkr/network_dropdown_mxc
Allow mxc: URLs for icons in the NetworkDropdown
2017-02-02 19:53:46 +00:00
David Baker
3903954bf2 Allow mxc: URLs for icons in the NetworkDropdown
For https://github.com/vector-im/riot-web/issues/3086
2017-02-02 19:35:36 +00:00
David Baker
7c27153ec5 Merge pull request #3117 from vector-im/matthew/fix-top-right-menu
make TopRightMenu more intuitive
2017-02-02 18:48:14 +00:00
Matthew Hodgson
4c3a723aa8 make TopRightMenu more intuitive
should fix https://github.com/vector-im/riot-web/issues/2827
2017-02-02 18:42:03 +00:00
Matthew Hodgson
c4a590f6af CSS for empty timelinepanels 2017-02-02 16:18:20 +00:00
David Baker
00c26088b1 Merge pull request #3110 from vector-im/luke/css-reg-icons
Handle icons with width > height
2017-02-02 14:29:23 +00:00
Matthew Hodgson
c6def48fe0 try to make joining rooms more obvious 2017-02-02 13:32:36 +00:00
Luke Barnard
874e32699a Handle icons with width > height
Icons with width > height will now only assume a max-height of 100% as opposed to a height of 100%. This is so they don't overflow the width of 300px.
2017-02-02 11:30:14 +00:00
Matthew Hodgson
b137c82a7a tweak CSS for UnknownDeviceDialog to support scrollable content 2017-02-02 00:25:18 +00:00
Matthew Hodgson
23060a6833 fix ugly blue border on roomtiles 2017-02-01 22:24:23 +00:00
David Baker
0db97b8f5b Merge pull request #3105 from vector-im/rav/fix_jenkins_build
Fix jenkins build
2017-02-01 16:28:47 +00:00
Richard van der Hoff
3404521d5d Fix jenkins build
Do `npm install` on js-sdk rather than `npm run build`, which will hopefully
mean that `browserify` gets installed before we try to run it.

The README says we should use `npm install` for the react-sdk too, so let's do
that, and bring the travis and jenkins builds into sync with the README.
2017-02-01 16:11:11 +00:00
Matthew Hodgson
6369d76a74 poor man's dark theme for MD codeblocks 2017-01-27 18:18:23 +01:00
Luke Barnard
6374526f3c Merge pull request #3081 from vector-im/luke/css-login-support
Add CSS for a support box in login
2017-01-27 16:36:53 +00:00
Luke Barnard
78105bb4db Merge pull request #3082 from vector-im/luke/feature-optional-custom-login-logo
Allow a custom login logo to be displayed on login
2017-01-27 16:34:39 +00:00
Luke Barnard
87db89b67a Replace inline styles for logos with css
Also, give .mx_Login_logo a height so that if the image has not loaded yet, it will not change height (thanks @dbkr)
2017-01-27 16:30:44 +00:00
Luke Barnard
87f7324065 Merge pull request #3080 from vector-im/luke/css-fix-input-field-width
Fix the width of input fields within login/reg box
2017-01-27 16:15:00 +00:00
Luke Barnard
02d6a10f67 Allow a custom login logo to be displayed on login
This is to allow team logos to be shown when a user registers with a team email.
2017-01-27 16:08:14 +00:00
Luke Barnard
029602fc73 Fix the width of input fields within login/reg box
This is so they do not expand outside of the login area. (280px = 300px - 2px - 18px, 2px for borders, 18px for padding)
2017-01-27 16:04:24 +00:00
Luke Barnard
5aa9592c71 Add CSS for a support box in login
This box can be used to provide useful hints during registration/login.
2017-01-27 16:02:33 +00:00
David Baker
bb70622b55 Merge pull request #3057 from vector-im/luke/fix-avatar-image-background-colour
Set BaseAvatar_image bg colour = #fff
2017-01-26 16:34:01 +00:00
Kegan Dougal
b16fa4171a Close the dialog box after sending bugs 2017-01-26 13:42:37 +00:00
David Baker
7850f7e505 Fix badge spam: attempt 2 (#3073) 2017-01-26 12:58:29 +00:00
Richard van der Hoff
f29e0bfe6d Revert "Merge pull request #3067 from vector-im/matthew/fix-badge-spam"
This reverts commit f9db7f017d, reversing
changes made to 71b149de76.

This caused `number is not defined`
2017-01-26 12:16:44 +00:00
David Baker
f9db7f017d Merge pull request #3067 from vector-im/matthew/fix-badge-spam
only recalculate favicon if it changes
2017-01-26 11:44:11 +00:00
David Baker
71b149de76 Merge pull request #3064 from vector-im/dbkr/invite_look_up_emails
CSS tweak for email address lookup
2017-01-26 11:34:51 +00:00
David Baker
baed5bec46 Don't lint the autogenned file 2017-01-26 10:18:24 +00:00
David Baker
3c91f90dc9 Tweak desktop instructions (#3069)
to make it clear you need to do all the things in 'building from
source', including the build-react-sdk dance if you're building
develop.
2017-01-26 09:47:01 +00:00
Matthew Hodgson
ba5e7d4013 fix event-encrypting-color in dark theme 2017-01-26 00:54:00 +01:00
Matthew Hodgson
9797c2fb4b fix electron too 2017-01-26 00:31:52 +01:00
Matthew Hodgson
972a391296 only recalculate favicon if it changes 2017-01-26 00:28:22 +01:00
David Baker
4e41accc56 CSS tweak for email address lookup
CSS tweak for https://github.com/matrix-org/matrix-react-sdk/pull/653
2017-01-25 18:52:21 +00:00
Kegsay
c1290fd24d Merge pull request #3061 from vector-im/kegan/rageshake-glue
Glue the dialog to rageshake: honour sendLogs flag.
2017-01-25 17:20:51 +00:00
Kegan Dougal
0a9f02abcc Glue the dialog to rageshake: honour sendLogs flag. 2017-01-25 16:51:26 +00:00
Luke Barnard
0021fb37f3 Set BaseAvatar_image bg colour = #fff 2017-01-25 14:27:25 +00:00