Commit Graph

  • 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
  • 5a58c8bda4 Don't include the world in the published packages Richard van der Hoff 2016-10-26 15:35:54 +01:00
  • 32ebd8083b Stray comma David Baker 2016-10-26 15:32:09 +01:00
  • 6396c60645 Put a cachebuster in the names of CSS and JS files Richard van der Hoff 2016-10-25 17:07:43 +01:00
  • f700bb4efa Merge pull request #2514 from vector-im/rav/webpack_olm Richard van der Hoff 2016-10-26 15:18:27 +01:00
  • 53e5894759 Merge branch 'develop' into rav/webpack_olm Richard van der Hoff 2016-10-26 15:13:57 +01:00
  • 8fe05fdff3 Correct path to components.css Richard van der Hoff 2016-10-26 15:02:34 +01:00
  • e002575eae Merge pull request #2513 from vector-im/rav/no_bundle_components_css David Baker 2016-10-26 14:52:29 +01:00
  • b37ba90a38 Merge pull request #526 from matrix-org/dbkr/prevent_read_receipt_exception_logout Richard van der Hoff 2016-10-26 14:46:43 +01:00
  • e1919c5ea3 Don't include two copies of the CSS in the tarball Richard van der Hoff 2016-10-26 13:32:26 +01:00
  • fcf683c8a7 Use webpack to copy olm.js Richard van der Hoff 2016-10-26 14:13:36 +01:00
  • e5a770a373 Don't send read receipt if user has logged out David Baker 2016-10-26 13:19:36 +01:00
  • a2eb0a9cf0 Fix CPU spin on joining rooms David Baker 2016-10-26 13:09:53 +01:00
  • e564d34ca8 Merge pull request #2512 from vector-im/dbkr/firefox_roomdir_align Richard van der Hoff 2016-10-26 10:49:59 +01:00
  • 61d7db6eb6 Correct text alignment on room directory search David Baker 2016-10-26 10:35:46 +01:00
  • 5768f73bbd Merge pull request #2510 from vector-im/dbkr/ref-is-not-rel Richard van der Hoff 2016-10-25 14:51:30 +01:00
  • df94dd7487 Update ChangelogDialog.js David Baker 2016-10-25 14:41:02 +01:00
  • 4221781d9b Merge pull request #2507 from vector-im/rav/readme Richard van der Hoff 2016-10-25 11:29:51 +01:00
  • e0556789d2 readme tweaks Richard van der Hoff 2016-10-25 11:20:23 +01:00
  • 9310d92605 document integrations config in README David Baker 2016-10-21 14:59:13 +01:00
  • 8a2f57d234 Merge pull request #2491 from vector-im/rav/riot Richard van der Hoff 2016-10-20 17:06:14 +01:00
  • d72323bfc5 typo Richard van der Hoff 2016-10-20 17:05:44 +01:00
  • dfd0356609 s/vector/riot/ in the readme Richard van der Hoff 2016-10-20 16:54:30 +01:00
  • 20a7aa03ed Merge pull request #2480 from vector-im/dbkr/babelrc2 David Baker 2016-10-17 17:22:49 +01:00
  • f56aff7cb9 Merge pull request #523 from matrix-org/dbkr/babelrc2 David Baker 2016-10-17 17:02:23 +01:00
  • e02e0219a7 Add plugin that makes babel 6 not break everything David Baker 2016-10-17 15:37:31 +01:00
  • d04201d069 Replace stage & es2017 with specific plugins David Baker 2016-10-14 18:03:22 +01:00
  • 82de2ca4ec Remove transform-runtime David Baker 2016-10-13 10:57:10 +01:00
  • 18450058d7 Remove presets from karma.conf David Baker 2016-10-13 09:51:10 +01:00
  • f20b2593bc move babelcheck.js to scripts/ David Baker 2016-10-13 09:50:40 +01:00
  • 4d51a5de7e shebang David Baker 2016-10-13 09:41:09 +01:00
  • 8e0b61ca35 Reminder to restore links + stage2, not stage 0 David Baker 2016-10-12 18:08:52 +01:00
  • 61a543a694 Add babelcheck.js David Baker 2016-10-12 17:46:11 +01:00
  • 5608e97719 Remove babel-polyfill David Baker 2016-10-12 17:23:01 +01:00
  • d6f27add66 Upgrade to babel6 and enable some presets. Aviral Dasgupta 2016-10-02 17:28:24 +05:30
  • 2faf5702c9 Add plugin that makes babel 6 not break everything David Baker 2016-10-17 15:36:27 +01:00
  • f9ef6ba871 Replace stage & es2017 with the specific plugins David Baker 2016-10-14 18:02:26 +01:00