Commit Graph

62959 Commits

Author SHA1 Message Date
Richard van der Hoff
dc1a0c554f v0.9.7 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
Richard van der Hoff
6d8dcd97af Merge branch 'master' into develop
(Keep js-sdk on develop)
2017-02-04 10:42:31 +00:00
Richard van der Hoff
a9cd1bfd4b v0.8.6 2017-02-04 10:30:16 +00:00
Richard van der Hoff
04bbf0a26b Prepare changelog for v0.8.6 2017-02-04 10:30:15 +00:00
Richard van der Hoff
39488f294b bump to js-sdk 0.7.5 2017-02-04 10:23:56 +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 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
19b0f956d2 v0.8.6-rc.3 2017-02-03 15:32:37 +00:00
Richard van der Hoff
aa164bf54c Prepare changelog for v0.8.6-rc.3 2017-02-03 15:32:37 +00:00
Richard van der Hoff
c52ae8ff01 Bump to js-sdk 0.7.5-rc.3 2017-02-03 15:28:03 +00:00
Richard van der Hoff
1334e0ae0d Prep changelog 2017-02-03 15:27:51 +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
Luke Barnard
4f3549cc37 Fix: actually get the team token 2017-02-03 14:42:22 +00:00
Richard van der Hoff
53e5c7eebe Unpin js-sdk & react-sdk 2017-02-03 14:39:11 +00:00
Richard van der Hoff
fd0a66ab99 Unpin js-sdk 2017-02-03 14:37:58 +00:00
Luke Barnard
173e80a5de Get team_token from the RTS on login
Use the /login endpoint of the RTS to get the team token when the user has successfully logged in.
2017-02-03 14:34:24 +00:00
Richard van der Hoff
827b5a6811 Fix deviceverifybuttons
Use DeviceInfo from deviceVerificationChanged event rather than calling
non-existent getStoredDevice
2017-02-03 14:34:19 +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 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
41936a957f v0.8.6-rc.2 2017-02-03 13:07:11 +00:00
David Baker
08276aefa7 Prepare changelog for v0.8.6-rc.2 2017-02-03 13:07:10 +00:00
David Baker
66e22d1d26 Bump js-sdk 2017-02-03 13:04:42 +00:00
David Baker
3d45aa7455 v0.9.7-rc.1 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
David Baker
bded0a7e8e v0.8.6-rc.1 2017-02-03 12:13:42 +00:00
David Baker
aa1a3db7fe Prepare changelog for v0.8.6-rc.1 2017-02-03 12:13:42 +00:00
David Baker
25876837f5 released js-sdk 2017-02-03 12:11:24 +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
Luke Barnard
efae5f6bf1 Use localStorage team token with fall-back on query parameter 2017-02-03 11:48:24 +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
Richard van der Hoff
5df5fed6f5 Merge pull request #675 from matrix-org/dbkr/fix_timeline_notifs_empty
Fix timeline & notifs panel spuriously being empty
2017-02-03 11:35:28 +00:00
Richard van der Hoff
2b67c1245f Merge pull request #636 from matrix-org/matthew/blacklist-unverified
UI for blacklisting unverified devices per-room & globally
2017-02-03 11:32:24 +00:00
Richard van der Hoff
3ea746db1d Fix RoomSettings
Don't enable encryption unless the box is checked!
2017-02-03 11:20:36 +00:00
David Baker
470e760e42 Fix timeline & notifs panel spuriously being empty
Only claim there's nothing to display once we've failed to back
paginate, otherwise we'll show the empty message instead of the
MessagePanel and therefore never try to back-paginate.
2017-02-03 11:11:37 +00:00
Richard van der Hoff
e018eef9fa UnknownDeviceDialog.js: tweak warning 2017-02-03 10:50:03 +00:00
David Baker
917be72965 Merge pull request #674 from matrix-org/matthew/better-unk-error
Show better error message in statusbar after UnkDevDialog
2017-02-03 09:38:19 +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
Matthew Hodgson
28d28b55d1 correctly reflect verify/blacklist state in UI 2017-02-03 01:49:22 +00:00