wmwragg
a218b4e8a3
Merge branch 'wmwragg/mention-state-indicator-round-3' into wmwragg/mention-state-menu
...
# resolved Conflicts:
# src/components/views/rooms/RoomTile.js
2016-07-25 17:04:37 +01:00
David Baker
4b763997df
Merge pull request #361 from matrix-org/dbkr/refactor_matrixclientpeg
...
Refactor MatrixClientPeg
2016-07-25 16:36:47 +01:00
David Baker
cbf10bfff6
PR feedback
...
Reintroduce replaceClient so we're not calling replaceUsingAccessToken without access tokens which is a bit silly.
Fix bug from previous commit (pass isGuest through)
2016-07-25 16:28:28 +01:00
David Baker
587a86441f
This may as wel go in createclient
2016-07-25 16:20:03 +01:00
wmwragg
8b8486a8d0
Move from +99 to 99+ for more than 99 messages
2016-07-25 14:39:15 +01:00
wmwragg
a69107f4f1
Trying to get the context menu dohicky to stick when menu open
2016-07-25 10:58:43 +01:00
Aviral Dasgupta
b7555f49ea
Merge branch 'develop' into feature-composer-emoji
2016-07-23 19:15:06 +05:30
Matthew Hodgson
ece575bd00
Merge pull request #363 from matrix-org/dbkr/fix_start_chat
...
Fix 'start chat' button on MemberInfo
2016-07-22 18:36:32 +01:00
wmwragg
c89904bc25
Initial unstyled mentions state notifier context menu
2016-07-22 17:30:31 +01:00
David Baker
b07e50d418
Fix 'start chat' button on MemberInfo
...
this/self fail & related scoping
Fixes https://github.com/vector-im/vector-web/issues/1844
2016-07-22 17:30:25 +01:00
wmwragg
9b318e8f61
Getting the corrct height for the placing the context menu
2016-07-22 16:12:20 +01:00
David Baker
ddbac8c73a
More refactoring of MatrixClientPeg
...
Including getting rid of GuestAccess as it was basically doing nothing apart from remembering if we were a guest which may as well be done in the same place we save/restore everything else
2016-07-22 15:47:47 +01:00
wmwragg
e4dd6c8dbe
Browser tooltip being used instead of the HTML styled one.
2016-07-22 15:15:24 +01:00
wmwragg
6984a55b11
The tooltip now appears even when not collapsed when hover over the avater, to allow the full name to be shown
2016-07-22 14:58:09 +01:00
David Baker
b7e95b3883
Remove other guestAccess arg
2016-07-22 14:00:23 +01:00
wmwragg
ca75d93434
Tweaked the offset for the tooltip so that it is next to the element it is tipping
2016-07-22 11:31:26 +01:00
wmwragg
5d4b03c1f4
Put back clicking on the name to acces the room
2016-07-22 11:28:11 +01:00
wmwragg
3dd83922f1
Tooltip positioning tweaked
2016-07-22 11:12:11 +01:00
David Baker
7f31bdb6e3
Merge pull request #362 from matrix-org/rav/bump_dep_versions
...
Bump dependency versions
2016-07-22 10:53:50 +01:00
Richard van der Hoff
e3cdeed32b
Bump to react 15.2.1
...
This should also stop npm complaining about invalid peerDependencies.
2016-07-22 10:43:50 +01:00
Richard van der Hoff
ad7f8d0a58
Bump to latest react-gemini-scrollbar
...
I've updated our forks of the gemini-scrollbar project to latest upstream.
2016-07-22 10:12:37 +01:00
wmwragg
922bb0f402
+99 badge when notifications are greater the 99
2016-07-21 18:50:07 +01:00
wmwragg
762873350a
Badge dohickey shown on name hover and badge hover
2016-07-21 18:20:12 +01:00
David Baker
ea5e021d8d
Refactor MatrixClientPeg
...
Should be functionally identical
2016-07-21 17:57:55 +01:00
wmwragg
4013ea75d0
Testing out the context menu
2016-07-21 17:44:31 +01:00
Richard van der Hoff
9565eef84d
Merge pull request #360 from matrix-org/dbkr/fix_tabcomplete_order_again
...
Fix tab complete order properly
2016-07-21 16:35:27 +01:00
David Baker
0b0f10ddf6
Fix tab complete order properly
...
Don't return NaN from your sort functions...
2016-07-21 16:25:51 +01:00
wmwragg
775fc97102
Slight refactor to better match current code
2016-07-21 14:33:54 +01:00
Richard van der Hoff
8d2ac5dd5b
Merge pull request #359 from matrix-org/dbkr/remove_account_data_listener
...
Add removeListener for account data listener
2016-07-21 14:02:22 +01:00
David Baker
030652f289
Add removeLisatener for account data listener
2016-07-21 13:49:31 +01:00
David Baker
46a2c74d71
Merge pull request #358 from matrix-org/rav/device_id_for_register
...
Set the device_id on pre-login MatrixClient
2016-07-21 13:15:39 +01:00
Richard van der Hoff
e41df245c3
Set the device_id on pre-login MatrixClient
...
In order that device_id is set when we register a new user (or, for that
matter, when we register as a guest), we need to make sure that device_id is
set on the temporary MatrixClient which is created before the user is logged
in - ie, that created by replaceUsingUrls.
In order to achieve this, I've basically removed the distinction between
replaceUsingAccessToken and replaceUsingUrls. There is a side-effect in that
the temporary MatrixClient now gets an e2e sessionStore, but I don't think that
is a bad thing.
2016-07-20 20:20:10 +01:00
Matthew Hodgson
165b0810cc
remove debug
2016-07-20 18:17:09 +01:00
Matthew Hodgson
bc87fc575b
remove debug
2016-07-20 18:16:54 +01:00
Matthew Hodgson
d6415aceca
handle accountData changes, and errors on toggling URL previews
2016-07-20 18:14:16 +01:00
Matthew Hodgson
9babf3f92f
Merge pull request #357 from matrix-org/wmwragg/mention-state-indicator-round-2
...
Wmwragg/mention state indicator round 2
2016-07-20 18:01:59 +01:00
wmwragg
ffa43ebb96
badge content when hovered is now kerned via the CSS
2016-07-20 17:12:41 +01:00
David Baker
fb964be072
Merge pull request #356 from matrix-org/matthew/disable-url-previews
...
Support for disabling/enabling URL previews per-user, per-room and per-user-per-room
2016-07-20 16:43:08 +01:00
David Baker
02e2ade7d9
Merge pull request #336 from matrix-org/dbkr/add_email_fail_if_in_use
...
Use HS proxy API for requestToken on adding email
2016-07-20 14:05:58 +01:00
David Baker
ae7e51ae17
Merge pull request #337 from matrix-org/dbkr/password_reset_email_not_found
...
Error if email already in use when resetting pw
2016-07-20 14:00:12 +01:00
Richard van der Hoff
3efd805243
Merge pull request #355 from matrix-org/dbkr/fix_massive_video
...
Fix enourmous video bug
2016-07-20 13:42:03 +01:00
wmwragg
33edb1dea9
Made the badge always exist, but if no unread mesasges available then has a different class
2016-07-20 12:47:32 +01:00
Matthew Hodgson
1365f18829
many stupid thinkos and bugfixes; make it work
2016-07-20 12:03:13 +01:00
David Baker
d6df3682f2
Fix enourmous video bug
2016-07-20 11:58:49 +01:00
David Baker
2190dcbe1e
Merge pull request #354 from Half-Shot/develop
...
Add support for sending uploaded content as m.video
2016-07-20 11:15:38 +01:00
David Baker
514bc2cd51
Merge pull request #341 from matrix-org/dbkr/tab_complete_most_recently_spoke
...
Order tab complete by most recently spoke
2016-07-19 18:02:09 +01:00
Will Hunt
4bd2b93f59
Add support for sending uploaded content as m.video
2016-07-19 16:05:15 +01:00
Matthew Hodgson
1ba0ef7369
Merge pull request #350 from matrix-org/wmwragg/spinner-fix
...
Wmwragg/spinner fix
2016-07-19 12:10:31 +01:00
Matthew Hodgson
c1fd2f888f
Merge pull request #352 from matrix-org/wmwragg/mention-state-indicator
...
Now showing three dots when hovering over the badge
2016-07-19 11:12:42 +01:00
David Baker
1a2546c939
Merge pull request #351 from matrix-org/dbkr/fix_directory_unpublish
...
Fix unpublishing room in room settings
2016-07-18 16:28:39 +01:00
