PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
3109 commits 1 branch 0 tags 338 MiB
Commit graph

3109 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff
af765c7522 Merge branch 'master' into develop 
(Keep react-sdk and js-sdk on develop)
 2017-02-04 11:04:25 +00:00
Richard van der Hoff
dc1a0c554f v0.9.7 2017-02-04 10:55:46 +00:00
Richard van der Hoff
08cdf21aee Prepare changelog for v0.9.7 2017-02-04 10:55:46 +00:00
Richard van der Hoff
cd7bc3bfd3 Bump to js-sdk 0.7.5 and react-sdk 0.8.6 2017-02-04 10:52:41 +00:00
Kegsay
18ac71e8c0 Merge pull request #3072 from vector-im/kegan/rageshake-server 
Bug report server script
 2017-02-03 17:33:51 +00:00
Richard van der Hoff
dea557619c v0.9.7-rc.3 2017-02-03 15:44:37 +00:00
Richard van der Hoff
961f279a82 Prepare changelog for v0.9.7-rc.3 2017-02-03 15:44:37 +00:00
David Baker
e0be012737 Bump olm version 
Looks like this is causing pickle errors on packaged builds.
 2017-02-03 15:35:20 +00:00
Richard van der Hoff
d176e83e94 Bump matrix-js-sdk and react-sdk 2017-02-03 15:34:15 +00:00
Richard van der Hoff
541eb45e1a Jenkins: use default olm 
... to stop us making a release and realising we forgot to bump the olm version
in vector-web.
 2017-02-03 15:06:03 +00:00
Richard van der Hoff
53e5c7eebe Unpin js-sdk & react-sdk 2017-02-03 14:39:11 +00:00
Richard van der Hoff
640beeedda Merge pull request #3125 from vector-im/dbkr/olm_version 
Bump olm version
 2017-02-03 13:52:37 +00:00
David Baker
5285d56a45 Bump olm version 
Looks like this is causing pickle errors on packaged builds.
 2017-02-03 13:51:02 +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
Luke Barnard
e77709bc71 Merge branch 'develop' into luke/rts-welcome-pages 
Conflicts:
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
 2017-02-02 14:03:21 +00:00
Luke Barnard
a2622a556c Remove SdkConfig dep 2017-02-02 14:01:12 +00:00
Luke Barnard
6a9e5deb7b Remove commented code 2017-02-02 14:00:21 +00:00
Luke Barnard
20a7e3adf9 Migrate existing pages over to RTS 
See matrix-org/riot-team-server#14
 2017-02-02 13:58:22 +00:00
Matthew Hodgson
c6def48fe0 try to make joining rooms more obvious 2017-02-02 13:32:36 +00:00
Luke Barnard
f2e62ff439 Use RTS URL passed through 2017-02-02 11:58:20 +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
Luke Barnard
4a34bee2dc Use localStorage mx_team_token to decide welcome page 2017-02-02 11:12:43 +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
Luke Barnard
40609d7da3 then->done 2017-02-01 11:39:23 +00:00
Luke Barnard
1f3ab4425a Merge branch 'develop' into matthew/homepages 
Conflicts:
	src/component-index.js
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
 2017-02-01 11:34:24 +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