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

Commit Graph

  • 9020a7515c Correctly bail out on unknown address David Baker 2017-01-25 14:50:00 +00:00
  • b00e090600 Do not show the bug report section if there is no bug_report_endpoint_url Kegan Dougal 2017-01-25 14:43:47 +00:00
  • e567162d28 Merge pull request #648 from matrix-org/rav/fix_set_displayname David Baker 2017-01-25 14:32:52 +00:00
  • 0021fb37f3 Set BaseAvatar_image bg colour = #fff Luke Barnard 2017-01-25 14:27:25 +00:00
  • 527c988574 Merge pull request #3049 from vector-im/dbkr/dev_server_no_hash David Baker 2017-01-25 13:47:25 +00:00
  • 1c926941d3 Add --output-chunk-file too David Baker 2017-01-25 11:28:59 +00:00
  • f9ca2a8e59 Fix _renderCommaSeparatedList Luke Barnard 2017-01-25 11:28:12 +00:00
  • f66e412d3a Merge pull request #643 from matrix-org/luke/fix-typing-indication David Baker 2017-01-25 11:13:55 +00:00
  • b887d5b823 Much linting Luke Barnard 2017-01-25 11:05:45 +00:00
  • fc9987a827 Merge pull request #646 from matrix-org/matthew/password-reset-warning David Baker 2017-01-25 11:04:35 +00:00
  • 24e94787dd A lot of linting Luke Barnard 2017-01-25 10:52:55 +00:00
  • d5edf26371 Improve comment Luke Barnard 2017-01-25 10:39:39 +00:00
  • 80c1ec0502 Merge pull request #3000 from vector-im/kegan/rageshake Kegsay 2017-01-25 10:34:05 +00:00
  • eaff0abfb0 Add link to Chrome issue status for fixing line numbers Kegan Dougal 2017-01-25 10:28:04 +00:00
  • 8091cf7df8 Enumerate->label Luke Barnard 2017-01-25 09:32:28 +00:00
  • f8e46819c5 Rename truncated->coalesced Luke Barnard 2017-01-25 09:28:26 +00:00
  • 3b8b2cf500 Document _getCanonicalTransitions Luke Barnard 2017-01-25 09:18:47 +00:00
  • e9719b1766 Get rid of .only Luke Barnard 2017-01-25 09:12:29 +00:00
  • 29b4dde878 Fix SetDisplayNameDialog Richard van der Hoff 2017-01-25 08:01:45 +00:00
  • 10018374f8 Allow modals to stack up Richard van der Hoff 2016-11-04 14:37:02 +00:00
  • 770820e6fa Fix a bunch of lint complaints Richard van der Hoff 2017-01-24 22:41:52 +00:00
  • 6a40abbbf0 actually, move signout warning to UserSettings.js Matthew Hodgson 2017-01-24 23:18:25 +01:00
  • 6e55bb4956 actually, move signout warning to UserSettings.js Matthew Hodgson 2017-01-24 23:15:00 +01:00
  • b85f53cadd Implement Megolm key importing Richard van der Hoff 2017-01-24 15:57:42 +00:00
  • e23deac1bb Implement e2e export Richard van der Hoff 2017-01-20 15:12:50 +00:00
  • b148619c52 warn on logout too Matthew Hodgson 2017-01-24 22:47:03 +01:00
  • 5b61d00533 warn users that changing/resetting password will nuke E2E keys Matthew Hodgson 2017-01-24 22:36:55 +01:00
  • 86276450f6 Add AccessibleButton to component-index Richard van der Hoff 2017-01-24 21:27:57 +00:00
  • 79e1108564 Merge branch 'develop' into rav/base_dialog Richard van der Hoff 2017-01-24 21:03:08 +00:00
  • 72492fd909 Fix broken merge Richard van der Hoff 2017-01-24 20:55:10 +00:00
  • 6dd46d532a Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux Richard van der Hoff 2017-01-24 20:47:24 +00:00
  • 6c263c1c89 Change what AddressTile takes to be Objects David Baker 2017-01-24 18:23:34 +00:00
  • 2ca871a028 Don't use hash-named directory for dev server David Baker 2017-01-24 18:18:56 +00:00
  • 56cf7a6af7 Create a common BaseDialog Richard van der Hoff 2017-01-24 15:54:05 +00:00
  • 5020307a6c Add a   after timestamp Ruben Barkow 2017-01-02 01:44:04 +01:00
  • a92fff9da7 Fix linting warnings Luke Barnard 2017-01-24 17:18:56 +00:00
  • 4186a769ca Default prop for whoIsTypingLimit Luke Barnard 2017-01-24 17:16:26 +00:00
  • e225d3e370 Preserve ordering of flush()es by not letting subsequent flush()es race Kegan Dougal 2017-01-24 17:05:01 +00:00
  • 55591f2019 Merge pull request #644 from matrix-org/kegan/rm-log-spam Richard van der Hoff 2017-01-24 16:43:06 +00:00
  • 97387db014 Reduce log spam: Revert a16aeeef2a Kegan Dougal 2017-01-24 16:40:26 +00:00
  • 9a360a48d2 Use the same property to limit avatars Luke Barnard 2017-01-24 16:04:37 +00:00
  • 7c66d1c867 Sync typing indication with avatar typing indication Luke Barnard 2017-01-24 16:01:39 +00:00
  • 5991172182 Review comments Kegan Dougal 2017-01-24 15:51:53 +00:00
  • 9a933e2ce5 Merge pull request #3045 from vector-im/kegan/rageshake-ui Kegsay 2017-01-24 15:47:49 +00:00
  • 3b9a112136 Add bug report UI Kegan Dougal 2017-01-24 14:47:11 +00:00
  • efbea0e942 Add css for bug report dialog Kegan Dougal 2017-01-24 14:45:16 +00:00
  • 91a052f817 Merge pull request #641 from matrix-org/luke/fix-statusbar-hidden David Baker 2017-01-24 14:43:46 +00:00
  • ce7434984b Expand timeline in situations when _getIndicator not null Luke Barnard 2017-01-24 14:32:52 +00:00
  • bd106968ce Merge branch 'develop' into luke/fix-join-part-collapsing-causality Luke Barnard 2017-01-24 14:22:18 +00:00
  • d690677bde Merge branch 'luke/fix-join-part-collapsing-causality' of github.com:matrix-org/matrix-react-sdk into luke/fix-join-part-collapsing-causality Luke Barnard 2017-01-24 14:17:11 +00:00
  • 28939d3146 Merge pull request #3043 from vector-im/luke/fix-status-bar-chopped David Baker 2017-01-24 14:07:55 +00:00
  • 307c4f3dd1 Increase the max-height of the expanded status bar Luke Barnard 2017-01-24 14:02:44 +00:00
  • 5091bab657 Fix failed merge #2 David Baker 2017-01-24 13:59:02 +00:00
  • 5f24fc3e5d Fix merge fail David Baker 2017-01-24 13:56:22 +00:00
  • 536167a6c8 Merge pull request #3040 from vector-im/rav/fix_test_fail David Baker 2017-01-24 13:48:01 +00:00
  • fe64b04339 More test resilience Richard van der Hoff 2017-01-24 13:35:41 +00:00
  • c0de0870ed Some sarcastic comments Richard van der Hoff 2017-01-24 13:31:52 +00:00
  • 31878d8a44 Also need eslint-config-google David Baker 2017-01-24 13:07:34 +00:00
  • 6f3b70dbb0 Use Q promises and isPending to make logic simpler Kegan Dougal 2017-01-24 12:43:18 +00:00
  • e18a6151e4 Merge pull request #640 from matrix-org/dbkr/eslint_find_extend_module Richard van der Hoff 2017-01-24 11:34:28 +00:00
  • f1f6fc809c Merge remote-tracking branch 'origin/develop' into dbkr/user_search_feedback David Baker 2017-01-24 11:26:09 +00:00
  • 597705716b Hopefully, fix intermittent test failure Richard van der Hoff 2017-01-24 11:26:09 +00:00
  • c47d3e04a5 Merge pull request #621 from matrix-org/dbkr/add_searching_known_users David Baker 2017-01-24 10:51:23 +00:00
  • 6db5329d9c Merge pull request #2971 from vector-im/dbkr/add_searching_known_users David Baker 2017-01-24 10:51:13 +00:00
  • ea82b90d35 Merge pull request #2981 from vector-im/luke/feature-animated-status-bar Luke Barnard 2017-01-23 23:08:23 +00:00
  • 706ffbec3c add riot logos Matthew Hodgson 2017-01-23 19:01:22 +01:00
  • f3df86872b Fix tightlooping when flush()ing without any logs Kegan Dougal 2017-01-23 17:37:57 +00:00
  • 905508f1ce Correctly get the path of the js-sdk .eslintrc.js David Baker 2017-01-23 17:33:09 +00:00
  • 1e77b2eba3 Bundle eslint config David Baker 2017-01-23 16:19:29 +00:00
  • 4c3ea13413 Make jenkins run the linter David Baker 2017-01-23 15:42:50 +00:00
  • 94fdd2bcd2 lint all David Baker 2017-01-23 15:41:33 +00:00
  • a06ecb87bc Hide RoomStatusBar when it displays nothing (#615) Luke Barnard 2017-01-23 16:01:39 +01:00
  • c31b65d093 Merge pull request #3032 from vector-im/dbkr/add_eslint_config Richard van der Hoff 2017-01-23 14:57:39 +00:00
  • 7a445e05f8 Merge pull request #639 from matrix-org/dbkr/lint_config_mocha Richard van der Hoff 2017-01-23 14:51:41 +00:00
  • bc714ba3a0 Add eslint config David Baker 2017-01-23 14:22:54 +00:00
  • 4d12a65529 Add mocha env for tests in eslint config David Baker 2017-01-23 14:16:25 +00:00
  • b7204bf868 Use primary bg color on statusArea Luke Barnard 2017-01-23 13:33:39 +00:00
  • c4d246cd72 Merge branch 'develop' into luke/feature-animated-status-bar Luke Barnard 2017-01-23 13:31:48 +00:00
  • b582cf0a5f Remove CSS for StatusBar mid-timeline Luke Barnard 2017-01-23 13:30:39 +00:00
  • f025afc297 Merge pull request #3030 from vector-im/luke/fix-typing-avatars-alignment David Baker 2017-01-23 12:44:47 +00:00
  • 3cfa539230 Merge pull request #637 from matrix-org/luke/fix-typing-avatars-displays-me David Baker 2017-01-23 12:43:34 +00:00
  • 3df686c272 Merge pull request #638 from matrix-org/rav/unbreak_verification David Baker 2017-01-23 12:33:25 +00:00
  • dc08d9dfdf Fix device verification from e2e info Richard van der Hoff 2017-01-23 12:18:41 +00:00
  • 506d37bbad Merge remote-tracking branch 'origin/develop' into dbkr/add_searching_known_users David Baker 2017-01-23 11:34:44 +00:00
  • f64a4e0ecb Merge pull request #623 from matrix-org/dbkr/user_search_word_boundary David Baker 2017-01-23 11:31:26 +00:00
  • d97fc0a99a Fix typing avatars displaying "me" Luke Barnard 2017-01-23 10:25:33 +00:00
  • 57126efe86 Reposition typing avatars relative to "is typing" Luke Barnard 2017-01-23 10:24:23 +00:00
  • 2ecf65f057 Keep the logs if no store exists Kegan Dougal 2017-01-23 09:28:48 +00:00
  • 7bc3fc8696 make UnknownDeviceDialog work again, other than the mess of vector-im/vector-web#3020 Matthew Hodgson 2017-01-22 01:28:43 +01:00
  • d907421ad4 crappy CSS for UnknownDeviceDialog Matthew Hodgson 2017-01-22 01:25:32 +01:00
  • d9c0513ee2 make it work Matthew Hodgson 2017-01-21 22:49:29 +01:00
  • 39c122fe4f fix local storage idiocy Matthew Hodgson 2017-01-21 22:27:55 +01:00
  • 532f4e59c9 literally blindly add verification buttons Matthew Hodgson 2017-01-21 19:06:15 +01:00
  • 071e364be2 improve the verify warning if blacklisting is unabled Matthew Hodgson 2017-01-21 17:56:48 +00:00
  • c618880af9 oops Matthew Hodgson 2017-01-21 17:43:46 +00:00
  • 3071fc0ddc UI for blacklisting unverified devices per-room & globally (written blind; untested as yet) Matthew Hodgson 2017-01-21 17:39:31 +00:00
  • 2e15e8f9b4 very barebones support for warning users when rooms contain unknown devices Matthew Hodgson 2017-01-21 05:13:36 +00:00
  • ef519231d6 fix mute button colors Matthew Hodgson 2017-01-20 21:16:58 +00:00
  • 83272f5cc5 fix badge color again Matthew Hodgson 2017-01-20 21:11:28 +00:00
  • 5b1fea46cb fix badge color Matthew Hodgson 2017-01-20 21:09:49 +00:00