OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,145 Commits
217 Branches
561 Tags
468 MiB
Commit Graph

3145 Commits (3b9a1121369e48630af8a1879af5991a8cdee180)

Author SHA1 Message Date
Matthew Hodgson 4df968ecdf fix css snafu 2017-01-18 20:06:44 +00:00
Johannes Löthberg 14ead373e2 Add markdown test-cases 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2017-01-18 20:54:34 +01:00
David Baker 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
Johannes Löthberg 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
David Baker 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
Matthew Hodgson 4d7ed9a58f Merge pull request #624 from matrix-org/matthew/postcss 
Implement theming via alternate stylesheets
 2017-01-18 16:46:37 +00:00
Matthew Hodgson fc63067237 improve commentary 2017-01-18 16:36:27 +00:00
Matthew Hodgson 3d30553b7f review fixes, plus unbreak to work with new webpack layout 2017-01-18 14:06:47 +00:00
Johannes Löthberg 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
Matthew Hodgson a0bbe3a306 Merge branch 'develop' into matthew/postcss 2017-01-18 12:52:59 +00:00
Luke Barnard 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
Richard van der Hoff 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
Johannes Löthberg 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
Johannes Löthberg 49d60ff879 Markdown: softbreak is not HTML 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2017-01-17 21:04:12 +01:00
Johannes Löthberg 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
Johannes Löthberg 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
Matthew Hodgson 8288eb730c a rather hacky implementation of theme switching 2017-01-17 19:13:23 +00:00
Matthew Hodgson c2cdb626bd let the tinter handle 'white' highlights of SVGs too 2017-01-17 19:13:04 +00:00
David Baker a87e7d6617 Make user search do a bit better on word boundary 2017-01-17 18:17:51 +00:00
Johannes Löthberg 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
David Baker 0b67fd5b4e Add 'searching known users' to the user picker 
So it's more obvious it's only finding people you've already seen

Fixes https://github.com/vector-im/riot-web/issues/2931
 2017-01-17 14:48:50 +00:00
Matthew Hodgson a18d94099e switch to using <span/> for edit button 2017-01-17 14:11:15 +00:00
Matthew Hodgson 203172c886 typos 2017-01-17 14:11:01 +00:00
Kegsay fcb1d7a664 Merge pull request #575 from kyrias/commonmark 
Replace marked with commonmark
 2017-01-17 11:57:08 +00:00
David Baker cf8af5f49e Merge pull request #619 from matrix-org/kegan/better-reg-err-msgs 
Fix vector-im/riot-web#2833 : Fail nicely when people try to register numeric user IDs
 2017-01-17 11:54:05 +00:00
Kegan Dougal 4f860b4c6d Review comments: If-statement style 2017-01-17 10:50:44 +00:00
Richard van der Hoff 09ce74cc76 Fix a couple of minor review comments 2017-01-16 18:44:46 +00:00
Kegan Dougal f168f9cd06 Fix vector-im/riot-web#2833 : Fail nicely when people try to register numeric user IDs 2017-01-16 17:25:44 +00:00
Richard van der Hoff ac22803ba0 Allow Modal to be used with async-loaded components 
Add Modal.createDialogAsync, which can be used to display asynchronously-loaded
React components. Also make EncryptedEventDialog use it as a handy
demonstration.
 2017-01-16 17:18:38 +00:00
David Baker 1d5112db5d Back to develop js-sdk 2017-01-16 13:22:57 +00:00
David Baker 936e12dfe4 Merge branch 'master' into develop 2017-01-16 13:22:11 +00:00
David Baker a9256b0ab1 v0.8.5 2017-01-16 13:21:34 +00:00
David Baker 834c8d0890 Prepare changelog for v0.8.5 2017-01-16 13:21:34 +00:00
David Baker 3679e47002 js-sdk 0.7.4 2017-01-16 13:19:24 +00:00
Richard van der Hoff e37bf6b7be Skip crypto tests on PhantomJS 2017-01-14 01:41:48 +00:00
Richard van der Hoff d63f7e8359 Expose megolm import/export via the devtools 2017-01-14 01:34:34 +00:00
Richard van der Hoff f8e56778ea Encryption and decryption for megolm backups 2017-01-14 01:34:34 +00:00
Richard van der Hoff 1d5d44d63d TextEncoder polyfill 
Apparently Safari doesn't sport a TextEncoder, so here's a polyfill for it.
 2017-01-14 00:45:51 +00:00
Kegsay 07b3c58c61 Merge pull request #614 from matrix-org/kegan/show-error-on-pl-change-fail 
Show the error dialog when requests to PUT power levels fail
 2017-01-13 15:26:26 +00:00
Kegan Dougal dcd0acb2b5 Review comments 2017-01-13 15:17:34 +00:00
Kegan Dougal e196cfaf91 Show the error dialog when requests to PUT power levels fail 
This is why I dislike Q.
 2017-01-13 14:51:01 +00:00
David Baker 3ac9ed7f8f v0.8.5-rc.1 2017-01-13 11:14:26 +00:00
David Baker 08020d1c39 Prepare changelog for v0.8.5-rc.1 2017-01-13 11:14:25 +00:00
David Baker 57652c06e3 released js-sdk 2017-01-13 11:13:17 +00:00
David Baker 6d07a1b7e3 Merge pull request #612 from matrix-org/dbkr/ci_build_js_sdk 
Build the js-sdk in the CI script
 2017-01-12 17:37:09 +00:00
David Baker 3706d6e32a js-sdk, not react-sdk 2017-01-12 17:14:51 +00:00
David Baker 4ca4441f77 Build js-sdk in travis too 2017-01-12 17:09:49 +00:00
David Baker 05d2836581 Retest 2017-01-12 16:55:34 +00:00
David Baker 2708859b34 npm install the js-sdk 
otherwise we don't have uglifyjs
 2017-01-12 16:38:48 +00:00
David Baker 314c57ca6b Retest 2017-01-12 16:29:27 +00:00