nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
62,959 Commits 258 Branches 582 Tags
f52d7a8e207301ac62497ca7cd25bf64b6834d81
Commit Graph

62959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lukebarnard
f10bc8eef1 Animate status bar max-height and margin-top 
When collapsed, the max-height is set to 0px. When expanded, max-height is set to 50px, margin-top is set to 0px. When expanded and when the timeline is not scrolled down to the bottom, margin-top is set to -50px to offset the change in height, keeping it at the same scroll position.

Without the animation, there would be a jump when the user starts scrolling up from the bottom whilst the StatusBar is expanded.
 2017-01-18 16:49:20 +01:00
David Baker
de621902fc Better feedback in invite dialog 
Show feedback if you enter a valid but unknown email address
or mxid

Fixes https://github.com/vector-im/riot-web/issues/2933
 2017-01-18 15:21:50 +00:00
Matthew Hodgson
3d30553b7f review fixes, plus unbreak to work with new webpack layout 2017-01-18 14:06:47 +00:00
Matthew Hodgson
708fd640f7 unbreak switching after vdh's webpack changes 2017-01-18 14:06:20 +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
Matthew Hodgson
14eec6d982 Merge branch 'develop' into matthew/postcss 2017-01-18 12:44:42 +00:00
Matthew Hodgson
69bedf0d37 review feedback 2017-01-18 12:42:48 +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
lukebarnard
41d2697e28 Remove done, const instead of var for requiers 2017-01-18 12:03:38 +01:00
lukebarnard
867a532e5e Remove parentDiv from tests 2017-01-18 11:58:54 +01:00
lukebarnard
78e2c787e0 Refactor and document test helpers. 2017-01-18 11:53:17 +01:00
David Baker
83145e80e5 Auto-hide the electron menu bar 
From https://github.com/vector-im/riot-web/issues/2962

This allows all the shortcuts to still work, and the menu bar can
be un-hidden with the alt key.
 2017-01-18 10:39:59 +00:00
lukebarnard
5dd1512ff2 Move aggregation code to dedicated function 2017-01-18 10:59:19 +01:00
lukebarnard
484549e50b Refactor a few things and document everything 2017-01-18 10:26:25 +01:00
Richard van der Hoff
5206410f21 Deployment script 
Factor some bits out of redeploy.py, so that they can be used in a deployment
script suitable for riot.im/app.
 2017-01-17 22:43:23 +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
0cd895b417 kill the moofle 2017-01-17 19:19:30 +00:00
Matthew Hodgson
6c88201e23 use ye olde rel='alternate stylesheets' for theming 2017-01-17 19:14:16 +00: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
lukebarnard
3ba9f50873 Move functions around, remove redundancies, add docs 2017-01-17 19:07:45 +01:00
lukebarnard
9574a0b663 Remove pointless length guard 2017-01-17 18:56:57 +01:00
lukebarnard
49f2b9df88 Remove duplicate test 2017-01-17 18:53:38 +01: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
7bcd9ff3d6 Retest 2017-01-17 15:02:31 +00:00
Richard van der Hoff
641a5c244c Merge pull request #2969 from vector-im/rav/keep_old_bundles 
Update redeploy script to keep old bundles
 2017-01-17 14:59:12 +00:00
David Baker
323c5d0732 CSS for 'searching known users' 2017-01-17 14:54:55 +00: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
David Baker
6257019926 Merge pull request #2967 from vector-im/dbkr/include_version_in_update_check 
Include current version in update check explicitly
 2017-01-17 14:42:03 +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
Matthew Hodgson
c9c58ab0ec fix up the contextual menu button 2017-01-17 14:10:09 +00:00
David Baker
cf92e7f64b Clarify comment 2017-01-17 14:04:42 +00:00
Richard van der Hoff
8371006d90 Update redeploy script to keep old bundles 
... so that people using old versions of the master chunk can still load other
webpack chunks.
 2017-01-17 13:55:33 +00:00
David Baker
3b109f7612 Include current version in update check explicitly 
Hopefully fix https://github.com/vector-im/riot-web/issues/2847
 2017-01-17 13:16:08 +00:00
David Baker
ebc2ad54d6 Merge pull request #2966 from vector-im/rav/move_bundle_again 
Add another layer of directory to webpack chunks
 2017-01-17 12:04:28 +00:00
Richard van der Hoff
4a1b04e57b Add another layer of directory to webpack chunks 2017-01-17 12:00:20 +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
David Baker
205676a97d Back to develop js-sdk & react-sdk 2017-01-17 11:30:59 +00:00
David Baker
0456cadff6 Merge branch 'master' into develop 2017-01-17 11:30:31 +00:00
lukebarnard
ade7c65617 Add test for MemberEventListSummary 2017-01-17 12:01:54 +01:00
lukebarnard
45655f4de3 Modified desc for invitation rejections, withdrawals 2017-01-17 12:01:19 +01:00
Richard van der Hoff
aa6d584ae3 Merge pull request #2965 from vector-im/rav/fix_font_links 
Fix links to fonts and images from CSS
 2017-01-17 11:00:27 +00:00