Commit graph

3565 commits

Author SHA1 Message Date
David Baker
b561b711df Fix expanding/unexapnding read receipts
Make the AccessibleButton element be the img directly rather than
wrapping it in a div which is unnecessary and breaks the rendering.

Fixes https://github.com/vector-im/riot-web/issues/3052
2017-02-02 17:36:26 +00:00
Richard van der Hoff
eebc7539f9 Megolm export: Increase to 500000 PBKDF rounds
This takes 370ms on my machine (100000 only took 100ms).
2017-02-02 16:38:19 +00:00
Matthew Hodgson
a0e4afc231 Merge pull request #670 from matrix-org/matthew/empty-timelines
show placeholder when timeline empty
2017-02-02 16:35:13 +00:00
Matthew Hodgson
08ad69847c show placeholder of timeline empty 2017-02-02 16:32:10 +00:00
Richard van der Hoff
68f644c824 Merge pull request #669 from matrix-org/dbkr/read_receipt_title
Make read receipt's titles more explanatory
2017-02-02 15:25:45 +00:00
David Baker
7ae54b34f3 Merge pull request #667 from matrix-org/dbkr/fix_markdown_spurious_html
Fix spurious HTML tags being passed through literally
2017-02-02 15:18:42 +00:00
David Baker
c5b752cac1 Make read receipt's titles more explanatory
Throwing this one in a suggestion while I'm in the area: I think
this would help people understand what the read receipt avatars
are.
2017-02-02 15:08:18 +00:00
Kegan Dougal
300cd962e5 Add glue code to make react-sdk use indexedDB 2017-02-02 14:27:27 +00:00
David Baker
853c89dfdc Fix spurious html tags like <shrug>
* Only render HTML tags in markdown if they're del tags
 * Consider non-allowed HTML tags as plain text nodes, so
   a message of just '<shrug>' doesn't need to be sent as
   HTML
 * Consequently rewrite isPlaintext to just look at the parse
   tree rather than making and gutting a renderer to walk
   the tree (now we're using a library that actually produces
   a meaningfgul parse tree).
 * Tweak when we put \n on text output to avoid putting \n on
   the end of messages.

Fixes https://github.com/vector-im/riot-web/issues/3065
2017-02-02 14:17:07 +00:00
Luke Barnard
b9bc8eefd0 Typo 2017-02-02 13:56:54 +00:00
Richard van der Hoff
e3bd522c55 Merge pull request #665 from matrix-org/rav/longer_lines
Reinstate max-len lint configs
2017-02-02 13:44:25 +00:00
Matthew Hodgson
1c4c80cc5f boldify the preview bar click 2017-02-02 13:32:19 +00:00
Matthew Hodgson
211be5752c try to make joining rooms more obvious 2017-02-02 13:32:07 +00:00
Luke Barnard
2aaf77974d Pass RTS URL through 2017-02-02 11:57:56 +00:00
David Baker
63e47d8677 Make ourselves a new rendered each time
Rather than keeping one in memory, abusing it in different ways
each time and then craefully putting it back the way it was (and
in one case, failing, because we forgot to put the `out` method
back).
2017-02-02 11:45:21 +00:00
Luke Barnard
7ece1ef8e7 rm .DS_Store 2017-02-02 11:42:34 +00:00
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
Luke Barnard
8c941b11cd Use mx_team_token instead of config 2017-02-02 11:22:40 +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
acde1f3db7 Merge branch 'develop' into luke/rts-welcome-pages
Conflicts:
	src/components/views/avatars/BaseAvatar.js
2017-02-01 17:22:45 +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