Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • da10660c86 Merge remote-tracking branch 'origin/develop' into rav/add_client_to_context David Baker 2016-11-04 10:35:41 +00:00
  • bd36792303 Merge pull request #535 from matrix-org/rav/factor_out_loggedinpanel David Baker 2016-11-04 10:34:52 +00:00
  • bc092d5c77 Merge branch 'master' into develop David Baker 2016-11-04 10:18:30 +00:00
  • 1c9a78a2f1 v0.8.4 David Baker 2016-11-04 10:13:23 +00:00
  • 11eb0a89eb Prepare changelog for v0.8.4 David Baker 2016-11-04 10:13:23 +00:00
  • d7d6b3b4a2 Released matrix-js-sdk & matrix-react-sdk David Baker 2016-11-04 10:12:21 +00:00
  • 6de5713543 Merge branch 'master' into develop David Baker 2016-11-04 10:11:24 +00:00
  • 1368d90e66 v0.7.5 David Baker 2016-11-04 10:09:11 +00:00
  • d7bc408070 Prepare changelog for v0.7.5 David Baker 2016-11-04 10:09:10 +00:00
  • fa967da2a9 matrix-js-sdk 0.6.4 David Baker 2016-11-04 10:07:50 +00:00
  • f5d95f7314 Use an env var for the package version David Baker 2016-11-04 09:40:24 +00:00
  • cb5b311e44 Move saveScrollState into RoomView Richard van der Hoff 2016-11-04 09:28:35 +00:00
  • ab7007784f Make MemberInfo use the matrixclient from the context Richard van der Hoff 2016-11-03 18:55:09 +00:00
  • d3f20e1d9d Add the MatrixClient to the react context Richard van der Hoff 2016-11-03 18:54:30 +00:00
  • f85a37c667 Factor out LoggedInView from MatrixChat Richard van der Hoff 2016-11-03 18:42:26 +00:00
  • 842b5aed56 The variable is called roomId here David Baker 2016-11-03 17:12:29 +00:00
  • a6d029c556 Fix copyright David Baker 2016-11-03 17:06:41 +00:00
  • d61714ab8d Merge branch 'markjh/encrypted-attachments' of github.com:matrix-org/matrix-react-sdk into markjh/encrypted-attachments Mark Haines 2016-11-03 16:39:32 +00:00
  • e949d91162 Handle decryption errors Mark Haines 2016-11-03 16:39:20 +00:00
  • 46301727c3 Actually add isomorphic-fetch David Baker 2016-11-03 15:53:52 +00:00
  • ed9c29d365 Use require so we can import conditionally David Baker 2016-11-03 15:45:12 +00:00
  • 527c390152 Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 David Baker 2016-11-03 15:35:45 +00:00
  • a6c794cb11 Merge pull request #2542 from vector-im/rav/webpack-dev-server David Baker 2016-11-03 15:35:17 +00:00
  • ff462580b0 Use webpack-dev-server instead of http-server Richard van der Hoff 2016-11-03 14:58:30 +00:00
  • 6869c679ef Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 David Baker 2016-11-03 14:58:12 +00:00
  • 4dab36d3b2 Merge pull request #2541 from vector-im/dbkr/blank_config_3 Richard van der Hoff 2016-11-03 14:56:16 +00:00
  • cfe63fa274 Better support no-config when loading from file David Baker 2016-11-03 14:43:10 +00:00
  • c1469f4e39 Merge pull request #2540 from vector-im/dbkr/fix_no_config Richard van der Hoff 2016-11-03 14:20:30 +00:00
  • 3601b44429 Fix loading with no config from HTTP David Baker 2016-11-03 14:17:23 +00:00
  • b3510d6973 Comment the menu stuff that we only do on mac David Baker 2016-11-03 13:37:40 +00:00
  • d9780239b6 Make indenting consistent with rest of project David Baker 2016-11-03 13:33:49 +00:00
  • fb3ca441ba Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 David Baker 2016-11-03 13:32:01 +00:00
  • 31a47a9efd Merge pull request #532 from matrix-org/dbkr/platform_version David Baker 2016-11-03 13:30:30 +00:00
  • efd0dab316 Merge pull request #2532 from vector-im/dbkr/platform_version David Baker 2016-11-03 13:30:19 +00:00
  • f1b72dfa09 Fix copyright David Baker 2016-11-03 11:51:41 +00:00
  • 4d0b492ba0 Merge remote-tracking branch 'origin/develop' into dbkr/platform_version David Baker 2016-11-03 11:51:23 +00:00
  • 8cafe4936d Merge remote-tracking branch 'origin/develop' into dbkr/platform_version David Baker 2016-11-03 11:51:06 +00:00
  • 3bcb447e03 Fix copyright David Baker 2016-11-03 11:48:49 +00:00
  • d408b7c180 Fix copyright David Baker 2016-11-03 11:47:57 +00:00
  • 108af83ae8 Just bind the right function to the button David Baker 2016-11-03 11:43:50 +00:00
  • 275a55266b Merge remote-tracking branch 'origin/develop' into dbkr/electron_3 David Baker 2016-11-02 19:46:02 +00:00
  • 5ae4228bfe Merge remote-tracking branch 'origin/develop' into dbkr/platform_version David Baker 2016-11-02 19:45:40 +00:00
  • 0944408946 Merge pull request #534 from matrix-org/dbkr/platform_notification David Baker 2016-11-02 19:44:12 +00:00
  • 18504ca14e Merge pull request #2533 from vector-im/dbkr/platform_notification David Baker 2016-11-02 19:43:17 +00:00
  • 6aba9f8eda Don't always claim we have notif support David Baker 2016-11-02 19:26:07 +00:00
  • 743e54f9bb Specify promise arg David Baker 2016-11-02 19:23:09 +00:00
  • e8494c3dc7 Split NewVersionBar release notes / changelog David Baker 2016-11-02 19:20:11 +00:00
  • caa3cb7d89 Electron support David Baker 2016-11-02 18:49:28 +00:00
  • 67dbd9fba9 Merge pull request #2534 from vector-im/dbkr/config_accept_blank Richard van der Hoff 2016-11-02 18:42:39 +00:00
  • 19238b9326 Use the defaults if given a blank config file David Baker 2016-11-02 17:57:27 +00:00
  • 8c3fed7559 CSS for changelogs David Baker 2016-11-02 17:48:47 +00:00
  • 17bb47676e Make VectorBasePlatform David Baker 2016-11-02 17:45:35 +00:00
  • bd3fa6a7c5 Move version specific stuff to vector David Baker 2016-11-02 17:44:57 +00:00
  • 757604fd60 Add Notification support to the Web Platform David Baker 2016-11-02 17:36:48 +00:00
  • 920e3346dc Move Notifications into Platform David Baker 2016-11-02 17:35:31 +00:00
  • c75118caa2 Merge branch 'develop' into dbkr/platform_version Richard van der Hoff 2016-11-02 16:35:31 +00:00
  • b057577b15 Merge branch 'develop' into dbkr/platform_version Richard van der Hoff 2016-11-02 16:34:43 +00:00
  • e0cea74c7e Encrypt attachments in encrypted rooms, decrypt image attachments when displaying them Mark Haines 2016-11-02 16:26:10 +00:00
  • 0b5085ecbb Merge pull request #2531 from vector-im/dbkr/platform David Baker 2016-11-02 16:21:14 +00:00
  • 58c0e0e056 Merge pull request #531 from matrix-org/dbkr/platform David Baker 2016-11-02 16:20:20 +00:00
  • 29bdf992ff s/fir/for/ David Baker 2016-11-02 16:15:35 +00:00
  • 64fdb290eb Move 'new version' support into Platform David Baker 2016-11-02 16:02:55 +00:00
  • 3c4370c180 Move 'new version' support into Platform David Baker 2016-11-02 15:58:17 +00:00
  • a714edbf2b Implement Platforms David Baker 2016-11-02 15:12:51 +00:00
  • f433f9ca32 Move platform-specific functionality into Platform David Baker 2016-11-02 15:10:21 +00:00
  • 735c298de3 Merge branch 'release-v0.8.4' into develop David Baker 2016-11-02 12:01:30 +00:00
  • db07ef7899 Update readme to point to github releases David Baker 2016-11-02 12:01:01 +00:00
  • 03caaeef07 Back to develop js-sdk & react-sdk David Baker 2016-11-02 11:47:30 +00:00
  • 91793a7a8e v0.8.4-rc.2 David Baker 2016-11-02 11:40:04 +00:00
  • 7323ae5bf5 Prepare changelog for v0.8.4-rc.2 David Baker 2016-11-02 11:40:04 +00:00
  • d04cc03c1c Take version from first arg, if given David Baker 2016-11-02 11:38:11 +00:00
  • 4fb273284d v0.8.4-rc.1 David Baker 2016-11-02 11:17:36 +00:00
  • 3bfdbad5ba Prepare changelog for v0.8.4-rc.1 David Baker 2016-11-02 11:17:36 +00:00
  • 890751951c Released js-sdk & react-sdk David Baker 2016-11-02 11:11:40 +00:00
  • f2e59f1bd3 matrix-js-sdk dep back to develop David Baker 2016-11-02 11:10:20 +00:00
  • a8a6a9d73d v0.7.5-rc.1 David Baker 2016-11-02 11:08:02 +00:00
  • 6cd55e0811 Prepare changelog for v0.7.5-rc.1 David Baker 2016-11-02 11:08:02 +00:00
  • 2cb9e606be Use released js-sdk David Baker 2016-11-02 11:03:52 +00:00
  • ba7e02c3b1 Merge pull request #2528 from vector-im/dbkr/package_is_now_dist David Baker 2016-11-01 15:48:06 +00:00
  • 622ab27254 gitignore dist David Baker 2016-11-01 15:35:41 +00:00
  • a6417c287f Merge pull request #530 from matrix-org/dbkr/no_pack_world Richard van der Hoff 2016-11-01 15:27:21 +00:00
  • f17e851435 Rename the package script/output dir to 'dist' David Baker 2016-11-01 15:22:06 +00:00
  • ce19739899 Remove .npmignore as it's superseeded by 'files' David Baker 2016-11-01 15:16:49 +00:00
  • 3e8fcac303 Explicitly list file sin package.json David Baker 2016-11-01 15:15:31 +00:00
  • 9e69b48762 Merge pull request #529 from matrix-org/rav/fix_codestyle_quoting David Baker 2016-11-01 13:13:22 +00:00
  • 86a24fb5de Fix some markdown ih the code style doc Richard van der Hoff 2016-11-01 11:11:37 +00:00
  • 8349ea4b0e fix code style for ES6 classes Matthew Hodgson 2016-11-01 10:58:56 +00:00
  • 5e84a6c39e Merge pull request #2518 from vector-im/rav/ignore_olm_if_missing Richard van der Hoff 2016-10-27 10:28:27 +01:00
  • a86f2720bc Avoid errors if olm is missing Richard van der Hoff 2016-10-27 10:16:10 +01:00
  • a53c1958eb Merge pull request #527 from matrix-org/dbkr/highlight_async David Baker 2016-10-27 09:57:23 +01:00
  • 974e4c05c8 Merge pull request #528 from matrix-org/rav/fix_tinting David Baker 2016-10-27 09:57:00 +01:00
  • 6246fdee7c Fix room tinting Richard van der Hoff 2016-10-26 23:11:34 +01:00
  • 8cf273a460 Run highlight.js asynchronously David Baker 2016-10-26 18:41:28 +01:00
  • b174d49f9d Merge pull request #2515 from vector-im/rav/cache_busting Richard van der Hoff 2016-10-26 16:58:27 +01:00
  • 31ed719df1 webpack: Improve comment on HtmlWebpackPlugin Richard van der Hoff 2016-10-26 16:52:26 +01:00
  • c19538d6ce Merge branch 'develop' into rav/cache_busting Richard van der Hoff 2016-10-26 16:50:45 +01:00
  • 3adf5fe3fd Merge pull request #2517 from vector-im/rav/upgrade_olm Richard van der Hoff 2016-10-26 16:50:22 +01:00
  • bd0e121f0e Merge pull request #2516 from vector-im/rav/no_pack_world Richard van der Hoff 2016-10-26 16:48:22 +01:00
  • de1f7861d6 Bump to olm 2.0.0 Richard van der Hoff 2016-10-26 16:20:42 +01:00
  • 8395717f9b Merge pull request #525 from matrix-org/dbkr/fix_spin_on_join David Baker 2016-10-26 15:46:42 +01:00