Matthew Hodgson
|
d8042b193b
|
be more specific on flex
|
2017-02-09 00:10:57 +00:00 |
|
Matthew Hodgson
|
5f745ff733
|
hopefully fix TopRight layout bug
|
2017-02-09 00:10:45 +00:00 |
|
Matthew Hodgson
|
bac142ad26
|
fix tintability of home button
|
2017-02-08 23:28:30 +00:00 |
|
Matthew Hodgson
|
caa30a742b
|
fix table visuals in dark skin
|
2017-02-08 23:19:05 +00:00 |
|
Richard van der Hoff
|
d7bc47c357
|
Merge pull request #3169 from vector-im/kegan/bugs-file-server
rageshake: Add file server with basic auth
|
2017-02-08 10:37:35 +00:00 |
|
Kegan Dougal
|
5f678eb838
|
Review comments: change realm name
|
2017-02-08 10:36:39 +00:00 |
|
Kegan Dougal
|
64eb1f08a9
|
rageshake: Add file server with basic auth
Set via environment variables on startup.
|
2017-02-08 09:59:41 +00:00 |
|
David Baker
|
85e6057598
|
Merge pull request #3162 from vector-im/luke/rts-fix-blm-team-token
Fix bug with home icon not appearing when logged in as team member
|
2017-02-08 09:54:33 +00:00 |
|
Richard van der Hoff
|
b080e5797b
|
Merge remote-tracking branch 'origin/master' into develop
|
2017-02-07 21:46:08 +00:00 |
|
Richard van der Hoff
|
f629b2f631
|
CONTRIBUTING: s/vector/riot/
|
2017-02-07 21:45:34 +00:00 |
|
Richard van der Hoff
|
c4ee47aa15
|
Merge branch 'master' into develop
|
2017-02-07 21:40:18 +00:00 |
|
Richard van der Hoff
|
0c7c31e3bb
|
Merge branch 'master' into rav/issue_template
|
2017-02-07 21:29:35 +00:00 |
|
Richard van der Hoff
|
0442258865
|
More issue_template tweaks
Encourage rageshaking
don't insist on version for the web app
|
2017-02-07 21:25:58 +00:00 |
|
Richard van der Hoff
|
95f529f9a4
|
Tweak ISSUE_TEMPLATE
|
2017-02-07 20:35:14 +00:00 |
|
David Baker
|
be71da5657
|
Merge pull request #3150 from vector-im/kegan/dir-per-bug
Store bug reports in separate directories
|
2017-02-07 16:18:00 +00:00 |
|
Kegan Dougal
|
f16bb85f9b
|
Review comments
|
2017-02-07 16:04:06 +00:00 |
|
Luke Barnard
|
5b239adfb8
|
Fix bug with home icon not appearing when logged in as team member
|
2017-02-07 14:58:25 +00:00 |
|
David Baker
|
2f54034afe
|
Merge pull request #3103 from vector-im/luke/rts-welcome-pages
RTS Welcome Pages
|
2017-02-07 11:52:59 +00:00 |
|
Luke Barnard
|
fa552ad5af
|
Merge branch 'develop' into luke/rts-welcome-pages
|
2017-02-07 12:41:52 +01:00 |
|
Luke Barnard
|
35bc384c51
|
Set team token in state on mount
|
2017-02-07 11:39:31 +00:00 |
|
Luke Barnard
|
d490bd8638
|
Use home.html rather than welcome.html
|
2017-02-07 11:35:17 +00:00 |
|
Luke Barnard
|
8d4f81ff67
|
Remove redundant inline style
|
2017-02-07 11:34:49 +00:00 |
|
Luke Barnard
|
648204b6f9
|
Use import
|
2017-02-07 11:34:34 +00:00 |
|
Luke Barnard
|
3f49f020cf
|
Copyright
|
2017-02-07 11:19:01 +00:00 |
|
Kegan Dougal
|
678eccf33d
|
Store bug reports in separate directories
|
2017-02-06 16:18:08 +00:00 |
|
Kegsay
|
1f0b4853be
|
Merge pull request #3149 from vector-im/kegan/go-stds
rageshake: Abide by Go standards
|
2017-02-06 15:40:58 +00:00 |
|
Kegan Dougal
|
db31f0a087
|
Host API under /api. Use filepath.Join rather than string concatenation
|
2017-02-06 15:31:53 +00:00 |
|
Kegan Dougal
|
d4247e0179
|
Dump to bugs subdirectory
|
2017-02-06 14:56:06 +00:00 |
|
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 |