OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,240 Commits
218 Branches
563 Tags
448 MiB
Commit Graph

3240 Commits (219bfffea293ed3f4171df130d5f4da1464bbd12)

Author SHA1 Message Date
David Baker bc67b1c87e Merge pull request #3451 from vector-im/dbkr/add_msisdn 
CSS for adding phone number in UserSettings
 2017-03-24 10:53:25 +00:00
David Baker 4326d7a182 Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn 2017-03-21 13:45:16 +00:00
David Baker 8e3a68dbdc Merge pull request #3426 from vector-im/dbkr/msisdn_signin_2 
Support for phone number registration/signin, mk2
 2017-03-21 13:43:49 +00:00
Michael Telatynski 05148b6e93 Add contributor to listing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-03-20 13:31:26 +00:00
Michael Telatynski 89447b7bfc Explicitly specify level of inversion to avoid inconsistent defaults with webkit-filter/filter 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-03-20 13:31:00 +00:00
Matthew Hodgson af122172f1 Merge pull request #3470 from kfatehi/277-confirmredact 
Confirm redactions with a dialog
 2017-03-19 02:36:01 +00:00
Keyvan Fatehi a9ed2e20cb Confirm redactions with a dialog 
Closes #277
Closes #1805

Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com>
 2017-03-18 18:58:24 -07:00
Luke Barnard be02ac3bc6 Fix people section again 
- Alter CSS due to removed mx_RoomDropTarget_avatar. The avatar was removed because it didn't particularly add anything and we needed space for "Drop here to tag as direct chat", which is quite long.
 - Use guessAndSetDMRoom as a convenience method for guessing the DM member and setting the state.
 - Do evil hacks to make DNDRoomTile do dragging of RoomTiles to and from the People section. Dragging a DM to and from Rooms/Favourites/Low Priority now works as one would expect. This is still not ideal however because edge cases exist where you have more than one tag set and then you drag a DM from "Favourites" to "Rooms" and the tile ends up in "People". This would require setting multiple tags, and breaks the 1-1 mapping between tags and sections even further. Ultimately the UI needs a rework.
 2017-03-17 12:14:44 +00:00
David Baker e3e2e3a56c Merge pull request #3453 from vector-im/luke/display-redactions-better 
Better CSS for redactions
 2017-03-16 17:12:11 +00:00
Luke Barnard 49be954d31 Better CSS for redactions 
See https://github.com/vector-im/riot-web/issues/3390

Also: The "Redact" option in the MessageContextMenu no longer appears for redacted events.
 2017-03-16 17:03:16 +00:00
David Baker ad306dd999 CSS for add phone number in UserSettings 2017-03-16 14:59:13 +00:00
David Baker 2efcf7023f Merge pull request #3448 from vector-im/luke/fix-room-list-people 
Fix the people section
 2017-03-16 13:19:45 +00:00
Luke Barnard f8298b2482 Fix the people section 
This does two things:
 - Fixes an incorrect import that was causing Direct Chat toggle to not be editable https://github.com/vector-im/riot-web/issues/3355
 - Use props.list in RoomSubList when calculating whether to show IncomingCallDialog. Fixes https://github.com/vector-im/riot-web/issues/2956
 2017-03-16 11:36:57 +00:00
David Baker c4d3d66f31 Support for phone number registration/signin, mk2 
Changes from https://github.com/vector-im/riot-web/pull/3381
 2017-03-14 14:45:54 +00:00
Luke Barnard 1ade7a711c Merge pull request #3395 from vector-im/luke/merge-RoomTile-context-menus 
Merge the two RoomTile context menus into one
 2017-03-14 14:19:41 +00:00
Luke Barnard 32b9ee7f6f Copyright 2017-03-14 14:07:10 +00:00
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