Commit Graph

  • 856ef58d46 fix commen Luke Barnard 2017-05-10 14:55:58 +01:00
  • fe8ea4ffe7 Rename vars, linting Luke Barnard 2017-05-10 14:51:47 +01:00
  • 30e183a7f1 Only send RR if we should Luke Barnard 2017-05-10 14:48:01 +01:00
  • 7f766d89c3 Rename variables, more comments Luke Barnard 2017-05-10 14:42:06 +01:00
  • 6257bfcd87 Add prop type for onDifferentServerClicked Luke Barnard 2017-05-10 14:28:48 +01:00
  • ad2ed12980 Redesign mxID chooser, add availability checking Luke Barnard 2017-05-10 14:22:17 +01:00
  • e67e891040 Merge pull request #3877 from vector-im/t3chguy/electron_install_fix David Baker 2017-05-10 13:48:18 +01:00
  • c607b1bc89 npm is "smart" enough to try and install our electron wrapper as a module instead of the actual electron package. With no way to ignore directories. I'd like to think of this as temporary, until I get to rip apart riot-web and riot-electron Michael Telatynski 2017-05-10 13:36:27 +01:00
  • a05567c378 Merge pull request #875 from matrix-org/t3chguy/871-windows-compat Luke Barnard 2017-05-09 17:40:14 +01:00
  • ca79d9bb6e Separate predicates for RM/RR Luke Barnard 2017-05-09 17:36:19 +01:00
  • fdf48def00 make reskindex windows friendly Michael Telatynski 2017-05-09 17:13:27 +01:00
  • 41738ec025 Merge pull request #3863 from vector-im/rav/bug_report_endpoint Richard van der Hoff 2017-05-09 12:34:40 +01:00
  • f9ae456a64 Fix bug report endpoint in config.sample.json. Richard van der Hoff 2017-05-09 12:27:41 +01:00
  • 3549ff2543 Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1 Luke Barnard 2017-05-09 11:36:35 +01:00
  • f02e659fb7 Consume key{up,down,pressed} events Michael Telatynski 2017-05-09 11:27:06 +01:00
  • ac25fd6d87 Remove log Luke Barnard 2017-05-09 10:16:37 +01:00
  • 488fa3745b Fix RM not updating if RR event unpaginated Luke Barnard 2017-05-09 10:03:40 +01:00
  • 1db677141e Merge pull request #871 from matrix-org/luke/fix-auto-reskindex Luke Barnard 2017-05-09 09:36:32 +01:00
  • f5a23c14df Remove redundant bind Luke Barnard 2017-05-08 17:32:26 +01:00
  • fe121126f5 Merge branch 'develop' into rte-fixes Luke Barnard 2017-05-08 17:08:59 +01:00
  • e5b1e4ce6d Merge pull request #873 from matrix-org/dbkr/room_name_in_leave_confirm David Baker 2017-05-08 17:02:53 +01:00
  • 85ed39b9d8 Put room name in 'leave room' confirmation dialog David Baker 2017-05-08 16:49:40 +01:00
  • c01e8e85ac Merge pull request #872 from matrix-org/dbkr/fix_left_panel David Baker 2017-05-08 16:40:17 +01:00
  • 805354bd2c Revert unintentional change David Baker 2017-05-08 16:39:11 +01:00
  • 9af9603373 Only watch indexed files Luke Barnard 2017-05-08 16:29:53 +01:00
  • 574c836941 Move chokidar to devDeps Luke Barnard 2017-05-08 16:24:13 +01:00
  • 9cae667c06 Fix Create Room button David Baker 2017-05-08 16:03:52 +01:00
  • 534f9277d4 Fix this/self fail in LeftPanel David Baker 2017-05-08 15:37:40 +01:00
  • 598f5e20c6 Merge pull request #870 from matrix-org/luke/fix-null-url-previews Luke Barnard 2017-05-08 15:23:18 +01:00
  • 7d1940620d Add (watching) reskindex to npm start Luke Barnard 2017-05-08 15:07:58 +01:00
  • 2eaaa97451 Give reskindex.js a watch mode (-w) Luke Barnard 2017-05-08 14:57:04 +01:00
  • 1b78737f12 Merge pull request #3817 from vector-im/luke/password-nag-bar David Baker 2017-05-08 15:00:37 +01:00
  • 1addc7e2c5 Update header copyright Luke Barnard 2017-05-08 14:56:38 +01:00
  • ca7989a1fd .gitignore auto-generated component-index Luke Barnard 2017-05-08 14:55:55 +01:00
  • d1f467ee91 Remove auto-generated component-index Luke Barnard 2017-05-08 14:53:00 +01:00
  • 39323647d1 Don't show null URL previews Luke Barnard 2017-05-08 14:01:44 +01:00
  • 2983b36d4c Merge pull request #3851 from vector-im/dbkr/missed_icons David Baker 2017-05-08 13:12:00 +01:00
  • 640aa98cf4 Update 2 missed icons to the new icon David Baker 2017-05-08 13:05:17 +01:00
  • 11d039477d Merge pull request #869 from matrix-org/dbkr/addressselector_keys David Baker 2017-05-08 12:47:53 +01:00
  • cafbe14589 Fix keys for AddressSelector David Baker 2017-05-08 11:59:06 +01:00
  • c841eb641b Fix 'start chat' button David Baker 2017-05-08 11:26:25 +01:00
  • 53796f55be Added default_federate property Pablo Saavedra 2017-05-08 12:25:45 +02:00
  • 17262ad80d Added TextInputWithCheckbox dialog Pablo Saavedra 2017-05-08 12:18:31 +02:00
  • e6133820a2 Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2 David Baker 2017-05-08 10:37:59 +01:00
  • 3366d3bbae Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2 David Baker 2017-05-08 10:37:55 +01:00
  • 5766a6e93d Give warning icon better alt Luke Barnard 2017-05-08 10:02:05 +01:00
  • c783f701dd reskindex Luke Barnard 2017-05-08 10:01:18 +01:00
  • 69382d36b1 Merge pull request #864 from matrix-org/luke/show-pwd-nag-bar Luke Barnard 2017-05-08 09:52:04 +01:00
  • bd32df4ef6 comment wording Michael Telatynski 2017-05-07 20:58:30 +01:00
  • 360f1cd250 completely missed the ESC check Michael Telatynski 2017-05-07 20:57:54 +01:00
  • 78e7272344 Fixes 2 issues with Dialog closing Michael Telatynski 2017-05-07 20:43:42 +01:00
  • d1db602b3a Merge pull request #3839 from vector-im/t3chguy/patch-1 Matthew Hodgson 2017-05-07 20:34:18 +01:00
  • ea72e9c7a0 match primary package.json Michael Telatynski 2017-05-07 20:33:13 +01:00
  • ceb71a4ef6 Merge pull request #866 from t3chguy/warn_on_unload Matthew Hodgson 2017-05-07 20:07:09 +01:00
  • a141350670 Explicitly save composer content onUnload small oversight, caught by Matthew Michael Telatynski 2017-05-07 20:01:55 +01:00
  • f056360f70 merge master post release Matthew Hodgson 2017-05-07 20:01:11 +01:00
  • 8e94d5240f merge master into develop post 0.9.9 Matthew Hodgson 2017-05-07 19:58:42 +01:00
  • 1e5908a31e speed up burndown generation by ~250x Matthew Hodgson 2017-05-07 19:34:05 +01:00
  • 5900c879ce Merge pull request #851 from t3chguy/warn_on_unload Matthew Hodgson 2017-05-07 18:17:18 +01:00
  • 2b2b43a7f3 Content in Composer is not lost on unload so it should be fine to scare the user thinking they have lost all of their content even though when they come back they can cry with joy :D Michael Telatynski 2017-05-07 18:15:37 +01:00
  • 40c98fc84f Merge pull request #3829 from vector-im/t3chguy/productName-missing David Baker 2017-05-06 12:20:30 +01:00
  • 9c6b3819a5 Re-add productName Michael Telatynski 2017-05-06 10:24:13 +01:00
  • 2b71123ddc suppress null member rejoins again Matthew Hodgson 2017-05-06 01:45:28 +01:00
  • b944fff5c5 unscrew merge Michael Telatynski 2017-05-05 20:57:18 +01:00
  • 110ca22c4c Merge branch 'develop' into webrtc_settings Michael Telatynski 2017-05-05 20:56:20 +01:00
  • 6013a3e71d Merge pull request #3683 from t3chguy/t3chguy/electron_version_inconsistency David Baker 2017-05-05 18:28:16 +01:00
  • 0deed1b511 Merge pull request #3790 from t3chguy/patch-2 David Baker 2017-05-05 18:25:29 +01:00
  • 2c36506342 Merge pull request #3622 from t3chguy/t3chguy/electron-persist-window-layout David Baker 2017-05-05 18:23:15 +01:00
  • 1a0ea29995 Remove redundant role elements David Baker 2017-05-05 17:51:14 +01:00
  • 309afdb813 no point installing deps here, builder will do it for us Michael Telatynski 2017-05-05 17:08:50 +01:00
  • 1ed1080bf3 Update README with npm run electron Michael Telatynski 2017-05-05 17:05:03 +01:00
  • a09f890619 Merge package.json, match version in electron/package.json Michael Telatynski 2017-05-05 17:03:28 +01:00
  • 499b04c254 Only install electron deps when we're bundling/running electron Michael Telatynski 2017-05-05 17:01:32 +01:00
  • 8a50207189 Change shebang to bash for string manipulations Michael Telatynski 2017-05-05 16:57:18 +01:00
  • f54708227e Proper two package.json format, release.sh bumps 2nd json ver too Michael Telatynski 2017-05-05 16:54:55 +01:00
  • 6f4eb9d8b1 Show password nag bar when user is PWLU Luke Barnard 2017-05-05 16:31:33 +01:00
  • f14c2a0a71 Implement PasswordNagBar Luke Barnard 2017-05-05 16:30:18 +01:00
  • 4fc4ae1e99 Size is a string, import react David Baker 2017-05-05 14:56:26 +01:00
  • 28e0a32d6c Merge pull request #862 from matrix-org/rav/log_device_id Richard van der Hoff 2017-05-05 14:52:49 +01:00
  • c27f39714a Dedicated classes for the buttons David Baker 2017-05-05 14:26:13 +01:00
  • 4a5821e199 Separate classes for the different buttons David Baker 2017-05-05 14:25:18 +01:00
  • e00605571b Fix the spinner to actually appear David Baker 2017-05-05 10:48:54 +01:00
  • e1cd046c1a Prevent zalgo-like text overflowing MELS summary Luke Barnard 2017-05-05 09:54:00 +01:00
  • ae76c76558 Fix #3450 - RM hidden by things Luke Barnard 2017-05-04 21:27:33 +01:00
  • 1001c98a3c Align buttons better with the text David Baker 2017-05-04 18:23:04 +01:00
  • f86ca5bc97 Hide empty tips if collapsed David Baker 2017-05-04 18:08:04 +01:00
  • bfceaa827b Log deviceid at login Richard van der Hoff 2017-05-04 18:04:47 +01:00
  • 8d4663f437 Fix lint in Lifecycle.js Richard van der Hoff 2017-05-04 18:03:35 +01:00
  • 8e3851b380 Merge pull request #860 from t3chguy/patch-4 Luke Barnard 2017-05-04 17:53:59 +01:00
  • 23a141c5ad Remove slightly misleading commented code David Baker 2017-05-04 17:46:44 +01:00
  • 8731e46900 Merge pull request #3808 from vector-im/dbkr/remove_babelcheck Luke Barnard 2017-05-04 17:45:59 +01:00
  • 6e30134403 Merge pull request #861 from matrix-org/dbkr/remove_babelcheck Luke Barnard 2017-05-04 17:45:37 +01:00
  • da960e776d Remove commented code David Baker 2017-05-04 17:45:11 +01:00
  • d419024da9 Merge pull request #3809 from vector-im/rav/include_mx_id_in_rageshake David Baker 2017-05-04 17:30:51 +01:00
  • f76b9b4489 remove link to issue Michael Telatynski 2017-05-04 17:25:23 +01:00
  • 45efdbdd43 Include MXID and device id in rageshakes Richard van der Hoff 2017-05-04 17:21:16 +01:00
  • 7918ff2fc2 Merge pull request #857 from t3chguy/t3chguy/settings_versions_improvements Luke Barnard 2017-05-04 16:56:45 +01:00
  • 7b320f8fbb Remove babelcheck David Baker 2017-05-04 16:51:36 +01:00
  • 396b38512c Remove babelcheck David Baker 2017-05-04 16:50:47 +01:00
  • da4c2f8b31 Guests can't send RR Michael Telatynski 2017-05-04 16:42:41 +01:00