5b239adfb8
Fix bug with home icon not appearing when logged in as team member
2017-02-07 14:58:25 +00:00
2f54034afe
Merge pull request #3103 from vector-im/luke/rts-welcome-pages
...
RTS Welcome Pages
2017-02-07 11:52:59 +00:00
fa552ad5af
Merge branch 'develop' into luke/rts-welcome-pages
2017-02-07 12:41:52 +01:00
35bc384c51
Set team token in state on mount
2017-02-07 11:39:31 +00:00
d490bd8638
Use home.html rather than welcome.html
2017-02-07 11:35:17 +00:00
8d4f81ff67
Remove redundant inline style
2017-02-07 11:34:49 +00:00
648204b6f9
Use import
2017-02-07 11:34:34 +00:00
3f49f020cf
Copyright
2017-02-07 11:19:01 +00:00
678eccf33d
Store bug reports in separate directories
2017-02-06 16:18:08 +00:00
1f0b4853be
Merge pull request #3149 from vector-im/kegan/go-stds
...
rageshake: Abide by Go standards
2017-02-06 15:40:58 +00:00
db31f0a087
Host API under /api. Use filepath.Join rather than string concatenation
2017-02-06 15:31:53 +00:00
d4247e0179
Dump to bugs subdirectory
2017-02-06 14:56:06 +00:00
af765c7522
Merge branch 'master' into develop
...
(Keep react-sdk and js-sdk on develop)
2017-02-04 11:04:25 +00:00
dc1a0c554f
v0.9.7
2017-02-04 10:55:46 +00:00
08cdf21aee
Prepare changelog for v0.9.7
2017-02-04 10:55:46 +00:00
cd7bc3bfd3
Bump to js-sdk 0.7.5 and react-sdk 0.8.6
2017-02-04 10:52:41 +00:00
18ac71e8c0
Merge pull request #3072 from vector-im/kegan/rageshake-server
...
Bug report server script
2017-02-03 17:33:51 +00:00
dea557619c
v0.9.7-rc.3
2017-02-03 15:44:37 +00:00
961f279a82
Prepare changelog for v0.9.7-rc.3
2017-02-03 15:44:37 +00:00
e0be012737
Bump olm version
...
Looks like this is causing pickle errors on packaged builds.
2017-02-03 15:35:20 +00:00
d176e83e94
Bump matrix-js-sdk and react-sdk
2017-02-03 15:34:15 +00:00
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
53e5c7eebe
Unpin js-sdk & react-sdk
2017-02-03 14:39:11 +00:00
640beeedda
Merge pull request #3125 from vector-im/dbkr/olm_version
...
Bump olm version
2017-02-03 13:52:37 +00:00
5285d56a45
Bump olm version
...
Looks like this is causing pickle errors on packaged builds.
2017-02-03 13:51:02 +00:00
c2d2287541
v0.9.7-rc.2
2017-02-03 13:19:22 +00:00
4d8bdfa07e
Prepare changelog for v0.9.7-rc.2
2017-02-03 13:19:22 +00:00
51de4a3347
Bump js-sdk & react-sdk
2017-02-03 13:08:20 +00:00
3d45aa7455
v0.9.7-rc.1
2017-02-03 12:17:28 +00:00
8f86cfa2d3
Prepare changelog for v0.9.7-rc.1
2017-02-03 12:17:28 +00:00
cad2d72bfe
Release js-sdk & react-sdk
2017-02-03 12:15:36 +00:00
0c8223da03
Merge branch 'rav/hotkey-ux' into develop
2017-02-03 12:01:50 +00:00
7ceaabb166
RightPanel: remove superfluous divs
2017-02-03 12:00:33 +00:00
67e14ff363
Merge branch 'develop' into rav/hotkey-ux
2017-02-03 11:43:32 +00:00
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
0050e1557d
fix darktheme for close button
2017-02-03 02:06:50 +00:00
654a025a9f
fix button width for unkdevdialog
2017-02-03 02:06:50 +00:00
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
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
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
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
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
4c3a723aa8
make TopRightMenu more intuitive
...
should fix https://github.com/vector-im/riot-web/issues/2827
2017-02-02 18:42:03 +00:00
c4a590f6af
CSS for empty timelinepanels
2017-02-02 16:18:20 +00:00
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
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
a2622a556c
Remove SdkConfig dep
2017-02-02 14:01:12 +00:00
6a9e5deb7b
Remove commented code
2017-02-02 14:00:21 +00:00
20a7e3adf9
Migrate existing pages over to RTS
...
See matrix-org/riot-team-server#14
2017-02-02 13:58:22 +00:00
c6def48fe0
try to make joining rooms more obvious
2017-02-02 13:32:36 +00:00
Luke Barnard