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
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
David Baker
c1e83da35d
Put network list config into config file
2016-09-15 17:20:13 +01:00
David Baker
f3cbb9fe90
Make the network dropdown work
2016-09-15 15:18:12 +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
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
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
David Baker
a1f8116e3b
Support toggling DM status of rooms
...
on context menu
2016-09-07 17:47:47 +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
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
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
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
Jan Solanti
e85674711c
Improve readability of the changelog dialog
2016-09-01 15:13:09 +03:00
Matthew Hodgson
56dfdbeb6b
call noisy notifs... noisy
2016-09-01 00:14:01 +01:00
Matthew Hodgson
9b8e127e23
switch to using matrix.to for permalinks
2016-08-28 02:11:57 +01:00
Matthew Hodgson
ee1fae8ced
fix RoomTagContextMenu so it works on historical rooms
2016-08-27 23:58:35 +01:00
Matthew Hodgson
2199fe5cbf
unbreak changelog
2016-08-27 00:06:00 +01:00
Matthew Hodgson
c6d4eb7fd3
try to make the changelog commit links suck less
2016-08-26 00:40:21 +01:00
Richard van der Hoff
042a6b58c4
Remove redundant whatwg import
...
This has been rewritten to use browser-request rather than whatwg, so remove
the import, which was causing the build to fail on npm 2. (It worked, for the
wrong reasons, on npm 3.)
2016-08-25 12:14:49 +01:00
Matthew Hodgson
3934e37f77
Merge pull request #1972 from aviraldg/feature-changelog
...
add fancy changelog dialog
2016-08-24 18:02:00 +01:00
Aviral Dasgupta
56813eb11e
remove whatwg-fetch and use browser-request
2016-08-22 23:59:32 +05:30
wmwragg
4a2c899d05
Merge branch 'develop' into wmwragg/chat-message-presentation
2016-08-19 17:22:26 +01:00