Commit Graph

  • 818f21c248 Merge pull request #893 from matrix-org/luke/unit-test-rts-reg Luke Barnard 2017-05-17 10:33:26 +01:00
  • 826a571b60 apply same image to the window/taskbar too; as per request LETS MAKE IT CLEAR WE ARE NEEDY AND WANT ATTENTION Michael Telatynski 2017-05-17 10:05:50 +01:00
  • 696234694c Merge pull request #892 from matrix-org/rav/pastefiles Richard van der Hoff 2017-05-17 09:59:23 +01:00
  • 39b6c7c65d ignore electron_app subdirs properly, missed these too :L Michael Telatynski 2017-05-17 09:53:33 +01:00
  • e1089574ae Write some tests for the RTS UI Luke Barnard 2017-05-17 09:46:17 +01:00
  • 8695397abb Support for pasting files into normal composer Richard van der Hoff 2017-05-17 01:41:42 +01:00
  • 9fc9de3af5 Revert "Merge pull request #3654 from vector-im/matthew/quick-search" David Baker 2017-05-16 17:21:49 +01:00
  • 844ea390c8 Revert "clear the searchbox after quick-search" David Baker 2017-05-16 17:13:55 +01:00
  • fdf326c9f0 Revert "Cancel quick-search on Escape, clearing it and returning focus to composer." David Baker 2017-05-16 17:13:39 +01:00
  • 9399b7ddf0 Revert "fix incoming call box" David Baker 2017-05-16 16:35:17 +01:00
  • 03476705b1 Revert "better solution to incomingcallbox weirdness" David Baker 2017-05-16 16:35:06 +01:00
  • 3cead032c2 Revert "Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2" David Baker 2017-05-16 16:27:58 +01:00
  • 75eea89c08 Revert "Merge pull request #765 from t3chguy/t3chguy/escape-closes-user-settings" David Baker 2017-05-16 16:12:57 +01:00
  • ebfafb3639 Revert "Merge pull request #807 from matrix-org/matthew/quick-search" David Baker 2017-05-16 16:11:01 +01:00
  • 67c6a8b81d Revert "unbreak stack overflow which fires on tests due to mocked timers" David Baker 2017-05-16 16:02:13 +01:00
  • eddc2af92d Revert "HOW DID THIS EVER WORK?" David Baker 2017-05-16 16:01:54 +01:00
  • 7a949b6a45 Revert "oops, actually refresh roomlist when its state changes!" David Baker 2017-05-16 16:01:32 +01:00
  • b063c605a8 Revert "fix stupid typos in RoomList's shouldComponentUpdate" David Baker 2017-05-16 16:01:14 +01:00
  • 714cd6a10f Revert "recalculate roomlist when your invites change" David Baker 2017-05-16 16:00:34 +01:00
  • 1aabaec158 Revert "comment out spammy CTD logging" David Baker 2017-05-16 15:35:22 +01:00
  • ff9c40472a Revert "Merge pull request #822 from t3chguy/BaseDialog_restore_focus" David Baker 2017-05-16 14:50:29 +01:00
  • 19dcd83aeb Revert "Merge pull request #841 from matrix-org/luke/fix-double-dialogs" David Baker 2017-05-16 14:50:19 +01:00
  • 387529d130 Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2" David Baker 2017-05-16 14:49:55 +01:00
  • d06bd3cf9d Revert "Fix Create Room button" David Baker 2017-05-16 14:30:02 +01:00
  • f8d1a6d240 Revert "Fix 'start chat' button" David Baker 2017-05-16 14:26:46 +01:00
  • ca907f42dc Fix redundant getComponent Luke Barnard 2017-05-16 14:24:24 +01:00
  • 219bfffea2 Only dispatch password_changed when password has changed Luke Barnard 2017-05-16 14:24:09 +01:00
  • 58ada2c27d move mxEvent.status check to js-sdk Michael Telatynski 2017-05-16 14:14:06 +01:00
  • 2c5fb01f03 Fix bugs introduced by dodgy merge Luke Barnard 2017-05-16 14:13:22 +01:00
  • db78534b45 remove no longer required parseIntWithDefault Michael Telatynski 2017-05-16 14:10:00 +01:00
  • d55f4f9e6a use new RoomState method from matrix-org/matrix-js-sdk/pull/435 Michael Telatynski 2017-05-16 14:08:00 +01:00
  • 49437e301e Merge pull request #890 from matrix-org/luke/new-guest-access-change-pwd Luke Barnard 2017-05-16 14:05:19 +01:00
  • c6ff45261d Merge pull request #3921 from vector-im/luke/new-guest-access-set-pwd-dialog Luke Barnard 2017-05-16 14:05:03 +01:00
  • 6bd7af2917 Revert "Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1" David Baker 2017-05-16 14:00:09 +01:00
  • 66985e6d08 Merge branch 'new-guest-access' into luke/new-guest-access-change-pwd Luke Barnard 2017-05-16 13:59:54 +01:00
  • 11d88aa6a2 import dispatcher Luke Barnard 2017-05-16 13:55:25 +01:00
  • 36ec39ffc0 Merge branch 'new-guest-access' into luke/new-guest-access-set-pwd-dialog Luke Barnard 2017-05-16 13:49:18 +01:00
  • 48856c31f8 Dispatch password_changed when SetPasswordDialog finished Luke Barnard 2017-05-16 13:48:56 +01:00
  • aff1e14efc first go at show redact only if we can redact Michael Telatynski 2017-05-16 13:15:14 +01:00
  • e367fb5a98 disabledConfirmation -> confirm Luke Barnard 2017-05-16 12:45:30 +01:00
  • 5a3c32044e disableConfirmation -> confirm Luke Barnard 2017-05-16 12:45:14 +01:00
  • c6350379dc Merge pull request #881 from matrix-org/luke/user-settings-remove-current-password Luke Barnard 2017-05-16 12:29:23 +01:00
  • 633c6b39f6 Add comment to Lifecycle Luke Barnard 2017-05-16 11:58:37 +01:00
  • eb36e979c2 Reference store token, call .remove on it on unmount Luke Barnard 2017-05-16 11:52:51 +01:00
  • f7e6a996c5 Add proptype Luke Barnard 2017-05-16 11:51:09 +01:00
  • e6f6b8cebd Merge pull request #3924 from vector-im/luke/new-guest-access-need-to-set-mx-id Luke Barnard 2017-05-16 11:48:24 +01:00
  • 93ecdc90a9 Make confirmation optional on ChangePassword Luke Barnard 2017-05-16 11:45:01 +01:00
  • 79d32868a6 Replace NeedToRegister with SetMxId dialog Luke Barnard 2017-05-16 11:39:30 +01:00
  • 5814a3fdc8 Fix copyright Luke Barnard 2017-05-16 10:11:44 +01:00
  • 0e787a09c3 Implement dialog to set password Luke Barnard 2017-05-16 09:44:52 +01:00
  • c8ac60768d Merge pull request #3919 from vector-im/t3chguy/patch-1 Matthew Hodgson 2017-05-15 21:15:03 +01:00
  • cef26a5b20 fix #3894 Michael Telatynski 2017-05-15 21:14:01 +01:00
  • c15a67a8d8 Merge pull request #887 from matrix-org/t3chguy/guests_cant_filter Matthew Hodgson 2017-05-15 19:45:49 +01:00
  • d7eec27c4b Merge pull request #889 from matrix-org/luke/new-guest-access-need-to-set-mx-id Luke Barnard 2017-05-15 18:36:20 +01:00
  • f199f3599e Replace NeedToRegisterDialog /w SetMxIdDialog Luke Barnard 2017-05-15 17:31:26 +01:00
  • 269fd51130 Remove SessionStore listener on unmount Luke Barnard 2017-05-15 17:17:32 +01:00
  • eb0041d21a Remove redundant state Luke Barnard 2017-05-15 17:03:54 +01:00
  • 5584a5cdfd Merge pull request #882 from matrix-org/luke/new-guest-access-welcome-user Luke Barnard 2017-05-15 15:06:44 +01:00
  • f73cf772fb Move sessionStore ref from MatrixChat to LoggedInView Luke Barnard 2017-05-15 14:56:05 +01:00
  • da3cb0ee48 SessionStore extends flux.Store Luke Barnard 2017-05-15 14:52:19 +01:00
  • 824da83ecd Merge pull request #888 from matrix-org/luke/reskindex-cache-filenames Richard van der Hoff 2017-05-15 11:39:43 +01:00
  • 8715b5233c link to #/register Michael Telatynski 2017-05-15 10:31:17 +01:00
  • 15201d86aa Prevent reskindex -w from running when file names have not changed Luke Barnard 2017-05-15 10:16:47 +01:00
  • 83cb1e6e29 tell guests they can't use filepanel until they register Michael Telatynski 2017-05-15 10:15:35 +01:00
  • 317e24852d explicitly label email & phone add sections; fixes https://github.com/vector-im/riot-web/issues/3531 Matthew Hodgson 2017-05-15 03:03:17 +01:00
  • 486301cffb remove dodgy heuristics for hiding dates on RRs and use DateUtils instead. Matthew Hodgson 2017-05-15 02:55:07 +01:00
  • 6879f7ee6f add presence to MemberInfo, fixes https://github.com/vector-im/riot-web/issues/3720 Matthew Hodgson 2017-05-15 02:43:23 +01:00
  • fe61a7eefd fix off-by-one pixel errors in login field heights - fixes https://github.com/vector-im/riot-web/issues/3738 Matthew Hodgson 2017-05-15 02:32:25 +01:00
  • 582a34c937 cursor pointer for avatar upload in user settings Matthew Hodgson 2017-05-15 02:24:34 +01:00
  • 5c0c49e1f6 ignore voip answer/hangup in unread events - fixes https://github.com/vector-im/riot-web/issues/3827 Matthew Hodgson 2017-05-15 02:18:18 +01:00
  • 82092dc2d8 onClick MELS avatars = expand MELS; fixes https://github.com/vector-im/riot-web/issues/3899 Matthew Hodgson 2017-05-15 02:14:50 +01:00
  • 7d8c104cb8 Merge pull request #884 from matrix-org/t3chguy/tiny_usersettings_fixes Matthew Hodgson 2017-05-15 01:57:45 +01:00
  • 7f78e737eb Merge pull request #880 from matrix-org/t3chguy/fixRoomHeaderPreviewing Matthew Hodgson 2017-05-15 01:52:42 +01:00
  • 24d09d8f5b Merge pull request #885 from matrix-org/t3chguy/rte_emote_weirdness Matthew Hodgson 2017-05-15 01:50:53 +01:00
  • 5181eb3ea5 Merge pull request #3894 from vector-im/t3chguy/change_release_vector2riot Matthew Hodgson 2017-05-15 01:43:57 +01:00
  • 48864b0880 fix visibility of topbar close on dark theme, fixing https://github.com/vector-im/riot-web/issues/3783 Matthew Hodgson 2017-05-15 01:39:57 +01:00
  • c5f2b69e48 add alt attributes to e2e icons on msgs; fixes https://github.com/vector-im/riot-web/issues/3786 Matthew Hodgson 2017-05-15 01:37:24 +01:00
  • c0cead1546 workaround for https://github.com/vector-im/riot-web/issues/3633. Matthew Hodgson 2017-05-15 01:32:37 +01:00
  • c3477a30a7 oops, rebuild modernizr to pull in new tests Matthew Hodgson 2017-05-15 01:22:32 +01:00
  • 8e2e6cee35 require indexeddb & webworkers in modernizr Matthew Hodgson 2017-05-15 01:07:25 +01:00
  • 25a727b8d8 use full date formats on timestamps - fixes https://github.com/vector-im/riot-web/issues/3874 Matthew Hodgson 2017-05-15 00:26:02 +01:00
  • f3274426db revert f999aa9 and support full date formats when desired Matthew Hodgson 2017-05-15 00:25:12 +01:00
  • 38cb123506 Merge pull request #883 from matrix-org/t3chguy/file_panel_fixes Matthew Hodgson 2017-05-15 00:19:45 +01:00
  • d7c88a9813 only removed /me , remove anyway to fix vector-im/riot-web#3733 Michael Telatynski 2017-05-13 15:20:31 +01:00
  • 6ec799a028 I broke UserSettings for webpack-dev-server where version file doesn't exist, version starts as null then gets set to undefined by the promise this wasn't handled and now undefined is understood to be unknown rather than null Michael Telatynski 2017-05-13 15:04:20 +01:00
  • aa7728cad3 tidy up tray.js - it made my eyes hurt Michael Telatynski 2017-05-13 12:41:13 +01:00
  • 808240eef9 shouldn't need this try-catch Michael Telatynski 2017-05-13 12:40:17 +01:00
  • 6aae97b812 Update tray tooltip based on document.title Michael Telatynski 2017-05-13 12:39:55 +01:00
  • 8927afca03 re-add electron node modules to gitignore Michael Telatynski 2017-05-13 12:37:27 +01:00
  • bbda658b7f make Electron tray icon mimic the Favico.js one DRY: moved Favicon stuff into the base platform Michael Telatynski 2017-05-13 12:37:13 +01:00
  • 29568feb95 show error if we can't set a filter this way it still works for a room we've been in before Michael Telatynski 2017-05-12 22:38:57 +01:00
  • 60b13d76a5 conform to Luke's other comment Michael Telatynski 2017-05-12 21:20:56 +01:00
  • 822f2f10f2 conform to Luke's comment https://github.com/matrix-org/matrix-react-sdk/pull/880#discussion_r116257726 Michael Telatynski 2017-05-12 21:16:55 +01:00
  • 69d860e982 revert name overengineering, undefined onClick should be fine on div Michael Telatynski 2017-05-12 21:06:36 +01:00
  • 67297bf827 Merge pull request #3906 from vector-im/luke/new-guest-access-welcome-user Luke Barnard 2017-05-12 19:17:33 +01:00
  • 683f1b8a1a Invite the welcome user after registration if configured Luke Barnard 2017-05-12 17:39:38 +01:00
  • f60be2d658 Add welcomeUserId to sample config Luke Barnard 2017-05-12 16:12:17 +01:00
  • 2b4c87aca6 Remove useless comment Luke Barnard 2017-05-12 16:02:38 +01:00
  • 536724e7c5 ES6 SessionStore Luke Barnard 2017-05-12 15:58:44 +01:00
  • 6ffe7ef9b2 Use same singleton impl as MatrixClientPeg for SessionStore Luke Barnard 2017-05-12 15:50:01 +01:00