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
6c19504c8b
Merge branch 'wmwragg/mention-state-indicator-round-3' into wmwragg/mention-state-menu
...
# resolved Conflicts:
# src/skins/vector/css/vector-web/views/rooms/RoomTooltip.css
2016-07-25 16:45:25 +01:00
4b763997df
Merge pull request #361 from matrix-org/dbkr/refactor_matrixclientpeg
...
Refactor MatrixClientPeg
2016-07-25 16:36:47 +01:00
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
587a86441f
This may as wel go in createclient
2016-07-25 16:20:03 +01:00
8b8486a8d0
Move from +99 to 99+ for more than 99 messages
2016-07-25 14:39:15 +01:00
497ebce88a
Corrected vertical alignment of membership button
2016-07-25 13:16:51 +01:00
a69107f4f1
Trying to get the context menu dohicky to stick when menu open
2016-07-25 10:58:43 +01:00
b7555f49ea
Merge branch 'develop' into feature-composer-emoji
2016-07-23 19:15:06 +05:30
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
c89904bc25
Initial unstyled mentions state notifier context menu
2016-07-22 17:30:31 +01:00
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
2768cd2010
Initial unstyled mentions state notifier context menu
2016-07-22 17:30:09 +01:00
9b318e8f61
Getting the corrct height for the placing the context menu
2016-07-22 16:12:20 +01:00
204e42494a
The default props doesn't seem to be working, hardcoded 'LABEL' for now. OnClick closes menu
2016-07-22 16:11:42 +01:00
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
e4dd6c8dbe
Browser tooltip being used instead of the HTML styled one.
2016-07-22 15:15:24 +01:00
72b4a86eed
Tweaked the tooltip to be better aligned. Also added the fading of the room name if too long
2016-07-22 14:59:02 +01:00
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
b7e95b3883
Remove other guestAccess arg
2016-07-22 14:00:23 +01:00
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
ce5311191f
Tweaked tooltip z-index
2016-07-22 11:30:41 +01:00
5d4b03c1f4
Put back clicking on the name to acces the room
2016-07-22 11:28:11 +01:00
7eff6d968e
Tweak to z-index as the tooltip was occasionally getting occluded.
2016-07-22 11:16:04 +01:00
3dd83922f1
Tooltip positioning tweaked
2016-07-22 11:12:11 +01:00
d01e2506f5
Merge pull request #1842 from vector-im/rav/bump_dependency_versions
...
Bump dependency versions
2016-07-22 10:53:55 +01:00
7f31bdb6e3
Merge pull request #362 from matrix-org/rav/bump_dep_versions
...
Bump dependency versions
2016-07-22 10:53:50 +01:00
53fe372a0c
Bump to react 15.2.1
...
This should also stop npm complaining about invalid peerDependencies.
2016-07-22 10:47:09 +01:00
4cb04d1e40
Bump to latest react-gemini-scrollbar
...
I've updated our forks of the gemini-scrollbar project to latest upstream.
2016-07-22 10:46:38 +01:00
e3cdeed32b
Bump to react 15.2.1
...
This should also stop npm complaining about invalid peerDependencies.
2016-07-22 10:43:50 +01:00
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
922bb0f402
+99 badge when notifications are greater the 99
2016-07-21 18:50:07 +01:00
762873350a
Badge dohickey shown on name hover and badge hover
2016-07-21 18:20:12 +01:00
24e021b91f
Badge dohickey shown on name hover and badge hover
2016-07-21 18:19:52 +01:00
ea5e021d8d
Refactor MatrixClientPeg
...
Should be functionally identical
2016-07-21 17:57:55 +01:00
e988f5ca3b
Badge visual tweaks
2016-07-21 17:54:33 +01:00
4013ea75d0
Testing out the context menu
2016-07-21 17:44:31 +01:00
633a3f4867
New component for testing
2016-07-21 17:44:05 +01:00
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
0b0f10ddf6
Fix tab complete order properly
...
Don't return NaN from your sort functions...
2016-07-21 16:25:51 +01:00
775fc97102
Slight refactor to better match current code
2016-07-21 14:33:54 +01:00
df163d8cb7
Clean up of the CSS, and refactor to better match current code
2016-07-21 14:33:27 +01:00
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
030652f289
Add removeLisatener for account data listener
2016-07-21 13:49:31 +01:00
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
73bb317925
Slight tweak to the name padding so there is a little less space above and below the name
2016-07-21 12:19:11 +01:00
ad74d264a3
Selected room highlight teaked to better fit previous design
2016-07-21 11:37:40 +01:00
e9db975d7d
Redone assets, with lighter weight to match design
2016-07-21 10:25:42 +01:00
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
165b0810cc
remove debug
2016-07-20 18:17:09 +01:00
wmwragg
David Baker
David Baker
Aviral Dasgupta
Matthew Hodgson
Richard van der Hoff
Richard van der Hoff
Matthew Hodgson