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

Commit Graph

  • c09d173415 Merge branch 'develop' into matthew/warn-unknown-devices Matthew Hodgson 2017-02-01 22:34:55 +00:00
  • 23060a6833 fix ugly blue border on roomtiles Matthew Hodgson 2017-02-01 22:24:14 +00:00
  • acde1f3db7 Merge branch 'develop' into luke/rts-welcome-pages Luke Barnard 2017-02-01 17:22:45 +00:00
  • 0db97b8f5b Merge pull request #3105 from vector-im/rav/fix_jenkins_build David Baker 2017-02-01 16:28:47 +00:00
  • 3404521d5d Fix jenkins build Richard van der Hoff 2017-02-01 16:11:11 +00:00
  • f8d7902d2e Merge pull request #662 from matrix-org/luke/rts-handle-errors Luke Barnard 2017-02-01 11:44:04 +00:00
  • 40609d7da3 then->done Luke Barnard 2017-02-01 11:39:23 +00:00
  • 1f3ab4425a Merge branch 'develop' into matthew/homepages Luke Barnard 2017-02-01 11:34:24 +00:00
  • 028c40e293 Linting Luke Barnard 2017-02-01 11:16:14 +00:00
  • fa1981ce09 Use whatwg-fetch instead of browser-request Luke Barnard 2017-02-01 10:39:52 +00:00
  • f643224f93 Merge pull request #664 from matrix-org/rav/no_maxlen_jsx David Baker 2017-02-01 10:25:46 +00:00
  • 6f53b2de2c Merge pull request #663 from matrix-org/rav/fix_tests David Baker 2017-02-01 10:20:30 +00:00
  • cf049f2d75 Exempt lines which look like pure JSX from the maxlen line Richard van der Hoff 2017-02-01 09:59:46 +00:00
  • cd1cf09dc9 Make tests pass on Chrome again Richard van der Hoff 2017-01-31 22:40:53 +00:00
  • 2f188770e5 Typo Luke Barnard 2017-01-31 15:59:38 +00:00
  • be869a8ac6 Add referral section to user settings (#661) Luke Barnard 2017-01-31 15:55:42 +00:00
  • c261ca1f5e Allow base referral URL to be configurable Luke Barnard 2017-01-31 15:17:43 +00:00
  • 4c4cc585c7 Throw errors on !==200 status codes from RTS Luke Barnard 2017-01-31 13:40:01 +00:00
  • c2b0c603c0 Add referral section to user settings Luke Barnard 2017-01-31 13:17:01 +00:00
  • 91d33e3cc4 Merge pull request #660 from matrix-org/rav/megolm_export_fixes Richard van der Hoff 2017-01-31 13:13:20 +00:00
  • c5f447260a Megolm import: Fix handling of short files Richard van der Hoff 2017-01-31 12:30:30 +00:00
  • 62c8c20268 Megolm export: fix Android incompatibility Richard van der Hoff 2017-01-31 12:29:16 +00:00
  • 878e5593ba Implement tracking of referrals (#659) Luke Barnard 2017-01-31 11:13:05 +00:00
  • 9c99e78099 Merge pull request #658 from matrix-org/luke/rts-get-teams David Baker 2017-01-30 16:45:19 +00:00
  • 4e9229e936 Get rid of dupl. declaration Luke Barnard 2017-01-30 16:37:16 +00:00
  • 1e279d2335 Finish with .done() Luke Barnard 2017-01-30 16:35:34 +00:00
  • f5efc8e765 Use const, not var Luke Barnard 2017-01-30 16:33:16 +00:00
  • eb4d7f04e7 Use busy spinner when requesting teams Luke Barnard 2017-01-30 16:23:52 +00:00
  • 318d871097 Formatting Luke Barnard 2017-01-30 16:13:57 +00:00
  • 4e0889454a GET /teams from RTS instead of config.json Luke Barnard 2017-01-30 15:50:31 +00:00
  • f5458d34aa Fix inviting import fail David Baker 2017-01-27 21:57:34 +00:00
  • 6369d76a74 poor man's dark theme for MD codeblocks Matthew Hodgson 2017-01-27 18:18:14 +01:00
  • 6374526f3c Merge pull request #3081 from vector-im/luke/css-login-support Luke Barnard 2017-01-27 16:36:54 +00:00
  • 78105bb4db Merge pull request #3082 from vector-im/luke/feature-optional-custom-login-logo Luke Barnard 2017-01-27 16:34:39 +00:00
  • d9a8acd431 Redo team-based registration (#657) Luke Barnard 2017-01-27 16:31:36 +00:00
  • 87db89b67a Replace inline styles for logos with css Luke Barnard 2017-01-27 16:30:44 +00:00
  • 87f7324065 Merge pull request #3080 from vector-im/luke/css-fix-input-field-width Luke Barnard 2017-01-27 16:15:00 +00:00
  • 02d6a10f67 Allow a custom login logo to be displayed on login Luke Barnard 2017-01-27 16:08:14 +00:00
  • 029602fc73 Fix the width of input fields within login/reg box Luke Barnard 2017-01-27 16:04:24 +00:00
  • 5aa9592c71 Add CSS for a support box in login Luke Barnard 2017-01-27 16:02:33 +00:00
  • f462bd8f99 Expand status *area* unless status *bar* not visible (#655) Luke Barnard 2017-01-26 18:07:42 +00:00
  • 853d94e2d4 Merge pull request #656 from matrix-org/luke/fix-setState-warnings-from-RoomView David Baker 2017-01-26 18:06:41 +00:00
  • 9c99dafba5 Guard onStatusBarVisible/Hidden with this.unmounted Luke Barnard 2017-01-26 17:03:01 +00:00
  • bb70622b55 Merge pull request #3057 from vector-im/luke/fix-avatar-image-background-colour David Baker 2017-01-26 16:34:01 +00:00
  • 2c7b3d9a02 UnknownDeviceDialog: Reword the warning Richard van der Hoff 2017-01-26 14:55:58 +00:00
  • 0a3d9fc17f Fix lint Richard van der Hoff 2017-01-26 14:12:00 +00:00
  • 67bd2cf9dd Merge branch 'matthew/warn-unknown-devices' into matthew/blacklist-unverified Richard van der Hoff 2017-01-26 14:09:25 +00:00
  • b16fa4171a Close the dialog box after sending bugs Kegan Dougal 2017-01-26 13:42:26 +00:00
  • 7850f7e505 Fix badge spam: attempt 2 (#3073) David Baker 2017-01-26 12:58:29 +00:00
  • 22bb0f9d30 UTC please Kegan Dougal 2017-01-26 12:17:47 +00:00
  • f29e0bfe6d Revert "Merge pull request #3067 from vector-im/matthew/fix-badge-spam" Richard van der Hoff 2017-01-26 12:16:44 +00:00
  • 6a40ad8a20 Fail the request if we clash files Kegan Dougal 2017-01-26 11:57:56 +00:00
  • f9db7f017d Merge pull request #3067 from vector-im/matthew/fix-badge-spam David Baker 2017-01-26 11:44:11 +00:00
  • aae62ff94e store logs Kegan Dougal 2017-01-26 11:44:07 +00:00
  • f06de1f129 Merge pull request #654 from matrix-org/rav/fix_e2e_dialog_cancel David Baker 2017-01-26 11:41:30 +00:00
  • e2edecc55b Merge pull request #653 from matrix-org/dbkr/invite_look_up_emails David Baker 2017-01-26 11:35:06 +00:00
  • 71b149de76 Merge pull request #3064 from vector-im/dbkr/invite_look_up_emails David Baker 2017-01-26 11:34:51 +00:00
  • e8c51a0b54 gzip bug reports when storing on disk. Set max payload size Kegan Dougal 2017-01-26 11:28:38 +00:00
  • c42b705497 Use a cancel function David Baker 2017-01-26 10:54:07 +00:00
  • 646ace6e59 Merge branch 'develop' into kegan/rageshake-server Kegan Dougal 2017-01-26 10:48:40 +00:00
  • baed5bec46 Don't lint the autogenned file David Baker 2017-01-26 10:18:24 +00:00
  • 23a25e550d Missed a function David Baker 2017-01-26 10:09:33 +00:00
  • bf66f77acb Set state in _lookupThreepid David Baker 2017-01-26 10:08:44 +00:00
  • 3c91f90dc9 Tweak desktop instructions (#3069) David Baker 2017-01-26 09:47:01 +00:00
  • ba5e7d4013 fix event-encrypting-color in dark theme Matthew Hodgson 2017-01-26 00:54:00 +01:00
  • 9797c2fb4b fix electron too Matthew Hodgson 2017-01-26 00:31:52 +01:00
  • 972a391296 only recalculate favicon if it changes Matthew Hodgson 2017-01-26 00:28:22 +01:00
  • 60d7575146 Merge branch 'matthew/warn-unknown-devices' of github.com:matrix-org/matrix-react-sdk into matthew/warn-unknown-devices Richard van der Hoff 2017-01-25 23:17:57 +00:00
  • ebf6ba8994 explicitly set device known-ness Matthew Hodgson 2017-01-25 23:52:48 +01:00
  • 70190be65c Factor out common onSendMessageFailed Richard van der Hoff 2017-01-25 19:06:15 +00:00
  • 5da6ca8fc1 Refactor UnknownDeviceDialog Richard van der Hoff 2017-01-25 18:25:40 +00:00
  • 5538ce7c30 Merge branch 'develop' into matthew/warn-unknown-devices Richard van der Hoff 2017-01-25 22:22:50 +00:00
  • 81d95ecea0 Fix cancel button on e2e import/export dialogs Richard van der Hoff 2017-01-25 22:15:09 +00:00
  • 4e41accc56 CSS tweak for email address lookup David Baker 2017-01-25 18:52:21 +00:00
  • e1e87807b5 Look up email addresses in ChatInviteDialog David Baker 2017-01-25 18:51:28 +00:00
  • 9d034c77a5 Initial rageshake server Kegan Dougal 2017-01-25 17:27:07 +00:00
  • c1290fd24d Merge pull request #3061 from vector-im/kegan/rageshake-glue Kegsay 2017-01-25 17:20:51 +00:00
  • c3616fd208 Merge pull request #652 from matrix-org/kegan/rageshake-glue Kegsay 2017-01-25 17:20:43 +00:00
  • 12642bdf2b Merge pull request #651 from matrix-org/rav/roomheader_theming_fix David Baker 2017-01-25 17:02:07 +00:00
  • 0a9f02abcc Glue the dialog to rageshake: honour sendLogs flag. Kegan Dougal 2017-01-25 16:51:26 +00:00
  • 8a5e19f64f Merge pull request #649 from matrix-org/rav/stack_dialogs David Baker 2017-01-25 16:45:50 +00:00
  • a2dd1fa0a9 Merge branch 'develop' into matthew/warn-unknown-devices Richard van der Hoff 2017-01-25 16:44:03 +00:00
  • 21f3aeac8e Revert accidental change Richard van der Hoff 2017-01-25 16:40:27 +00:00
  • e9de34ec40 We no longer supply a BugReportDialog Kegan Dougal 2017-01-25 16:35:16 +00:00
  • 5099f07562 Fix dark theme styling of roomheader cancel button Richard van der Hoff 2017-01-25 16:33:29 +00:00
  • bea6df88e0 Move BugReportDialog to riot-web Kegan Dougal 2017-01-25 16:33:00 +00:00
  • 55dc2e0161 Factor out common CancelButton Richard van der Hoff 2017-01-25 16:05:39 +00:00
  • e5fde759e6 Merge pull request #642 from matrix-org/kegan/rageshake-ui Kegsay 2017-01-25 16:03:22 +00:00
  • a3b938427d Merge pull request #625 from matrix-org/dbkr/user_search_feedback David Baker 2017-01-25 15:59:47 +00:00
  • 602ce37ba7 Merge branch 'develop' into kegan/rageshake-ui Kegan Dougal 2017-01-25 15:52:00 +00:00
  • dc7a169779 Merge pull request #647 from matrix-org/rav/megolm_backup_ui Richard van der Hoff 2017-01-25 15:43:15 +00:00
  • ced1c45a34 Doc state in getinitialstate David Baker 2017-01-25 15:23:50 +00:00
  • 9cadc2f55f Merge pull request #613 from matrix-org/luke/fix-join-part-collapsing-causality Richard van der Hoff 2017-01-25 15:20:30 +00:00
  • ebe6cddd21 Merge remote-tracking branch 'origin/develop' into rav/megolm_backup_ui Richard van der Hoff 2017-01-25 15:13:14 +00:00
  • 69b55fd9d1 Merge pull request #650 from matrix-org/dbkr/fix_alt_up_down Richard van der Hoff 2017-01-25 15:10:56 +00:00
  • 7343ef968e Merge pull request #645 from matrix-org/rav/base_dialog Richard van der Hoff 2017-01-25 15:09:34 +00:00
  • e9804086ca Point to InviteAddressType David Baker 2017-01-25 15:03:01 +00:00
  • adf8f50f6e Merge remote-tracking branch 'origin/develop' into rav/base_dialog Richard van der Hoff 2017-01-25 15:01:11 +00:00
  • b34f63d3e7 Re-add dispatcher as alt-up/down uses it David Baker 2017-01-25 14:59:18 +00:00
  • fd8d5af63a Fix import of InviteAddressType David Baker 2017-01-25 14:54:21 +00:00