nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
62,970 Commits 258 Branches 582 Tags
056ecbb1380536f3b2959c0c19d4500a72adb3f2
Commit Graph

62970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
c973dbf1c4 0.7.5 has been released 2016-11-04 13:02:12 +00:00
Mark Haines
b6653dd0ed Move decryptFile into a utility function so that it can be shared between different components 2016-11-04 12:46:45 +00:00
Mark Haines
12fc70c671 Include the mimetype with the file info. Store the objectURL in state so that it can be used normally by the exising templates 2016-11-04 11:52:47 +00:00
Richard van der Hoff
5ac0aac65b Merge pull request #538 from matrix-org/dbkr/matrix_to_links 
Make room alias & user ID links matrix.to links
 2016-11-04 11:42:49 +00:00
David Baker
04c27205a3 Make room alias & user ID links matrix.to links 2016-11-04 11:38:28 +00:00
David Baker
3a0b63dbda Merge pull request #537 from matrix-org/rav/memberinfo_use_client_from_context 
Make MemberInfo use the matrixclient from the context
 2016-11-04 10:59:11 +00:00
David Baker
80bae0563d Merge pull request #2535 from vector-im/dbkr/electron_3 
Electron app (take 3)
 2016-11-04 10:56:59 +00:00
David Baker
f301e55b6e Merge remote-tracking branch 'origin/develop' into rav/memberinfo_use_client_from_context 2016-11-04 10:54:32 +00:00
David Baker
0ab46df94a Merge pull request #536 from matrix-org/rav/add_client_to_context 
Add the MatrixClient to the react context
 2016-11-04 10:54:11 +00:00
David Baker
9a00ec128c many semicolons 2016-11-04 10:46:51 +00:00
David Baker
da10660c86 Merge remote-tracking branch 'origin/develop' into rav/add_client_to_context 2016-11-04 10:35:41 +00:00
David Baker
bd36792303 Merge pull request #535 from matrix-org/rav/factor_out_loggedinpanel 
Factor out LoggedInView from MatrixChat
 2016-11-04 10:34:52 +00:00
David Baker
bc092d5c77 Merge branch 'master' into develop 2016-11-04 10:18:30 +00:00
David Baker
1c9a78a2f1 v0.8.4 2016-11-04 10:13:23 +00:00
David Baker
11eb0a89eb Prepare changelog for v0.8.4 2016-11-04 10:13:23 +00:00
David Baker
d7d6b3b4a2 Released matrix-js-sdk & matrix-react-sdk 2016-11-04 10:12:21 +00:00
David Baker
6de5713543 Merge branch 'master' into develop 2016-11-04 10:11:24 +00:00
David Baker
1368d90e66 v0.7.5 2016-11-04 10:09:11 +00:00
David Baker
d7bc408070 Prepare changelog for v0.7.5 2016-11-04 10:09:10 +00:00
David Baker
fa967da2a9 matrix-js-sdk 0.6.4 2016-11-04 10:07:50 +00:00
David Baker
f5d95f7314 Use an env var for the package version 
Because supplying arguments to npm scripts is a bad idea: it just
appends the arguments blindly to whatever the command was. Thanks,
npm.
 2016-11-04 09:40:24 +00:00
Richard van der Hoff
cb5b311e44 Move saveScrollState into RoomView 
It fits much more naturally here than in LoggedInView.
 2016-11-04 09:28:35 +00:00
Richard van der Hoff
ab7007784f Make MemberInfo use the matrixclient from the context 
An arbitrary component to demonstrate how this works
 2016-11-03 19:05:48 +00:00
Richard van der Hoff
d3f20e1d9d Add the MatrixClient to the react context 
Because that's the reacty way
 2016-11-03 19:02:27 +00:00
Richard van der Hoff
f85a37c667 Factor out LoggedInView from MatrixChat 
The idea here is to make a layer which sits around for as long as we have a
valid MatrixClient. Also it makes a plausible split for the render of
MatrixChat, even if they are much too tightly bound for now.
 2016-11-03 18:59:32 +00:00
David Baker
842b5aed56 The variable is called roomId here 2016-11-03 17:13:02 +00:00
David Baker
a6d029c556 Fix copyright 2016-11-03 17:06:41 +00:00
Mark Haines
d61714ab8d Merge branch 'markjh/encrypted-attachments' of github.com:matrix-org/matrix-react-sdk into markjh/encrypted-attachments 2016-11-03 16:39:32 +00:00
Mark Haines
e949d91162 Handle decryption errors 2016-11-03 16:39:20 +00:00
David Baker
46301727c3 Actually add isomorphic-fetch 2016-11-03 15:53:52 +00:00
David Baker
ed9c29d365 Use require so we can import conditionally 2016-11-03 15:45:12 +00:00
David Baker
527c390152 Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 2016-11-03 15:35:45 +00:00
David Baker
a6c794cb11 Merge pull request #2542 from vector-im/rav/webpack-dev-server 
Use webpack-dev-server instead of http-server
 2016-11-03 15:35:17 +00:00
Richard van der Hoff
ff462580b0 Use webpack-dev-server instead of http-server 
Advantages:
 * blocks while a rebuild is in progress so you're less likely to reload the
   old version

 * serves from memory rather than disk, so we no longer need to turn off the
   cachebuster to avoid filling the disk with bundles. Empirically, seems to
   last a plausible amount of time without OOMing; there's no real reason to
   believe it would use any more memory than webpack itself.

 * That in turn means we no longer need the hack to stop chrome caching old
   sourcemaps (because the sourcemap now has a cachebuster in its name).

 * one fewer process for parallelshell to (fail to) manage.

 * in future, we could consider the fancy hot-reload functionality.
 2016-11-03 15:08:55 +00:00
David Baker
6869c679ef Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 2016-11-03 14:58:12 +00:00
Richard van der Hoff
4dab36d3b2 Merge pull request #2541 from vector-im/dbkr/blank_config_3 
Better support no-config when loading from file
 2016-11-03 14:56:16 +00:00
David Baker
cfe63fa274 Better support no-config when loading from file 
We should still error if given a 5xx with an empty body.
 2016-11-03 14:43:10 +00:00
Richard van der Hoff
c1469f4e39 Merge pull request #2540 from vector-im/dbkr/fix_no_config 
Fix loading with no config from HTTP
 2016-11-03 14:20:30 +00:00
David Baker
3601b44429 Fix loading with no config from HTTP 2016-11-03 14:17:23 +00:00
David Baker
b3510d6973 Comment the menu stuff that we only do on mac 2016-11-03 13:37:40 +00:00
David Baker
d9780239b6 Make indenting consistent with rest of project 2016-11-03 13:33:49 +00:00
David Baker
fb3ca441ba Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 2016-11-03 13:32:01 +00:00
David Baker
31a47a9efd Merge pull request #532 from matrix-org/dbkr/platform_version 
Move 'new version' support into Platform
 2016-11-03 13:30:30 +00:00
David Baker
efd0dab316 Merge pull request #2532 from vector-im/dbkr/platform_version 
Move 'new version' support into Platform
 2016-11-03 13:30:19 +00:00
David Baker
f1b72dfa09 Fix copyright 2016-11-03 11:51:41 +00:00
David Baker
4d0b492ba0 Merge remote-tracking branch 'origin/develop' into dbkr/platform_version 2016-11-03 11:51:23 +00:00
David Baker
8cafe4936d Merge remote-tracking branch 'origin/develop' into dbkr/platform_version 2016-11-03 11:51:06 +00:00
David Baker
3bcb447e03 Fix copyright 2016-11-03 11:48:49 +00:00
David Baker
d408b7c180 Fix copyright 2016-11-03 11:47:57 +00:00
David Baker
108af83ae8 Just bind the right function to the button 
rather than deciding in onChangelogClicked
 2016-11-03 11:43:50 +00:00