enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Commit Graph

  • a8d85ca2ad Merge pull request #756 from matrix-org/dbkr/add_msisdn David Baker 2017-03-24 10:54:22 +00:00
  • bc67b1c87e Merge pull request #3451 from vector-im/dbkr/add_msisdn David Baker 2017-03-24 10:53:25 +00:00
  • 5e3b991ec2 PR feedback fixes David Baker 2017-03-24 10:45:38 +00:00
  • df15c9be55 Merge pull request #769 from matrix-org/dbkr/dont_crash_on_login David Baker 2017-03-23 14:20:10 +00:00
  • 707fd60624 Prevent crash on login of no guest session David Baker 2017-03-23 10:38:00 +00:00
  • d5272149f6 Another unmounted guard David Baker 2017-03-22 16:42:44 +00:00
  • b58d8bffe1 More PR feedback David Baker 2017-03-22 16:41:08 +00:00
  • 3d71cb8325 Merge pull request #768 from matrix-org/kegan/memleaks-are-bad-mkay Kegsay 2017-03-22 16:39:07 +00:00
  • 6b78440466 Unmounted guard David Baker 2017-03-22 16:36:42 +00:00
  • e39979a61f Convert to old style react class David Baker 2017-03-22 16:15:45 +00:00
  • cca607d469 Make phone number form a bit more semantic David Baker 2017-03-22 15:39:09 +00:00
  • 4cd24d15d4 Factor out AddPhoneNumber to a separate component David Baker 2017-03-22 15:18:27 +00:00
  • 4cebded04f Add canResetTimeline callback and thread it through to TimelinePanel Kegan Dougal 2017-03-22 15:06:52 +00:00
  • 6a37fc4325 Comment typos David Baker 2017-03-22 12:00:16 +00:00
  • fc9928ce08 Merge pull request #767 from matrix-org/dbkr/recaptcha_show_busy David Baker 2017-03-22 11:56:11 +00:00
  • 6a56828974 Just return the promise if it's a bg request David Baker 2017-03-22 11:25:33 +00:00
  • 5ae7d5e4b2 More comments David Baker 2017-03-22 11:13:00 +00:00
  • e5a5ca9efc Don't set busy state at all for background request David Baker 2017-03-22 10:53:15 +00:00
  • ec63e18b42 Show spinner whilst processing recaptcha response David Baker 2017-03-21 18:40:41 +00:00
  • 4326d7a182 Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn David Baker 2017-03-21 13:45:16 +00:00
  • d5f7b3983b Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn David Baker 2017-03-21 13:44:55 +00:00
  • 8e3a68dbdc Merge pull request #3426 from vector-im/dbkr/msisdn_signin_2 David Baker 2017-03-21 13:43:49 +00:00
  • 4a29d674f8 Merge pull request #750 from matrix-org/dbkr/msisdn_signin_2 David Baker 2017-03-21 13:43:11 +00:00
  • fefaf66a81 Merge pull request #758 from matrix-org/dbkr/threepid_display David Baker 2017-03-21 11:22:56 +00:00
  • 9ccda7ed81 Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display David Baker 2017-03-21 11:11:45 +00:00
  • 05148b6e93 Add contributor to listing Michael Telatynski 2017-03-20 13:31:26 +00:00
  • 89447b7bfc Explicitly specify level of inversion to avoid inconsistent defaults with webkit-filter/filter Michael Telatynski 2017-03-20 13:31:00 +00:00
  • 69c3bd7f80 Escape closes UserSettings Michael Telatynski 2017-03-20 12:13:21 +00:00
  • f65cc940c3 Merge pull request #764 from lieuwex/fix-extraneous-space-emote Matthew Hodgson 2017-03-19 21:34:13 +00:00
  • bf8973ad33 avoid leading space in HTML /me too Matthew Hodgson 2017-03-19 21:33:18 +00:00
  • c697b48f99 fix leading extraneous space in emotes Lieuwe Rooijakkers 2017-03-19 21:52:24 +01:00
  • 7891f9b246 UnknownBody: add explanatory title Aviral Dasgupta 2017-03-19 15:18:19 +05:30
  • af122172f1 Merge pull request #3470 from kfatehi/277-confirmredact Matthew Hodgson 2017-03-19 02:36:01 +00:00
  • 68f66e9425 Merge pull request #763 from kfatehi/277-confirmredact Matthew Hodgson 2017-03-19 02:35:01 +00:00
  • df63c779dd clarify that redact === delete Matthew Hodgson 2017-03-19 02:34:25 +00:00
  • 25a4f4e3b6 Add ConfirmRedactDialog component Keyvan Fatehi 2017-03-18 18:58:28 -07:00
  • a9ed2e20cb Confirm redactions with a dialog Keyvan Fatehi 2017-03-18 17:45:13 -07:00
  • b3fc1844e8 don't show link preview when link is inside of a quote Lieuwe Rooijakkers 2017-03-18 11:43:35 +01:00
  • 92d5f55a46 Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display David Baker 2017-03-17 13:55:07 +00:00
  • 33f5c286bb Merge pull request #760 from matrix-org/dbkr/fix_test_waitforcomponent David Baker 2017-03-17 13:54:34 +00:00
  • be02ac3bc6 Fix people section again Luke Barnard 2017-03-17 12:06:48 +00:00
  • 7ecabe49d2 Fix people section DropTarget and refactor Rooms Luke Barnard 2017-03-17 11:59:22 +00:00
  • 23c38bd8a3 Put back both done's David Baker 2017-03-16 17:47:15 +00:00
  • 375ae8fb04 Fix password UI auth test David Baker 2017-03-16 17:26:42 +00:00
  • f8a1634720 Merge pull request #759 from matrix-org/luke/display-redactions-better David Baker 2017-03-16 17:14:10 +00:00
  • e3e2e3a56c Merge pull request #3453 from vector-im/luke/display-redactions-better David Baker 2017-03-16 17:12:11 +00:00
  • 49be954d31 Better CSS for redactions Luke Barnard 2017-03-16 17:03:16 +00:00
  • d4ed9e816b Display timestamps and profiles for redacted events Luke Barnard 2017-03-16 17:00:10 +00:00
  • c413de4452 Merge pull request #757 from matrix-org/luke/fix-unverified-warning-voip Luke Barnard 2017-03-16 15:18:12 +00:00
  • b06111202d Display threepids slightly prettier David Baker 2017-03-16 15:16:24 +00:00
  • 3ce0da4528 Fix UDD for voip in e2e rooms Luke Barnard 2017-03-16 15:05:54 +00:00
  • ad306dd999 CSS for add phone number in UserSettings David Baker 2017-03-16 14:59:13 +00:00
  • af8c3edba6 Support adding phone numbers in UserSettings David Baker 2017-03-16 14:56:26 +00:00
  • e04a368f7e Merge pull request #755 from matrix-org/luke/export-e2e-on-logout Luke Barnard 2017-03-16 14:53:06 +00:00
  • 544a6593e1 Unregister the UploadBar event listener on unmount Kegan Dougal 2017-03-16 14:19:17 +00:00
  • b21f016d37 Add "Export E2E keys" option to logout dialog Luke Barnard 2017-03-16 14:18:18 +00:00
  • f51a022be3 Merge pull request #754 from matrix-org/luke/fix-room-list-people David Baker 2017-03-16 13:22:40 +00:00
  • 2efcf7023f Merge pull request #3448 from vector-im/luke/fix-room-list-people David Baker 2017-03-16 13:19:45 +00:00
  • 67757a16f3 Don't remove the line that gets the error message David Baker 2017-03-16 12:54:18 +00:00
  • f8298b2482 Fix the people section Luke Barnard 2017-03-16 11:36:57 +00:00
  • ed22a74eaf Fix People section a bit Luke Barnard 2017-03-16 11:31:47 +00:00
  • d292a627d8 Handle no-auth-flow error from js-sdk David Baker 2017-03-15 16:44:56 +00:00
  • 648ad8d66c Merge pull request #753 from matrix-org/luke/fix-register-not-routing David Baker 2017-03-15 13:18:34 +00:00
  • 5330e47b3f Add null check Luke Barnard 2017-03-15 13:05:03 +00:00
  • 238e48e4af Do routing to /register _onLoadCompleted Luke Barnard 2017-03-15 12:02:08 +00:00
  • 3325dd6ede Merge pull request #747 from matrix-org/luke/increase-scrollback-window Richard van der Hoff 2017-03-15 11:46:34 +00:00
  • 1cb653ac16 Merge pull request #751 from matrix-org/luke/fix-start-login Luke Barnard 2017-03-14 15:19:30 +00:00
  • 47958180a6 Add null check to start_login Luke Barnard 2017-03-14 15:13:36 +00:00
  • c4d3d66f31 Support for phone number registration/signin, mk2 David Baker 2017-03-14 14:45:54 +00:00
  • 2c1ac29d30 Send legacy parameters on login call David Baker 2017-03-14 14:37:18 +00:00
  • 1ade7a711c Merge pull request #3395 from vector-im/luke/merge-RoomTile-context-menus Luke Barnard 2017-03-14 14:19:41 +00:00
  • 5e93dde0dd Merge pull request #746 from matrix-org/luke/merge-RoomTile-context-menus Luke Barnard 2017-03-14 14:19:36 +00:00
  • 0e95926925 Merge pull request #748 from matrix-org/luke/logout-after-deactivate David Baker 2017-03-14 14:13:08 +00:00
  • c717dc02ab Merge pull request #745 from matrix-org/luke/UDE-file-upload Luke Barnard 2017-03-14 14:11:11 +00:00
  • 32b9ee7f6f Copyright Luke Barnard 2017-03-14 14:07:10 +00:00
  • e4c155a881 Merge branch 'develop' into luke/merge-RoomTile-context-menus Luke Barnard 2017-03-14 14:01:47 +00:00
  • 17c9fcbb85 Merge branch 'develop' into luke/UDE-file-upload Luke Barnard 2017-03-14 13:59:04 +00:00
  • 4e6541b404 Merge pull request #3385 from vector-im/luke/fix-screen-after-login David Baker 2017-03-14 13:47:55 +00:00
  • 30b442515e Merge pull request #743 from matrix-org/luke/fix-screen-after-login David Baker 2017-03-14 13:44:08 +00:00
  • 878413f6a4 Support msisdn signin David Baker 2017-03-14 11:50:13 +00:00
  • ba0715ba7c Fix import for Lifecycle Luke Barnard 2017-03-13 14:10:14 +00:00
  • d8a30aa848 Double UNPAGINATION_PADDING again Luke Barnard 2017-03-13 13:48:15 +00:00
  • 925bbb79ad fix kick dialog CSS Matthew Hodgson 2017-03-13 00:47:33 +00:00
  • df22c90016 fix kick dialog CSS Matthew Hodgson 2017-03-13 00:47:20 +00:00
  • ffba088192 fix CSS for ChatCreateOrReuseDialog Matthew Hodgson 2017-03-13 00:03:53 +00:00
  • 8a0b08e7f6 fix CSS for ChatCreateOrReuseDialog.js Matthew Hodgson 2017-03-13 00:03:33 +00:00
  • bf64f387ce name class to match file Matthew Hodgson 2017-03-12 23:50:12 +00:00
  • 3a849bce60 name class to match file Matthew Hodgson 2017-03-12 23:48:57 +00:00
  • 185473b898 copyright... Matthew Hodgson 2017-03-12 23:48:49 +00:00
  • d639eb1049 beautify all error msgs Matthew Hodgson 2017-03-12 23:26:26 +00:00
  • 3aaf37df1a beautify a tonne more errors Matthew Hodgson 2017-03-12 22:59:41 +00:00
  • 71e0780eee beautify search fail error Matthew Hodgson 2017-03-12 22:24:16 +00:00
  • 0a0293d8fb fix focus on cancel button Matthew Hodgson 2017-03-12 20:13:53 +00:00
  • e5a5b5cd08 oops Matthew Hodgson 2017-03-12 20:13:39 +00:00
  • 4ad825e4fe fix up cancelbutton CSS Matthew Hodgson 2017-03-12 20:04:07 +00:00
  • 611bb3a857 beautiful error on roomdirectory fail Matthew Hodgson 2017-03-12 20:04:02 +00:00
  • b7d5d2fd56 beautify UserSettings error msg fix up default dialog cancel button Matthew Hodgson 2017-03-12 20:03:05 +00:00
  • 8dc7f8efe2 rte: remove logging and fix new history Aviral Dasgupta 2017-03-10 21:10:27 +05:30
  • 6004f6d610 rte: fix history Aviral Dasgupta 2017-03-10 20:34:31 +05:30
  • e5b3ec83b3 Revert "Support for phone number registration / signin (#3381)" Richard van der Hoff 2017-03-09 20:41:11 +00:00