OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,342 Commits
212 Branches
549 Tags
667 MiB
Commit Graph

3342 Commits (a9cd1bfd4b23338d9b895ac57e19a116843b7895)

Author SHA1 Message Date
David Baker 72e5b2235d Parse once and re-use the parsed output 
Rather than re-parsing the same output in each function
 2017-02-02 11:34:39 +00:00
David Baker fc90ed1c3a Update the comments in Markdown.js 
so they don't claim it;s a wrapper around marked when it's now
commonmark, and comment why we render markdown to plaintext which
is somewhat unintuitive.
 2017-02-02 11:27:07 +00:00
Richard van der Hoff a65d94e8ce Reinstate max-len lint configs 
Apparenltly setting the ignorePattern on max-len (as per cf049f2) makes eslint
forget the `ignoreComments` and `code` settings from js-sdk, so reinstate
these.
 2017-02-02 10:52:11 +00:00
Matthew Hodgson 5e5b7f89f4 support scrollable content for UnknownDeviceDialog 2017-02-02 00:25:49 +00:00
Matthew Hodgson c09d173415 Merge branch 'develop' into matthew/warn-unknown-devices 2017-02-01 22:34:55 +00:00
Luke Barnard f8d7902d2e Merge pull request #662 from matrix-org/luke/rts-handle-errors 
Throw errors on not 'ok' status codes from RTS, swap to `whatwg-fetch` for sending requests to RTS.
 2017-02-01 11:44:04 +00:00
Luke Barnard 028c40e293 Linting 2017-02-01 11:16:14 +00:00
Luke Barnard fa1981ce09 Use whatwg-fetch instead of browser-request 2017-02-01 10:39:52 +00:00
David Baker f643224f93 Merge pull request #664 from matrix-org/rav/no_maxlen_jsx 
Exempt lines which look like pure JSX from the maxlen line
 2017-02-01 10:25:46 +00:00
David Baker 6f53b2de2c Merge pull request #663 from matrix-org/rav/fix_tests 
Make tests pass on Chrome again
 2017-02-01 10:20:30 +00:00
Richard van der Hoff cf049f2d75 Exempt lines which look like pure JSX from the maxlen line 2017-02-01 09:59:46 +00:00
Richard van der Hoff cd1cf09dc9 Make tests pass on Chrome again 
It seems that a number of the tests had started failing when run in
Chrome. They were fine under PhantomJS, but the MegolmExport tests only work
under Chrome, and I need them to work...

Mostly the problems were timing-related, where assumptions made about how
quickly the `then` handler on a promise would be called were no longer
valid. Possibly Chrome 55 has made some changes to the relative priorities of
setTimeout and sendMessage calls.

One of the TimelinePanel tests was failing because it was expecting the contents
of a div to take up more room than they actually were. It's possible this is
something very environment-specific; hopefully the new value will work on a
wider range of machines.

Also some logging tweaks.
 2017-01-31 22:40:53 +00:00
Luke Barnard 2f188770e5 Typo 2017-01-31 15:59:38 +00:00
Luke Barnard be869a8ac6 Add referral section to user settings (#661) 
This allows those who have registered to referrer other students to Riot and have their referral counted for the campaign competition. Also allows the base referral URL to be configurable (i.e. for Electron app, etc.) and be default this is `window.location.origin`.
 2017-01-31 15:55:42 +00:00
Luke Barnard c261ca1f5e Allow base referral URL to be configurable 2017-01-31 15:17:43 +00:00
Luke Barnard 4c4cc585c7 Throw errors on !==200 status codes from RTS 2017-01-31 13:40:01 +00:00
Luke Barnard c2b0c603c0 Add referral section to user settings 
This allows those who have registered to referrer other students to Riot and have their referral counted for the campaign competition.
 2017-01-31 13:17:01 +00:00
Richard van der Hoff 91d33e3cc4 Merge pull request #660 from matrix-org/rav/megolm_export_fixes 
Two megolm export fixes:
 2017-01-31 13:13:20 +00:00
Richard van der Hoff c5f447260a Megolm import: Fix handling of short files 
Make sure we throw a sensible error when the body of the data is too short.
 2017-01-31 12:30:30 +00:00
Richard van der Hoff 62c8c20268 Megolm export: fix Android incompatibility 
I'd carefully added a workaround to maintain compatibility with the Android
AES-CTR implementation... to the wrong thing.
 2017-01-31 12:29:16 +00:00
Luke Barnard 878e5593ba Implement tracking of referrals (#659) 
* Implement tracking of referrals

This also modifies (or fixes) auto-joining.
 2017-01-31 11:13:05 +00:00
David Baker 9c99e78099 Merge pull request #658 from matrix-org/luke/rts-get-teams 
GET /teams from RTS instead of config.json
 2017-01-30 16:45:19 +00:00
Luke Barnard 4e9229e936 Get rid of dupl. declaration 2017-01-30 16:37:16 +00:00
Luke Barnard 1e279d2335 Finish with .done() 2017-01-30 16:35:34 +00:00
Luke Barnard f5efc8e765 Use const, not var 2017-01-30 16:33:16 +00:00
Luke Barnard eb4d7f04e7 Use busy spinner when requesting teams 2017-01-30 16:23:52 +00:00
Luke Barnard 318d871097 Formatting 2017-01-30 16:13:57 +00:00
Luke Barnard 4e0889454a GET /teams from RTS instead of config.json 
Now that the RTS contains config for teams, use GET /teams to get that information so that users will see be able to register as a team (but not yet auto-join rooms, be sent to welcome page or be tracked as a referral).
 2017-01-30 15:50:31 +00:00
David Baker f5458d34aa Fix inviting import fail 2017-01-27 21:57:34 +00:00
Luke Barnard d9a8acd431 Redo team-based registration (#657) 
For compatibility with referral campaign flows, re-implement team registration such that the team is selected through providing an email with a known team domain. The support email is now only shown when an email that _looks_ like a UK/US university email address, but is not known.
 2017-01-27 16:31:36 +00:00
Luke Barnard f462bd8f99 Expand status *area* unless status *bar* not visible (#655) 2017-01-26 18:07:42 +00:00
David Baker 853d94e2d4 Merge pull request #656 from matrix-org/luke/fix-setState-warnings-from-RoomView 
Guard onStatusBarVisible/Hidden with this.unmounted
 2017-01-26 18:06:41 +00:00
Luke Barnard 9c99dafba5 Guard onStatusBarVisible/Hidden with this.unmounted 2017-01-26 17:03:01 +00:00
Richard van der Hoff 2c7b3d9a02 UnknownDeviceDialog: Reword the warning 2017-01-26 14:55:58 +00:00
Richard van der Hoff 0a3d9fc17f Fix lint 2017-01-26 14:12:00 +00:00
Richard van der Hoff 67bd2cf9dd Merge branch 'matthew/warn-unknown-devices' into matthew/blacklist-unverified 2017-01-26 14:09:25 +00:00
David Baker f06de1f129 Merge pull request #654 from matrix-org/rav/fix_e2e_dialog_cancel 
Fix cancel button on e2e import/export dialogs
 2017-01-26 11:41:30 +00:00
David Baker e2edecc55b Merge pull request #653 from matrix-org/dbkr/invite_look_up_emails 
Look up email addresses in ChatInviteDialog
 2017-01-26 11:35:06 +00:00
David Baker c42b705497 Use a cancel function 
rather than checking queryList each time
 2017-01-26 10:54:07 +00:00
David Baker 23a25e550d Missed a `function` 2017-01-26 10:09:33 +00:00
David Baker bf66f77acb Set state in _lookupThreepid 2017-01-26 10:08:44 +00:00
Richard van der Hoff 60d7575146 Merge branch 'matthew/warn-unknown-devices' of github.com:matrix-org/matrix-react-sdk into matthew/warn-unknown-devices 2017-01-25 23:17:57 +00:00
Matthew Hodgson ebf6ba8994 explicitly set device known-ness 2017-01-25 23:52:56 +01:00
Richard van der Hoff 70190be65c Factor out common onSendMessageFailed 2017-01-25 22:23:21 +00:00
Richard van der Hoff 5da6ca8fc1 Refactor UnknownDeviceDialog 
hopefully make this a bit more readable, and use our new BaseDialog.
 2017-01-25 22:23:21 +00:00
Richard van der Hoff 5538ce7c30 Merge branch 'develop' into matthew/warn-unknown-devices 2017-01-25 22:22:50 +00:00
Richard van der Hoff 81d95ecea0 Fix cancel button on e2e import/export dialogs 
Make sure that we preventDefault on the cancel button.

Fixes https://github.com/vector-im/riot-web/issues/3066
 2017-01-25 22:15:09 +00:00
David Baker e1e87807b5 Look up email addresses in ChatInviteDialog 
So email addresses known to the IS get a display name & avatar
 2017-01-25 18:51:28 +00:00
Kegsay c3616fd208 Merge pull request #652 from matrix-org/kegan/rageshake-glue 
Move BugReportDialog to riot-web
 2017-01-25 17:20:43 +00:00
David Baker 12642bdf2b Merge pull request #651 from matrix-org/rav/roomheader_theming_fix 
Fix dark theme styling of roomheader cancel button
 2017-01-25 17:02:07 +00:00