Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,474 Commits 3 Branches 492 Tags 100 MiB
fd5e7ff37a
Commit Graph

3474 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Barnard
e4c155a881 Merge branch 'develop' into luke/merge-RoomTile-context-menus 
Conflicts:
	src/components/views/context_menus/RoomTagContextMenu.js
 2017-03-14 14:01:47 +00:00
David Baker
4e6541b404 Merge pull request #3385 from vector-im/luke/fix-screen-after-login 
Refactor screen set after login
 2017-03-14 13:47:55 +00:00
Matthew Hodgson
df22c90016 fix kick dialog CSS 2017-03-13 00:47:20 +00:00
Matthew Hodgson
ffba088192 fix CSS for ChatCreateOrReuseDialog 2017-03-13 00:03:53 +00:00
Matthew Hodgson
d639eb1049 beautify all error msgs 2017-03-12 23:26:26 +00:00
Matthew Hodgson
0a0293d8fb fix focus on cancel button 2017-03-12 20:13:53 +00:00
Matthew Hodgson
4ad825e4fe fix up cancelbutton CSS 2017-03-12 20:04:07 +00:00
Matthew Hodgson
611bb3a857 beautiful error on roomdirectory fail 2017-03-12 20:04:02 +00:00
Richard van der Hoff
e5b3ec83b3 Revert "Support for phone number registration / signin (#3381)" 
This reverts commit 271fedd1e9.

This breaks against the current synapse release. We need to think more
carefully about backwards compatibility.
 2017-03-09 20:41:11 +00:00
Luke Barnard
3dc45886f7 Merge the two RoomTile context menus into one 2017-03-09 17:05:51 +00:00
Tom Lant
927d305ed9 Fixing triage markdown as per #3382 2017-03-09 14:36:56 +00:00
Tom Lant
c4bc38f0d7 Fixing triage markdown as per #3382 2017-03-09 12:00:54 +00:00
David Baker
271fedd1e9 Support for phone number registration / signin (#3381) 
* WIP msisdn signin (css)

* Changed how highlights are done

to support keyboard based navigation

* Support for new InteractiveAuth registration

* CSS for msisdn auth entry component

* CSS tweaks for msisdn login

* Fix tests
 2017-03-09 10:58:58 +00:00
David Baker
23422fdb86 Merge pull request #3379 from vector-im/luke/css-visible-redactions 
CSS for redacted EventTiles
 2017-03-09 10:09:31 +00:00
Luke Barnard
7ff2871ad5 const 2017-03-09 10:04:15 +00:00
Luke Barnard
cbc31a6c41 Remove redundant thing 2017-03-09 10:03:23 +00:00
Luke Barnard
6a1118218b Merge pull request #3340 from vector-im/luke/css-rts-fix-welcome-pages-safari 
Height:100% for welcome pages on Safari
 2017-03-08 17:07:53 +00:00
Luke Barnard
eddf33a689 Refactor screen set after login 2017-03-08 14:57:13 +00:00
Luke Barnard
08852c6174 Merge pull request #3376 from vector-im/luke/refactor-room-tile 
`view_room` dispatch from `onClick` RoomTile
 2017-03-07 16:20:31 +00:00
Luke Barnard
2bf96d4887 Merge pull request #3350 from vector-im/luke/css-statusbar-v-balance 
Hide statusAreaBox_line entirely when inCall
 2017-03-07 13:29:56 +00:00
Luke Barnard
9d96baa613 Alter comments on height: auto 
Having tested Riot with the middlePanel having a height of 100%, it seems to be OK.
 2017-03-07 10:22:45 +00:00
Luke Barnard
a7db42d184 CSS for redacted EventTiles 2017-03-07 09:21:50 +00:00
Luke Barnard
3d67234372 view_room dispatch from onClick RoomTile 
So that RoomTile does less, and if other things should happen onClick, they happen in the same place as the `view_room` for clarity.
 2017-03-06 17:55:12 +00:00
Luke Barnard
b1f14ba979 Merge pull request #3351 from vector-im/luke/css-spinner-height 
Set padding-bottom: 0px for .mx_Dialog spinner
 2017-03-03 18:01:08 +00:00
Luke Barnard
a1462946cd padding: 0px 2017-03-03 13:54:26 +00:00
David Baker
ae27667f48 Merge pull request #3333 from vector-im/dbkr/register_ui_auth 
Support InteractiveAuth based registration
 2017-03-03 13:37:46 +00:00
David Baker
c6da4d93f1 Merge pull request #3334 from turt2live/travis/notifs 
Expose notification option for username/MXID
 2017-03-02 18:26:53 +00:00
Luke Barnard
024fea0687 Set padding-bottom: 0px for .mx_Dialog spinner 
This was causing https://github.com/vector-im/riot-web/issues/3226
 2017-03-02 17:39:02 +00:00
Luke Barnard
cfbcffac5a Hide statusAreaBox_line entirely when inCall 
This is to keep things vertically balanced.

Fixes https://github.com/vector-im/riot-web/issues/3269
 2017-03-02 16:57:52 +00:00
Luke Barnard
640c486bde Merge pull request #3190 from vector-im/luke/mels-toggle-scss 
Float the toggle in the top right of MELS
 2017-03-02 15:19:57 +00:00
Luke Barnard
66e93c8a8c Fix for vector-im/riot-web#3298 - height:100% for welcome pages on Safari 2017-03-01 10:04:48 +00:00
Matthew Hodgson
8a7ec27dc7 fix whitespace in urlpreview title 2017-02-28 00:16:43 +00:00
turt2live
9afbe8e3fc Change wording in notification description 2017-02-27 15:47:21 -07:00
turt2live
9b42fbe42f Expose notification option for username/MXID 
For those unfortunate people that get pinged constantly.
 2017-02-27 15:32:58 -07:00
Matthew Hodgson
ae145ff32e oops, fix #3270 properly 2017-02-27 22:25:22 +00:00
David Baker
a8e99109b1 Support InteractiveAuth based registration 
Passes in a function to make a register URL rather than just
passing in the URL base
 2017-02-24 11:45:28 +00:00
Richard van der Hoff
bb4d8ee3e8 Merge pull request #3311 from vector-im/rav/rageshake_culling 
More aggressive rageshake log culling
 2017-02-23 14:38:36 +00:00
Richard van der Hoff
038f5767f2 Add a comment 2017-02-23 14:37:46 +00:00
Richard van der Hoff
e2cec7b69c More aggressive rageshake log culling 
Also bump the client-side timeout on the upload from 3 mins to 5 mins, to see
if it helps people on slower connections.
 2017-02-23 14:22:03 +00:00
Matthew Hodgson
6690df1203 Merge pull request #3282 from Half-Shot/develop 
Don't overflow directory network options
 2017-02-22 01:13:14 +00:00
Aviral Dasgupta
c21cdf5b02
add .editorconfig 
Signed-off-by: Aviral Dasgupta <me@aviraldg.com>
 2017-02-21 23:38:03 +05:30
Will Hunt
37f320c4a4 Don't overflow directory network options 2017-02-21 12:25:29 +00:00
David Baker
feb8115d24 Desktop instructions: npm run build, not dist 
Clarify that you only need to run build rather than dist to run
the electron app.

Hopefully satisfies: https://github.com/vector-im/riot-web/pull/3237
 2017-02-20 10:32:14 +00:00
Richard van der Hoff
5c87b8045a Merge remote-tracking branch 'origin/master' into develop 2017-02-20 09:14:22 +00:00
Richard van der Hoff
d8c877fe6e Update ISSUE_TEMPLATE.md 2017-02-20 09:14:01 +00:00
Matthew Hodgson
67a7ed1e34 fix spacing of permalinks to info events 2017-02-20 01:49:11 +02:00
Matthew Hodgson
eabe4f5c29 hopefully fix https://github.com/vector-im/riot-web/issues/3270 2017-02-20 01:48:10 +02:00
Matthew Hodgson
f91f5cb65e fix RTE dark theme 2017-02-20 01:27:05 +02:00
Matthew Hodgson
5951e8fb27 don't try to darktheme scalar for now 2017-02-20 01:18:48 +02:00
Matthew Hodgson
be79ccccf6 fix dark theme room join bar 2017-02-20 01:15:54 +02:00