4ba224aac3
Use eslint config from the js sdk
...
Extend the js sdk's eslint config to give as consistent a code
style as possible. Add react/jsx/flow stuff that we use here.
2017-01-20 14:08:14 +00:00
a16aeeef2a
Temporarily add more logging, to try to catch failures on travis
2017-01-20 13:06:06 +00:00
7351223fd4
Merge pull request #633 from matrix-org/rav/fix_deactivate_error
...
Fix error display in account deactivate dialog
2017-01-20 11:29:56 +00:00
2d060c8d2e
Fix error display in account deactivate dialog
2017-01-20 11:04:47 +00:00
b76b0f755d
fix context menu bg
2017-01-20 02:47:47 +00:00
16d8e8e681
Merge pull request #629 from matrix-org/rav/test_riot_after_build
...
Configure travis to test riot-web after building
2017-01-19 18:40:13 +00:00
33d741e83d
Do riot-web setup in a different order
...
... in an effort to stop npm cocking it up.
2017-01-19 18:24:28 +00:00
bd0706f103
Merge pull request #626 from matrix-org/dbkr/sanitize_chatinvitedialog
...
Sanitize ChatInviteDialog
2017-01-19 18:23:36 +00:00
afa384c4f3
Use null instead of false
2017-01-19 18:13:27 +00:00
af4ef1da8b
Install source-map-loader before building riot-web
2017-01-19 17:41:58 +00:00
2637ae3af3
Merge pull request #630 from matrix-org/rav/fix_themes
...
(hopefully) fix theming on Chrome
2017-01-19 17:34:36 +00:00
dee3495d51
Run riot-web develop, not master
2017-01-19 17:21:03 +00:00
a2ff1cd8e6
Factor out adding the input field to the list
2017-01-19 17:03:16 +00:00
ee1f6c772e
Remove duplicate case handled above
...
And fix typo where it was handled
2017-01-19 16:50:09 +00:00
2a08abaa95
Keep old behaviour of submitting on enter
...
if input is empty
2017-01-19 16:35:40 +00:00
d8bcc1f067
Merge remote-tracking branch 'origin/develop' into dbkr/sanitize_chatinvitedialog
2017-01-19 16:26:59 +00:00
bb7d589287
Merge pull request #617 from matrix-org/rav/megolm_backup
...
Megolm session import and export
2017-01-19 16:14:18 +00:00
ba2460aef4
Merge pull request #618 from matrix-org/rav/async_dialog
...
Allow Modal to be used with async-loaded components
2017-01-19 16:08:30 +00:00
a88f9fdd73
(hopefully) fix theming on Chrome
...
Jump through some hoops to make Chrome behave sensibly on non-default themes.
2017-01-19 15:36:57 +00:00
89fa47dc26
Merge pull request #622 from kyrias/commonmark-fix-escaping
...
Fix escaping markdown by rendering plaintext
2017-01-19 13:39:07 +00:00
1b6735d729
Configure travis to test riot-web after building
2017-01-19 13:30:22 +00:00
9e0c7a11d0
Merge pull request #628 from matrix-org/luke/feature-team-reg-auto-join-rooms
...
Implement auto-join rooms on registration
2017-01-19 11:44:37 +00:00
9c1c657a1e
Markdown: delete remaining pre-split relics
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-19 11:55:36 +01:00
fdc213cbb8
Megolm export: fix test
2017-01-19 10:44:01 +00:00
8b60cb9df0
Megolm export: Clear bit 63 of the salt
2017-01-19 10:43:41 +00:00
e9eb38fd74
Update propTypes and do null checks
2017-01-19 11:05:08 +01:00
e06dd6e34a
Implement auto-join rooms on registration
...
Also: This fixes registration with a team: only the email localpart was being used to register.
When a registration is successful, the user will be joined to rooms specified in the config.json teamsConfig:
"teamsConfig" : {
"supportEmail": "support@riot.im",
"teams": [
{
"name" : "matrix",
"emailSuffix" : "matrix.org",
"rooms" : [
{
"id" : "#irc_matrix:matrix.org",
"autoJoin" : true
}
]
}
]
}
autoJoin can of course be set to false if the room should only be displayed on the (forthcoming) welcome page for each team, and not auto-joined.
2017-01-19 10:56:04 +01:00
128db1a679
Merge pull request #627 from matrix-org/matthew/fix-theme-npe
...
Matthew/fix theme npe
2017-01-18 22:11:07 +00:00
4e5689082d
correctly load synced themes without NPE
2017-01-18 20:06:54 +00:00
4df968ecdf
fix css snafu
2017-01-18 20:06:44 +00:00
14ead373e2
Add markdown test-cases
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-18 20:54:34 +01:00
7b7728c93a
Make behaviour of ChatInviteDialog more consistent
...
* Pressing enter now always adds whatever was in the input box
to the invite list, if it's a valid address (previously it
added it to the list of it was a search result but submitted
the form straight away if there were no results).
* Remove isValidAddress as it was only used in the context of
testing whether its return value was true or null (where null
meant "unsure") so just use getAddressType instead.
2017-01-18 18:32:38 +00:00
30bd01cdf2
Markdown: Split up render function into toHTML/toPlaintext
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-18 19:29:11 +01:00
f105ec2794
Attempt to sanitize ChatInviteDialog a bit
...
* Use binds rather than onFoo functions which aren't actually
handler functions themselves but return them
* Rename onKeyUp to moveSelectionDown etc,, reserving onKeyUp
for "a key has been released" rather than, "the up arrow key
has been pressed"
2017-01-18 17:51:39 +00:00
4d7ed9a58f
Merge pull request #624 from matrix-org/matthew/postcss
...
Implement theming via alternate stylesheets
2017-01-18 16:46:37 +00:00
fc63067237
improve commentary
2017-01-18 16:36:27 +00:00
3d30553b7f
review fixes, plus unbreak to work with new webpack layout
2017-01-18 14:06:47 +00:00
6d2e521421
Markdown: Add comment about out function override
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-18 14:25:11 +01:00
a0bbe3a306
Merge branch 'develop' into matthew/postcss
2017-01-18 12:52:59 +00:00
5ef5204c8c
Implement simple team-based registration ( #620 )
...
* Implement simple team-based registration
Config required goes in the `teams` top-level property in config.json. This consists of an array of team objects:
```json
{
"name": "University of Bath",
"emailSuffix": "bath.ac.uk"
}
```
These can be selected on registration and require a user to have a certain email address in order to register as part of a team. This is for vector-im/riot-web#2940 . The next step would be sending users with emails matching the emailSuffix of a team to the correct welcome page as in vector-im/riot-web#2430 .
2017-01-18 12:48:28 +01:00
31df78f946
Use text-encoding-utf-8 as a TextEncoder polyfill
...
Somebody else seems to have done a good job of polyfilling TextEncoder, so
let's use that.
2017-01-18 11:39:44 +00:00
2e3bdcf5c6
Markdown: Don't XML escape the output when not HTML
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-17 22:20:05 +01:00
49d60ff879
Markdown: softbreak is not HTML
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-17 21:04:12 +01:00
c819b433a2
Make old message composer use new markdown
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-17 20:37:27 +01:00
35d70f0b35
markdown: Only add \n\n on multiple paragraphs
...
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-17 20:32:06 +01:00
8288eb730c
a rather hacky implementation of theme switching
2017-01-17 19:13:23 +00:00
c2cdb626bd
let the tinter handle 'white' highlights of SVGs too
2017-01-17 19:13:04 +00:00
893a5c971f
Fix escaping markdown by rendering plaintext
...
We still need to parse "plaintext" messages through the markdown
renderer so that escappes are rendered properly.
Fixes vector-im/riot-web#2870 .
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-17 16:23:58 +01:00
a18d94099e
switch to using <span/> for edit button
2017-01-17 14:11:15 +00:00
203172c886
typos
2017-01-17 14:11:01 +00:00
David Baker