mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 03:31:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
2025 commits 219 branches 562 tags 474 MiB
Commit graph

2025 commits

This branch
This branch
All branches
Author SHA1 Message Date
wmwragg
3df746ef14 Revert merge up from develop 2016-07-27 14:16:17 +01:00
David Baker
3308842121 Fix up reskindex.js path 
Since npm does not put our *own* 'binaries' on the path, we need to use the full path to it
 2016-07-27 13:28:23 +01:00
wmwragg
6d141d1a7b Only allow none guests to access the context menu 2016-07-27 11:58:40 +01:00
Richard van der Hoff
1a600b0674 Stop the Avatar classes setting properties on <span>s 
React apparently now checks the properties which are set on DOM elements, and
grumbles noisily about unexpected ones. Update BaseAvatar and RoomAvatar so
that they don't set unrelated properties on the DOM elements.
 2016-07-27 11:38:04 +01:00
Richard van der Hoff
c8df9148b3 Remove relayoutOnUpdate prop on gemini-scrollbar 
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
 2016-07-27 11:35:48 +01:00
wmwragg
4b26ac58af Re-modularised the context menus 2016-07-27 10:41:24 +01:00
wmwragg
dca4702b7b Fixed a bug where the contextual menu was being incorrectly positioned when zoom in on the webpage 2016-07-27 09:51:50 +01:00
Richard van der Hoff
4d1afd70da Merge pull request #364 from matrix-org/dbkr/fix_vector_power_level_freeze 
Fix bug where vector freezes on power level event
 2016-07-26 18:20:15 +01:00
David Baker
09993cd3bc Add comment back 2016-07-26 18:19:25 +01:00
David Baker
31399254b6 Fix onRoomStateMember debouncing 
Don't have debounced functions take arsg, because they won't be the same for each invocation.
 2016-07-26 18:15:26 +01:00
David Baker
4ecf5f6372 Fix bug where vector freezes on power level event 
Make rate_limited_function accept functions with args so we can just ratelimit the event handler & be done with it.

Fixes https://github.com/vector-im/vector-web/issues/1877
 2016-07-26 17:58:19 +01:00
wmwragg
0eb15085e9 some code tidyup 2016-07-26 17:25:16 +01:00
wmwragg
477a17b49f Removed debug statement 2016-07-26 10:39:34 +01:00
wmwragg
8f3e93214c Drawing cheveron with CSS so it can be styled 2016-07-25 18:02:30 +01:00
wmwragg
9c9c5ec458 Menu context dohickey now sticks when menu shown 2016-07-25 17:18:45 +01:00
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
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