OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
4,046 Commits
194 Branches
541 Tags
298 MiB
Commit Graph

675 Commits (rav/no_owner_on_tarball)

Author SHA1 Message Date
Matthew Hodgson acbc3e9f9b move RoomSubList.refreshHeader to apply to the whole RoomSubList again 2017-04-18 19:27:57 +01:00
Matthew Hodgson a8daa53a5b always let tab/shift-tab select sublist headers 2017-04-18 17:49:50 +01:00
Matthew Hodgson 053beae035 move focus-via-up/down cursors to LeftPanel 2017-04-18 17:36:23 +01:00
Richard van der Hoff 25907301a3 More unmounted guards in BugReportDialog 2017-04-18 16:51:35 +01:00
Richard van der Hoff d8bf57edc5 Add progress reporting to rageshake submission 2017-04-18 16:51:35 +01:00
Richard van der Hoff 269f9a5ccc Load submit-rageshake asynchronously 
... because it's 250K :/
 2017-04-18 16:51:35 +01:00
Matthew Hodgson f8aa2c3487 fix bugs in RoomSubListHeader splitout 2017-04-18 02:43:06 +01:00
Matthew Hodgson 5ff49f4000 split out header from RoomSubList and let it update separately 
By moving the header into its own RoomSubListHeader, we can refresh it explicitly
by poking it by the new constantTimeDispatcher without re-rendering the whole stack
of room tiles

*UNTESTED*
 2017-04-17 20:53:52 +01:00
Michael Telatynski cc7a585126 make ImageView Download work, based on props.name 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-17 15:07:21 +01:00
Matthew Hodgson c6ee221ae4 typos 2017-04-16 15:58:00 +01:00
Matthew Hodgson 8351ec9738 thread RoomTile focus events through RoomSubList up to RoomList 2017-04-15 13:23:11 +01:00
Matthew Hodgson 27de972bfb oops 2017-04-15 12:02:50 +01:00
Matthew Hodgson e5e259e1f8 put a ! on invite sublists 2017-04-15 12:02:16 +01:00
Matthew Hodgson a74bbb424c cmd-k shortcut to the searchbox 2017-04-15 11:37:09 +01:00
Richard van der Hoff 3f291aae5b Use an opts arg for submit-rageshake 2017-04-12 11:26:53 +01:00
Richard van der Hoff 6423f7ce03 rageshake: factor out submission to a separate file 
This will mean we can load it asyncronously in future, if we want.
 2017-04-11 18:59:22 +01:00
Richard van der Hoff cbfa4dd1ab Get rageshake endpoint from SdkConfig instead of storing in rageshake 
- in preparation for factoring out the sending of the rageshake
 2017-04-11 18:46:48 +01:00
Luke Barnard 91892ec18b Do not assume getTs will return comparable integer 
Fixes https://github.com/vector-im/riot-web/issues/3529. In the worst case, tsOfNewestEvent will return MAX_SAFE_INTEGER, instead of undefined, as may be the case of some events that were redacted and persisted in indexDB before changes were made to how events are redacted locally. (The important change is that events are now not stripped of their `origin_server_ts`).
 2017-03-29 14:30:08 +01:00
David Baker 2480831e2f Merge pull request #3530 from vector-im/dbkr/email_notifs_only_to_email_addresses 
Don't show phone number as target for email notifs
 2017-03-28 16:40:13 +01:00
David Baker c72a49d229 More equalses 2017-03-28 16:34:35 +01:00
David Baker 83b7f94609 Don't show phone number as target for email notifs 
Fixes https://github.com/vector-im/riot-web/issues/3518
 2017-03-28 16:24:54 +01:00
Luke Barnard 8b50ed8006 Merge pull request #3458 from vector-im/luke/fix-people-section2 
Fix people section again
 2017-03-27 15:52:15 +02:00
Matthew Hodgson d696196d72 fix https://github.com/vector-im/riot-web/issues/3348 2017-03-27 12:39:58 +01:00
Luke Barnard abc5b2d5f4 UI delay in UI 2017-03-27 09:44:33 +01: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
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
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
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
Matthew Hodgson d639eb1049 beautify all error msgs 2017-03-12 23:26:26 +00:00
Matthew Hodgson 611bb3a857 beautiful error on roomdirectory fail 2017-03-12 20:04:02 +00:00
Luke Barnard 3dc45886f7 Merge the two RoomTile context menus into one 2017-03-09 17:05:51 +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
turt2live 9b42fbe42f Expose notification option for username/MXID 
For those unfortunate people that get pinged constantly.
 2017-02-27 15:32:58 -07:00
David Baker 03dd25624f Allow forgetting rooms you're banned from 
From the room tag context menu.

Also fix the room tag context menu, which was missing sdk and
modal imports. Switch over the import while we're at it.
 2017-02-17 15:52:07 +00:00
Luke Barnard 78aaf6b47e Use the teamToken threaded through from react sdk 
The bottom left menu now uses the same teamToken that the rest of the components use. This will require changes to react-sdk: https://github.com/matrix-org/matrix-react-sdk/pull/684
 2017-02-10 09:56:15 +00:00
Luke Barnard 5b239adfb8 Fix bug with home icon not appearing when logged in as team member 2017-02-07 14:58:25 +00:00
Luke Barnard fa552ad5af Merge branch 'develop' into luke/rts-welcome-pages 2017-02-07 12:41:52 +01:00
Luke Barnard 35bc384c51 Set team token in state on mount 2017-02-07 11:39:31 +00:00
Luke Barnard d490bd8638 Use home.html rather than welcome.html 2017-02-07 11:35:17 +00:00
Luke Barnard 8d4f81ff67 Remove redundant inline style 2017-02-07 11:34:49 +00:00
Luke Barnard 648204b6f9 Use import 2017-02-07 11:34:34 +00:00
Luke Barnard 3f49f020cf Copyright 2017-02-07 11:19:01 +00:00
Richard van der Hoff 7ceaabb166 RightPanel: remove superfluous divs 2017-02-03 12:00:33 +00:00
Richard van der Hoff 67e14ff363 Merge branch 'develop' into rav/hotkey-ux 2017-02-03 11:43:32 +00:00
Richard van der Hoff a64e1cb936 Merge pull request #3118 from vector-im/dbkr/network_dropdown_mxc 
Allow mxc: URLs for icons in the NetworkDropdown
 2017-02-02 19:53:46 +00:00
David Baker 3903954bf2 Allow mxc: URLs for icons in the NetworkDropdown 
For https://github.com/vector-im/riot-web/issues/3086
 2017-02-02 19:35:36 +00:00
Matthew Hodgson 4c3a723aa8 make TopRightMenu more intuitive 
should fix https://github.com/vector-im/riot-web/issues/2827
 2017-02-02 18:42:03 +00:00
Luke Barnard a2622a556c Remove SdkConfig dep 2017-02-02 14:01:12 +00:00
Luke Barnard 6a9e5deb7b Remove commented code 2017-02-02 14:00:21 +00:00
Luke Barnard f2e62ff439 Use RTS URL passed through 2017-02-02 11:58:20 +00:00
Luke Barnard 4a34bee2dc Use localStorage `mx_team_token` to decide welcome page 2017-02-02 11:12:43 +00:00
Luke Barnard 40609d7da3 then->done 2017-02-01 11:39:23 +00:00
Luke Barnard 1f3ab4425a Merge branch 'develop' into matthew/homepages 
Conflicts:
	src/component-index.js
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
 2017-02-01 11:34:24 +00:00
Luke Barnard 87db89b67a Replace inline styles for logos with css 
Also, give .mx_Login_logo a height so that if the image has not loaded yet, it will not change height (thanks @dbkr)
 2017-01-27 16:30:44 +00:00
Luke Barnard 02d6a10f67 Allow a custom login logo to be displayed on login 
This is to allow team logos to be shown when a user registers with a team email.
 2017-01-27 16:08:14 +00:00
Kegan Dougal b16fa4171a Close the dialog box after sending bugs 2017-01-26 13:42:37 +00:00
Kegan Dougal 0a9f02abcc Glue the dialog to rageshake: honour sendLogs flag. 2017-01-25 16:51:26 +00:00
Matthew Hodgson ef519231d6 fix mute button colors 2017-01-20 21:16:58 +00:00
Jani Mustonen 5edb5f6487 Turned divs to button-likes to comply with MDN's recommendations 2017-01-14 02:11:58 +02:00
Matthew Hodgson bb28903c8e fix warning page 2016-12-24 01:36:00 +00:00
David Baker 42357dee0b Typo 2016-12-16 16:36:24 +00:00
David Baker 2e73cd6c4d PR feedback 2016-12-16 16:24:24 +00:00
David Baker 994bc9279f Remove the client side filtering from the room dir 
This removes the ability for the client to filter remote room
directories by network, since the /thirdparty/protocols API does
not yet work for remote servers. They would only get the main list
now though anyway, so there is no point in us continuing to support
it.
 2016-12-16 14:17:13 +00:00
David Baker fb08910db3 Read the icon from the right place 
Also don't define image widths in the HTML as it's done in the CSS.
 2016-12-16 10:14:38 +00:00
David Baker 52cf1f6a4b Missed a wire_onclick 2016-12-15 16:36:14 +00:00
David Baker 5f7cdb8d42 s/wire_onclick/handleClicks/ 
and actually pass handleClicks false as appropriate
 2016-12-15 14:29:16 +00:00
David Baker 901c0e7e41 Remove unused event params 2016-12-15 14:24:55 +00:00
David Baker 98cad8779c Add instance_id to initial state 2016-12-15 10:42:11 +00:00
David Baker fc597ba86e Underscore for private method 2016-12-15 10:41:22 +00:00
David Baker f5bd8abfda Support room dir 3rd party network filtering 
As per https://github.com/matrix-org/synapse/pull/1676

The existing local config system still exists and is used for
remote home server directories (since /thirdparty/protocols
doesn't support listing remote home servers, and also because
people are using it).
 2016-12-14 15:41:15 +00:00
Richard van der Hoff 7577d2eb05 s/var/const/ 2016-11-17 10:51:09 +00:00
Richard van der Hoff 81d70a921d Add a 'View decrypted source' button 2016-11-16 23:10:51 +00:00
David Baker 70d383fb1b Fix changelog dialog to read new version format 
Remove the 'vector' from the start of the version (otherwise the
tarballs are called vector-vector-[...].tar.gz). The jenkins
script already creates these files, so update accordingly.
 2016-11-13 23:06:57 +00:00
Matthew Hodgson 3f640139d2 quick and dirty support for custom welcome pages, with an example for geektime techfest 2016-11-13 14:10:33 +00:00
Will Hunt 15c730a22a Add rel="noopener" to context menu links. 2016-11-08 17:08:50 +00:00
Will Hunt cf33ed58c1 Add menu option for `external_url` if present 2016-11-08 16:57:56 +00:00
David Baker 108af83ae8 Just bind the right function to the button 
rather than deciding in onChangelogClicked
 2016-11-03 11:43:50 +00:00
David Baker e8494c3dc7 Split NewVersionBar release notes / changelog 
and change the class to use React createClass syntax while I'm at
it, rather than a completely different third style we use nowhere
else in the project.
 2016-11-02 19:20:11 +00:00
David Baker 64fdb290eb Move 'new version' support into Platform 2016-11-02 16:02:55 +00:00
David Baker df94dd7487 Update ChangelogDialog.js 2016-10-25 14:41:02 +01:00
Aviral Dasgupta 42993a78ed Only show quote option if RTE is enabled 2016-10-11 19:07:15 +05:30
David Baker 323bd79d0e Fix join button for 'matrix' networks 
Fixes https://github.com/vector-im/vector-web/issues/2435
 2016-10-10 11:21:20 +01:00
David Baker 5e293c0f45 Don't stop paginating if no rooms match 
Always show the scrollpanel otherwise we stop paginating if there
are no matching rooms in the first request (as per comment).

Fixes no freenode rooms being shown.
 2016-10-05 18:06:43 +01:00
David Baker ea38968be9 Merge pull request #2379 from vector-im/dbkr/join_3p_location 
Add native joining of 3p networks to room dir
 2016-10-05 14:00:21 +01:00
David Baker c0a4574069 For single instance, allow domain present & match 2016-10-04 15:30:46 +01:00
David Baker de9bf4bb47 Actually use variable 2016-10-04 15:18:07 +01:00
David Baker b80b08f04f Specify width on icons & comment 2016-10-04 11:14:36 +01:00
David Baker 304e5b997a PR Freedback 2016-10-04 11:04:01 +01:00
David Baker 6b4dbfbd62 Change default brand to Riot 
& update sample config
 2016-10-04 10:23:38 +01:00
David Baker 000ca35727 Don't pop up errors when this API fails for guests 2016-10-03 16:30:57 +01:00
David Baker 776fe2ad70 Different way of getting fields for 3p location 
Try to match protocol insance from 'domain' field and use its
fields for all but the last field. Assume the last takes the user
input.
 2016-10-03 13:42:55 +01:00
Richard van der Hoff 602727b7ad Merge pull request #2383 from vector-im/dbkr/sign_in_not_log_in 
Use 'Sign In' / 'Sign Out' universally
 2016-09-30 11:31:15 +01:00
David Baker b71b1b5535 Use more variables 2016-09-30 09:39:30 +01:00
David Baker f9a70a8b04 Use 'Sign In' / 'Sign Out' universally 
Rather than a mix of 'sign in/out' and 'log in/out'
 2016-09-29 17:40:19 +01:00
David Baker 2a37a0cb19 Room directory: indicate when there are no results 
Fixes https://github.com/vector-im/vector-web/issues/2250
 2016-09-29 15:45:45 +01:00
David Baker 761600f325 Add native joining of 3p networks to room dir 
Use the 3rd party location lookup API to accept third-party locations
in their native form and look up the corresponding portal room for
that location.

Also give the network dropdown some placeholder text.

Fixes https://github.com/vector-im/vector-web/issues/2374
 2016-09-29 15:30:54 +01:00
David Baker 65f14c7d21 Stop random rooms appearing when switching network 
in the public room directory
 2016-09-28 14:18:40 +01:00
David Baker 864ba52bc5 Relative img paths please 2016-09-28 12:03:35 +01:00
David Baker fdb5020c0c Oops, fix undefined variable 2016-09-28 11:56:07 +01:00
David Baker 0db12fcd22 Move method & don't wastefullt create elements 
Put did update with the other react interface methods & don't
bother creating the 'current_value' if we throw it away later.
 2016-09-28 11:05:14 +01:00
David Baker 5ca391f914 Replace double truth test with something sane 
Also typo
 2016-09-28 11:04:13 +01:00
David Baker a32abae5a3 Don't use _matrix as default if there isn't one 2016-09-28 10:58:01 +01:00
David Baker 6ff1c30a4b Fix spurious fill requests when switching networks 
Ignore responses for old servers too, don't trigger a backfill request
when we re-render before refresh. Also a few more comments.
 2016-09-28 10:08:03 +01:00
David Baker 85ea45a64a Room dir: New filtering & 3rd party networks 
Changes filtering on 3rd party networks to divide into portal / non portal rooms and not show portal rooms by default. Adds a special '_matrix' network for all rooms that aren't portal rooms.

Also adds ability to query 3rd party directory servers.
 2016-09-27 19:39:20 +01:00
David Baker bf58c340bc Oops, missed the ref 2016-09-26 15:30:42 +01:00
David Baker dc0b15bdfa Remove unused variable / function 2016-09-26 14:17:36 +01:00
David Baker 51a5542446 Make tests pass 2016-09-23 18:20:31 +01:00
David Baker 8e1105b12a Oops, wrong function 2016-09-23 15:25:13 +01:00
David Baker 2e77b0a3c7 Use directory search box component 2016-09-23 13:48:44 +01:00
David Baker d9c51832ab Use 2x res logo to work with hidpi displays 2016-09-21 11:09:00 +01:00
David Baker 5011d3b158 Only show version bar if on develop 
Or rather, if the version string is in the right format it to work.
 2016-09-20 14:33:25 +01:00
David Baker 940eaf2b7d The times, they are a changin' 2016-09-19 15:32:39 +01:00
David Baker 855ecbe11d Update twitter / blog 2016-09-19 15:18:49 +01:00
David Baker 1c76870dcf Remove failed commenting 2016-09-19 13:36:04 +01:00
David Baker a99c9f4db2 Keep order of blog / twitter the same 2016-09-19 13:35:31 +01:00
David Baker 7e5373e194 Stick with VectorCo twitter for now 2016-09-19 13:34:49 +01:00
David Baker 560174b99f Keep width on logo 2016-09-19 13:34:01 +01:00
David Baker d2947a637a Better. 2016-09-19 13:31:01 +01:00
David Baker 8e4dcd9b41 Rebrand 2016-09-19 13:29:49 +01:00
Matthew Hodgson 9391dc6c2a aargh 2016-09-19 07:41:32 -04:00
Kegan Dougal de38a32969 Listen for close_scalar and close the dialog box when received 2016-09-19 10:37:19 +01:00
Kegsay e2fc2b1b09 Revert "improve lipstick and support scalar logout" 2016-09-19 10:16:50 +01:00
Kegsay 1d97272874 Merge pull request #2280 from vector-im/matthew/scalar-lipstick 
improve lipstick and support scalar logout
 2016-09-19 09:27:07 +01:00
Richard van der Hoff 6cb7ffcd3b Another go at fixing the damn changelog 
html_url is in the top-level 'commit' object, not in commit.commit.

Also factor some code out for legibility. Seriously, what's with stuffing
everything into inline functions?
 2016-09-18 23:56:55 +01:00
Richard van der Hoff 0ab1dacb1e Merge remote-tracking branch 'origin/pull/2071/head' into rav/fix_changelog_links 2016-09-18 23:33:17 +01:00
Matthew Hodgson af230b5fa8 improve lipstick and support scalar logout 2016-09-18 02:57:15 +01:00
Matthew Hodgson 4720da3f8e Merge pull request #2241 from vector-im/dbkr/paginate_publicrooms 
Paginate Room Directory
 2016-09-17 15:46:21 +01:00
Matthew Hodgson e2b3fc3519 only show invite button for rooms you're in 2016-09-17 03:02:14 +01:00
Matthew Hodgson ab3c1509c5 switch to 3-digit formatting for counts 2016-09-17 02:39:31 +01:00
Matthew Hodgson 91dd029483 don't let guests invite 2016-09-17 02:05:01 +01:00
David Baker 53fd3f52fa Oops, onChange doesn't catch the enter key 2016-09-16 20:56:14 +01:00
David Baker 3d97061d78 Check if we need to fetch more rooms after filter 2016-09-16 19:59:06 +01:00
David Baker 50f05db29e Don't show loading spinner if just paginating 2016-09-16 19:29:56 +01:00
David Baker 2fdec51a5b Wait a bit before sending filter requests 
avoid hammering the server with requests for each keystroke
 2016-09-16 18:53:18 +01:00
David Baker 6d332256b5 Ignore results of old requests 2016-09-16 18:48:47 +01:00
David Baker 2b6fbb038a Show headers while loading 
& show spinner whilst waiting for filter requests
 2016-09-16 18:41:29 +01:00
David Baker a11516a984 Make publicrooms use the new paginating API 
Also do filtering on the server

WIP: This breaks the network dropdown
 2016-09-16 17:33:28 +01:00
David Baker 135c22c99d Merge pull request #2219 from vector-im/dbkr/directory_network_selector 
Directory network selector
 2016-09-16 17:09:23 +01:00
wmwragg 7af765976b Notification counts now done correctly, as well as highlights 2016-09-16 13:25:39 +01:00
wmwragg 72e108c4f9 More robust badge positioning 2016-09-16 11:34:16 +01:00
wmwragg e2b695827e Refactor to reuse RoomSubList chevron styling 2016-09-16 11:02:09 +01:00
wmwragg 4b50a8a56e Refactored so the RoomSubList overflow element use RoomSubList CSS 2016-09-16 10:57:55 +01:00
wmwragg 737d1d8843 Changed the overflow tile styling, but there is no collpased state or mention count yet 2016-09-16 10:48:52 +01:00
David Baker cd4564d3d3 Make the matrix.org section be everything 
(ie. every alias on the matrix.org HS, so currently everything, since we don't pull in any other directories)
 2016-09-15 18:56:04 +01:00
wmwragg 37fc73b1ea Setting correct initial state 2016-09-15 17:31:15 +01:00
David Baker c1e83da35d Put network list config into config file 2016-09-15 17:20:13 +01:00
wmwragg 5282796d84 Added back the overflow tile and two state room sub lists, rather than the three state currently 2016-09-15 17:17:45 +01:00
Matthew Hodgson 866164c4d9 Merge pull request #2222 from vector-im/wmwragg/correct-incoming-call-positioning 
Wmwragg/correct incoming call positioning
 2016-09-15 15:59:14 +01:00
wmwragg 5ceb1e641f Placing the incomingCallBox in the sticky element, so it sticks when the header sticks 2016-09-15 15:34:11 +01:00
David Baker f3cbb9fe90 Make the network dropdown work 2016-09-15 15:18:12 +01:00
wmwragg cde3f33db3 Added incomingCallBox to header and removed from roomTile 2016-09-15 14:37:53 +01:00
Matthew Hodgson 82e257b4ea make DM naming consistent 2016-09-15 13:23:17 +01:00
David Baker 43b87e1f82 Add network selector that doesn't do anything yet 2016-09-15 11:29:27 +01:00
wmwragg efa574c452 The invite group, will no longer be shown when the directory listing is being shown 2016-09-14 17:13:06 +01:00
wmwragg 66ef5213b8 Increased hitbox area to the whole invite section, not just the icon 2016-09-14 14:32:30 +01:00
Matthew Hodgson 089951012b actually, sod it, let's just call it Start chat 2016-09-13 19:42:35 +01:00
Matthew Hodgson c6a9614372 Merge pull request #2181 from vector-im/wmwragg/chat-multi-invite 
Wmwragg/chat multi invite
 2016-09-13 19:31:05 +01:00
Matthew Hodgson b247c8a87f rename 'start chat' tooltip 2016-09-13 19:08:43 +01:00
wmwragg f8c9a28194 Updated to correct invite icon 2016-09-13 14:33:19 +01:00
wmwragg 768f11fe58 Added new Invite button in the RHS footer 2016-09-13 14:27:23 +01:00
Matthew Hodgson 7b25f4e069 wip for collapsable RHS 2016-09-13 12:18:09 +01:00
Matthew Hodgson 89f8ff4988 Merge branch 'develop' into matthew/notif-panel 2016-09-11 02:37:30 +01:00
David Baker ab9786cc02 Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms 2016-09-09 16:27:00 +01:00
David Baker 57804f4e02 Support for common rooms in MemberInfo 
Renames RoomDNDView to DNDRoomTile which now provides a separate DNDRoomTile component rather than
clobberring RoomTile, so we can use a draggable one where we want a draggable one and a non-draggable
one where we don't want it to be draggable. RoomTile main is still polluted with DND stuff, but is
now optional.

Remove BottomLeftMenuTile because it was no longer used in the bottom left menu. Just include
the equivalent markup directly in the one place we now use it (in MemberTile in react-sdk).
 2016-09-09 16:15:45 +01:00
wmwragg 09ce3a79ec Added back the Directory listing button, with new tootlip 2016-09-09 12:23:50 +01:00
Matthew Hodgson e75148e799 Merge branch 'develop' into matthew/notif-panel 2016-09-09 11:20:10 +01:00
Matthew Hodgson 8376f0d75a Merge pull request #2110 from vector-im/wmwragg/one-to-one-chat 
Wmwragg/one to one chat
 2016-09-09 10:46:01 +01:00
wmwragg 7cb48e0d2d Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters 2016-09-09 06:56:54 +01:00
David Baker 9e771ddd07 Merge pull request #2111 from vector-im/dbkr/toggle_dm_room 
Support toggling DM status of rooms
 2016-09-08 14:11:30 +01:00
David Baker 74aef1fdad Comment delay 2016-09-08 13:58:53 +01:00
Matthew Hodgson 8860c9c7fd Merge pull request #2082 from aviraldg/feature-rte-formatbar 
Formatting toolbar for RTE message composer.
 2016-09-08 13:54:39 +01:00
Matthew Hodgson f5ce053f42 hook up the NotifPanel button 2016-09-08 03:02:50 +01:00
David Baker a1f8116e3b Support toggling DM status of rooms 
on context menu
 2016-09-07 17:47:47 +01:00
Matthew Hodgson 7c74b0124b explicit props for RightPanel at last 2016-09-07 15:43:29 +01:00
Matthew Hodgson 1f19ee88c6 make FilePanel work, superficially at least 2016-09-06 01:45:12 +01:00
Aviral Dasgupta d6a324ede7 Formatting toggle, markdown indicator, quoting 2016-09-05 17:39:32 +05:30
wmwragg 7378904f00 Adding back the BottomLeftMenuTile component, as it turns out it's still used in the RightPanel 2016-09-05 12:43:04 +01:00
wmwragg 059f5198e5 Merge branch 'develop' into wmwragg/one-to-one-chat 2016-09-05 12:07:21 +01:00
wmwragg fb103cb9e1 Rename the action to make it clearer what it is doing 2016-09-05 10:27:54 +01:00
wmwragg 2d827a75a6 Sending the top and left position tweaks with the action 2016-09-04 12:16:01 +01:00
wmwragg 50bb4edd1c Small refactor, to make it clearer whats happening 2016-09-04 08:54:15 +01:00
wmwragg e52f5b5d08 Removed unrequired positional tweak props 2016-09-04 08:49:43 +01:00
wmwragg fd81ce126b Code tidy up 2016-09-04 08:40:43 +01:00
wmwragg 7ae821e2b5 Removed nolonger needed conditional test, as the parent will always exist 2016-09-04 08:39:32 +01:00
wmwragg cb98e2421e Removed the nolonger required methods 2016-09-04 07:56:32 +01:00
wmwragg 5417385c83 Tolltip thweak to not require the passing in of the parent 2016-09-04 07:41:48 +01:00
wmwragg 52bd61a2f0 When collapsed a long hover on the header now shows the full tag name and room count 2016-09-03 14:48:10 +01:00
wmwragg 7f52fa74a4 Better comments, and syntax tweak 2016-09-03 14:14:11 +01:00
wmwragg d1dd4bd3d8 Updated tooltip styling to be better inline with the design 2016-09-03 13:57:49 +01:00
wmwragg ab9f48cd47 Restyled tooltip to better match the design 2016-09-03 13:44:00 +01:00
Matthew Hodgson c597f05e71 Merge branch 'develop' into matthew/notif-panel 2016-09-03 13:33:37 +01:00
wmwragg 80e6cd6d7c Further tweaks to the tooltip to better handle its position, and simplify it's use 2016-09-03 12:44:09 +01:00
wmwragg cb101b0a3b Allow better updating if the tooltip is designed to stick around, rather than just appearing on hover 2016-09-02 18:50:47 +01:00
wmwragg bf4e3364b4 Tweak of the RoomTooltip to use DOM element for the parent rather than a React component 2016-09-02 18:41:27 +01:00
Remi Rampin d5865421bd Open commits in new window/tab from changelog 2016-09-02 12:22:51 -04:00
Remi Rampin 8578203073 Open HTML commit page for changelog entries 2016-09-02 12:22:15 -04:00
wmwragg d2e2c726eb Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari 2016-09-02 15:45:43 +01:00
wmwragg bf8d7050cc New People icon in place of Directory icon, and placeholder functionality 2016-09-01 16:46:51 +01:00