7b3719bc3c
Remove unused `placeholder` prop on RoomDropTarget
2017-04-26 16:27:25 +01:00
0a1ebc2487
Don't show for anything that doesn't have a msgtype and body
...
otherwise the server will just reject it anyway
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 22:43:02 +01:00
9124c1475a
Change redact -> remove to improve clarity
...
Addresses #2814
Non-technical users may not understand what 'redact' means and can more easily understand what 'Remove' does. See discussion on vector-im/riot-web#2814 for more information.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-24 12:48:32 -06:00
2eb715002f
Merge branch 'develop' of https://github.com/vector-im/riot-web into forward_message
...
Conflicts:
.gitignore
2017-04-24 18:38:52 +01:00
92b52a61e7
don't show forward option for things we cannot decrypt
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 18:33:25 +01:00
40eceaf9bc
show err.message in errors if present
2017-04-23 02:22:31 +01:00
ab5ec04507
oops
2017-04-23 01:01:38 +01:00
b1ff0b9e65
hook up keyb shortcuts for roomdir
2017-04-23 01:00:25 +01:00
be52787473
better solution to incomingcallbox weirdness
2017-04-22 17:37:16 +01:00
b3431bb750
fix incoming call box
2017-04-22 17:28:09 +01:00
523b315985
Merge pull request #3640 from t3chguy/t3chguy/lightbox_download_button
...
fix ImageView Download functionality
2017-04-22 02:59:17 +01:00
2afe9e6928
Merge pull request #3692 from vector-im/luke/login-ui
...
Cosmetics to go with matrix-org/matrix-react-sdk#811
2017-04-21 17:40:53 +01:00
1e139ef183
Cosmetics to go with matrix-org/matrix-react-sdk#811
2017-04-21 17:04:11 +01:00
20abb2c2df
Add Forward Message button to m.room.message events
...
Conform this file to eslint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 13:46:23 +01:00
52a119244b
Cancel quick-search on Escape, clearing it and returning focus to composer.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 01:21:25 +01:00
ddd12edc06
clear the searchbox after quick-search
2017-04-20 14:21:36 +01:00
8f20fcfa6b
Merge pull request #3654 from vector-im/matthew/quick-search
...
Optimise RoomList and implement quick-search functionality on it.
2017-04-20 11:26:08 +01:00
c1d30664de
pass through selectedRoom
2017-04-20 01:13:13 +01:00
1803a0df9e
select any existing filter text on ctrl-k
2017-04-20 00:04:08 +01:00
e780fe4067
we don't need RoomTile specific focus in the end
2017-04-18 22:54:20 +01:00
acbc3e9f9b
move RoomSubList.refreshHeader to apply to the whole RoomSubList again
2017-04-18 19:27:57 +01:00
a8daa53a5b
always let tab/shift-tab select sublist headers
2017-04-18 17:49:50 +01:00
053beae035
move focus-via-up/down cursors to LeftPanel
2017-04-18 17:36:23 +01:00
25907301a3
More unmounted guards in BugReportDialog
2017-04-18 16:51:35 +01:00
d8bf57edc5
Add progress reporting to rageshake submission
2017-04-18 16:51:35 +01:00
269f9a5ccc
Load submit-rageshake asynchronously
...
... because it's 250K :/
2017-04-18 16:51:35 +01:00
f8aa2c3487
fix bugs in RoomSubListHeader splitout
2017-04-18 02:43:06 +01:00
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
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
c6ee221ae4
typos
2017-04-16 15:58:00 +01:00
8351ec9738
thread RoomTile focus events through RoomSubList up to RoomList
2017-04-15 13:23:11 +01:00
27de972bfb
oops
2017-04-15 12:02:50 +01:00
e5e259e1f8
put a ! on invite sublists
2017-04-15 12:02:16 +01:00
a74bbb424c
cmd-k shortcut to the searchbox
2017-04-15 11:37:09 +01:00
3f291aae5b
Use an opts arg for submit-rageshake
2017-04-12 11:26:53 +01:00
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
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
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
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
c72a49d229
More equalses
2017-03-28 16:34:35 +01:00
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
8b50ed8006
Merge pull request #3458 from vector-im/luke/fix-people-section2
...
Fix people section again
2017-03-27 15:52:15 +02:00
d696196d72
fix https://github.com/vector-im/riot-web/issues/3348
2017-03-27 12:39:58 +01:00
abc5b2d5f4
UI delay in UI
2017-03-27 09:44:33 +01:00
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
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
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
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
32b9ee7f6f
Copyright
2017-03-14 14:07:10 +00:00
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
d639eb1049
beautify all error msgs
2017-03-12 23:26:26 +00:00
611bb3a857
beautiful error on roomdirectory fail
2017-03-12 20:04:02 +00:00
3dc45886f7
Merge the two RoomTile context menus into one
2017-03-09 17:05:51 +00:00
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
9b42fbe42f
Expose notification option for username/MXID
...
For those unfortunate people that get pinged constantly.
2017-02-27 15:32:58 -07:00
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
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
5b239adfb8
Fix bug with home icon not appearing when logged in as team member
2017-02-07 14:58:25 +00:00
fa552ad5af
Merge branch 'develop' into luke/rts-welcome-pages
2017-02-07 12:41:52 +01:00
35bc384c51
Set team token in state on mount
2017-02-07 11:39:31 +00:00
d490bd8638
Use home.html rather than welcome.html
2017-02-07 11:35:17 +00:00
8d4f81ff67
Remove redundant inline style
2017-02-07 11:34:49 +00:00
648204b6f9
Use import
2017-02-07 11:34:34 +00:00
3f49f020cf
Copyright
2017-02-07 11:19:01 +00:00
7ceaabb166
RightPanel: remove superfluous divs
2017-02-03 12:00:33 +00:00
67e14ff363
Merge branch 'develop' into rav/hotkey-ux
2017-02-03 11:43:32 +00:00
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
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
4c3a723aa8
make TopRightMenu more intuitive
...
should fix https://github.com/vector-im/riot-web/issues/2827
2017-02-02 18:42:03 +00:00
a2622a556c
Remove SdkConfig dep
2017-02-02 14:01:12 +00:00
6a9e5deb7b
Remove commented code
2017-02-02 14:00:21 +00:00
f2e62ff439
Use RTS URL passed through
2017-02-02 11:58:20 +00:00
4a34bee2dc
Use localStorage `mx_team_token` to decide welcome page
2017-02-02 11:12:43 +00:00
40609d7da3
then->done
2017-02-01 11:39:23 +00:00
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
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
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
b16fa4171a
Close the dialog box after sending bugs
2017-01-26 13:42:37 +00:00
0a9f02abcc
Glue the dialog to rageshake: honour sendLogs flag.
2017-01-25 16:51:26 +00:00
ef519231d6
fix mute button colors
2017-01-20 21:16:58 +00:00
5edb5f6487
Turned divs to button-likes to comply with MDN's recommendations
2017-01-14 02:11:58 +02:00
bb28903c8e
fix warning page
2016-12-24 01:36:00 +00:00
42357dee0b
Typo
2016-12-16 16:36:24 +00:00
2e73cd6c4d
PR feedback
2016-12-16 16:24:24 +00:00
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
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
52cf1f6a4b
Missed a wire_onclick
2016-12-15 16:36:14 +00:00
5f7cdb8d42
s/wire_onclick/handleClicks/
...
and actually pass handleClicks false as appropriate
2016-12-15 14:29:16 +00:00
901c0e7e41
Remove unused event params
2016-12-15 14:24:55 +00:00
98cad8779c
Add instance_id to initial state
2016-12-15 10:42:11 +00:00
fc597ba86e
Underscore for private method
2016-12-15 10:41:22 +00:00
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
7577d2eb05
s/var/const/
2016-11-17 10:51:09 +00:00
81d70a921d
Add a 'View decrypted source' button
2016-11-16 23:10:51 +00:00
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
3f640139d2
quick and dirty support for custom welcome pages, with an example for geektime techfest
2016-11-13 14:10:33 +00:00
15c730a22a
Add rel="noopener" to context menu links.
2016-11-08 17:08:50 +00:00
cf33ed58c1
Add menu option for `external_url` if present
2016-11-08 16:57:56 +00:00
108af83ae8
Just bind the right function to the button
...
rather than deciding in onChangelogClicked
2016-11-03 11:43:50 +00:00
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
64fdb290eb
Move 'new version' support into Platform
2016-11-02 16:02:55 +00:00
df94dd7487
Update ChangelogDialog.js
2016-10-25 14:41:02 +01:00
42993a78ed
Only show quote option if RTE is enabled
2016-10-11 19:07:15 +05:30
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
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
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
c0a4574069
For single instance, allow domain present & match
2016-10-04 15:30:46 +01:00
de9bf4bb47
Actually use variable
2016-10-04 15:18:07 +01:00
b80b08f04f
Specify width on icons & comment
2016-10-04 11:14:36 +01:00
304e5b997a
PR Freedback
2016-10-04 11:04:01 +01:00
6b4dbfbd62
Change default brand to Riot
...
& update sample config
2016-10-04 10:23:38 +01:00
000ca35727
Don't pop up errors when this API fails for guests
2016-10-03 16:30:57 +01:00
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
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
b71b1b5535
Use more variables
2016-09-30 09:39:30 +01:00
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
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
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
65f14c7d21
Stop random rooms appearing when switching network
...
in the public room directory
2016-09-28 14:18:40 +01:00
864ba52bc5
Relative img paths please
2016-09-28 12:03:35 +01:00
fdb5020c0c
Oops, fix undefined variable
2016-09-28 11:56:07 +01:00
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
5ca391f914
Replace double truth test with something sane
...
Also typo
2016-09-28 11:04:13 +01:00
a32abae5a3
Don't use _matrix as default if there isn't one
2016-09-28 10:58:01 +01:00
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
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
bf58c340bc
Oops, missed the ref
2016-09-26 15:30:42 +01:00
dc0b15bdfa
Remove unused variable / function
2016-09-26 14:17:36 +01:00
51a5542446
Make tests pass
2016-09-23 18:20:31 +01:00
8e1105b12a
Oops, wrong function
2016-09-23 15:25:13 +01:00
2e77b0a3c7
Use directory search box component
2016-09-23 13:48:44 +01:00
d9c51832ab
Use 2x res logo to work with hidpi displays
2016-09-21 11:09:00 +01:00
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
940eaf2b7d
The times, they are a changin'
2016-09-19 15:32:39 +01:00
855ecbe11d
Update twitter / blog
2016-09-19 15:18:49 +01:00
1c76870dcf
Remove failed commenting
2016-09-19 13:36:04 +01:00
a99c9f4db2
Keep order of blog / twitter the same
2016-09-19 13:35:31 +01:00
7e5373e194
Stick with VectorCo twitter for now
2016-09-19 13:34:49 +01:00
560174b99f
Keep width on logo
2016-09-19 13:34:01 +01:00
d2947a637a
Better.
2016-09-19 13:31:01 +01:00
8e4dcd9b41
Rebrand
2016-09-19 13:29:49 +01:00
9391dc6c2a
aargh
2016-09-19 07:41:32 -04:00
de38a32969
Listen for close_scalar and close the dialog box when received
2016-09-19 10:37:19 +01:00
e2fc2b1b09
Revert "improve lipstick and support scalar logout"
2016-09-19 10:16:50 +01:00
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
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
0ab1dacb1e
Merge remote-tracking branch 'origin/pull/2071/head' into rav/fix_changelog_links
2016-09-18 23:33:17 +01:00
af230b5fa8
improve lipstick and support scalar logout
2016-09-18 02:57:15 +01:00
4720da3f8e
Merge pull request #2241 from vector-im/dbkr/paginate_publicrooms
...
Paginate Room Directory
2016-09-17 15:46:21 +01:00
e2b3fc3519
only show invite button for rooms you're in
2016-09-17 03:02:14 +01:00
ab3c1509c5
switch to 3-digit formatting for counts
2016-09-17 02:39:31 +01:00
91dd029483
don't let guests invite
2016-09-17 02:05:01 +01:00
53fd3f52fa
Oops, onChange doesn't catch the enter key
2016-09-16 20:56:14 +01:00
3d97061d78
Check if we need to fetch more rooms after filter
2016-09-16 19:59:06 +01:00
50f05db29e
Don't show loading spinner if just paginating
2016-09-16 19:29:56 +01:00
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
6d332256b5
Ignore results of old requests
2016-09-16 18:48:47 +01:00
2b6fbb038a
Show headers while loading
...
& show spinner whilst waiting for filter requests
2016-09-16 18:41:29 +01:00
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
135c22c99d
Merge pull request #2219 from vector-im/dbkr/directory_network_selector
...
Directory network selector
2016-09-16 17:09:23 +01:00
7af765976b
Notification counts now done correctly, as well as highlights
2016-09-16 13:25:39 +01:00
72e108c4f9
More robust badge positioning
2016-09-16 11:34:16 +01:00
e2b695827e
Refactor to reuse RoomSubList chevron styling
2016-09-16 11:02:09 +01:00
4b50a8a56e
Refactored so the RoomSubList overflow element use RoomSubList CSS
2016-09-16 10:57:55 +01:00
737d1d8843
Changed the overflow tile styling, but there is no collpased state or mention count yet
2016-09-16 10:48:52 +01:00
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
37fc73b1ea
Setting correct initial state
2016-09-15 17:31:15 +01:00
c1e83da35d
Put network list config into config file
2016-09-15 17:20:13 +01:00
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
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
5ceb1e641f
Placing the incomingCallBox in the sticky element, so it sticks when the header sticks
2016-09-15 15:34:11 +01:00
f3cbb9fe90
Make the network dropdown work
2016-09-15 15:18:12 +01:00
cde3f33db3
Added incomingCallBox to header and removed from roomTile
2016-09-15 14:37:53 +01:00
82e257b4ea
make DM naming consistent
2016-09-15 13:23:17 +01:00
43b87e1f82
Add network selector that doesn't do anything yet
2016-09-15 11:29:27 +01:00
efa574c452
The invite group, will no longer be shown when the directory listing is being shown
2016-09-14 17:13:06 +01:00
66ef5213b8
Increased hitbox area to the whole invite section, not just the icon
2016-09-14 14:32:30 +01:00
089951012b
actually, sod it, let's just call it Start chat
2016-09-13 19:42:35 +01:00
c6a9614372
Merge pull request #2181 from vector-im/wmwragg/chat-multi-invite
...
Wmwragg/chat multi invite
2016-09-13 19:31:05 +01:00
b247c8a87f
rename 'start chat' tooltip
2016-09-13 19:08:43 +01:00
f8c9a28194
Updated to correct invite icon
2016-09-13 14:33:19 +01:00
768f11fe58
Added new Invite button in the RHS footer
2016-09-13 14:27:23 +01:00
7b25f4e069
wip for collapsable RHS
2016-09-13 12:18:09 +01:00
89f8ff4988
Merge branch 'develop' into matthew/notif-panel
2016-09-11 02:37:30 +01:00
ab9786cc02
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
2016-09-09 16:27:00 +01:00
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
09ce3a79ec
Added back the Directory listing button, with new tootlip
2016-09-09 12:23:50 +01:00
e75148e799
Merge branch 'develop' into matthew/notif-panel
2016-09-09 11:20:10 +01:00
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
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
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
74aef1fdad
Comment delay
2016-09-08 13:58:53 +01:00
8860c9c7fd
Merge pull request #2082 from aviraldg/feature-rte-formatbar
...
Formatting toolbar for RTE message composer.
2016-09-08 13:54:39 +01:00
f5ce053f42
hook up the NotifPanel button
2016-09-08 03:02:50 +01:00
a1f8116e3b
Support toggling DM status of rooms
...
on context menu
2016-09-07 17:47:47 +01:00
7c74b0124b
explicit props for RightPanel at last
2016-09-07 15:43:29 +01:00
1f19ee88c6
make FilePanel work, superficially at least
2016-09-06 01:45:12 +01:00
d6a324ede7
Formatting toggle, markdown indicator, quoting
2016-09-05 17:39:32 +05:30
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
059f5198e5
Merge branch 'develop' into wmwragg/one-to-one-chat
2016-09-05 12:07:21 +01:00
David Baker