PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
4038 commits 1 branch 0 tags 338 MiB
Commit graph

4038 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
ff9c40472a Revert "Merge pull request #822 from t3chguy/BaseDialog_restore_focus" 
This reverts commit 0ac836919d, reversing
changes made to 7e07ffd55f.
 2017-05-16 14:50:29 +01:00
David Baker
19dcd83aeb Revert "Merge pull request #841 from matrix-org/luke/fix-double-dialogs" 
This reverts commit 1913a32fbd, reversing
changes made to 0c16298c45.
 2017-05-16 14:50:19 +01:00
David Baker
387529d130 Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2" 
This reverts commit 3366d3bbae, reversing
changes made to ceb71a4ef6.
 2017-05-16 14:49:55 +01:00
David Baker
d06bd3cf9d Revert "Fix Create Room button" 
This reverts commit 9cae667c06.
 2017-05-16 14:30:02 +01:00
David Baker
f8d1a6d240 Revert "Fix 'start chat' button" 
This reverts commit c841eb641b.
 2017-05-16 14:26:46 +01:00
David Baker
6bd7af2917 Revert "Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1" 
This reverts commit 3549ff2543, reversing
changes made to 1db677141e.
 2017-05-16 14:00:09 +01:00
Matthew Hodgson
c15a67a8d8 Merge pull request #887 from matrix-org/t3chguy/guests_cant_filter 
tell guests they can't use filepanel until they register
 2017-05-15 19:45:49 +01:00
Richard van der Hoff
824da83ecd Merge pull request #888 from matrix-org/luke/reskindex-cache-filenames 
Prevent reskindex -w from running when file names have not changed
 2017-05-15 11:39:43 +01:00
Michael Telatynski
8715b5233c link to #/register 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-15 10:31:17 +01:00
Luke Barnard
15201d86aa Prevent reskindex -w from running when file names have not changed 2017-05-15 10:16:47 +01:00
Michael Telatynski
83cb1e6e29 tell guests they can't use filepanel until they register 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-15 10:15:35 +01:00
Matthew Hodgson
317e24852d explicitly label email & phone add sections; fixes https://github.com/vector-im/riot-web/issues/3531 2017-05-15 03:03:17 +01:00
Matthew Hodgson
486301cffb remove dodgy heuristics for hiding dates on RRs and use DateUtils instead. 
reverts 5d99d68a64
fixes https://github.com/vector-im/riot-web/issues/3523
 2017-05-15 02:55:07 +01:00
Matthew Hodgson
6879f7ee6f add presence to MemberInfo, fixes https://github.com/vector-im/riot-web/issues/3720 2017-05-15 02:43:23 +01:00
Matthew Hodgson
5c0c49e1f6 ignore voip answer/hangup in unread events - fixes https://github.com/vector-im/riot-web/issues/3827 2017-05-15 02:18:18 +01:00
Matthew Hodgson
82092dc2d8 onClick MELS avatars = expand MELS; fixes https://github.com/vector-im/riot-web/issues/3899 2017-05-15 02:15:00 +01:00
Matthew Hodgson
7d8c104cb8 Merge pull request #884 from matrix-org/t3chguy/tiny_usersettings_fixes 
I broke UserSettings for webpack-dev-server
 2017-05-15 01:57:45 +01:00
Matthew Hodgson
7f78e737eb Merge pull request #880 from matrix-org/t3chguy/fixRoomHeaderPreviewing 
various fixes to RoomHeader
 2017-05-15 01:52:42 +01:00
Matthew Hodgson
24d09d8f5b Merge pull request #885 from matrix-org/t3chguy/rte_emote_weirdness 
remove /me whether or not it has a space after it
 2017-05-15 01:50:53 +01:00
Matthew Hodgson
48864b0880 fix visibility of topbar close on dark theme, fixing https://github.com/vector-im/riot-web/issues/3783 2017-05-15 01:39:57 +01:00
Matthew Hodgson
c5f2b69e48 add alt attributes to e2e icons on msgs; fixes https://github.com/vector-im/riot-web/issues/3786 2017-05-15 01:37:24 +01:00
Matthew Hodgson
c0cead1546 workaround for https://github.com/vector-im/riot-web/issues/3633. 
unsure our vector url match could ever return undefined, but apparently it is...
 2017-05-15 01:32:37 +01:00
Matthew Hodgson
f3274426db revert f999aa9 and support full date formats when desired 2017-05-15 00:25:20 +01:00
Matthew Hodgson
38cb123506 Merge pull request #883 from matrix-org/t3chguy/file_panel_fixes 
show error if we can't set a filter because no room
 2017-05-15 00:19:45 +01:00
Michael Telatynski
d7c88a9813 only removed /me , remove anyway to fix vector-im/riot-web#3733 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 15:20:31 +01:00
Michael Telatynski
6ec799a028 I broke UserSettings for webpack-dev-server 
where version file doesn't exist, version starts as null
then gets set to undefined by the promise
this wasn't handled and now undefined is understood to be unknown
rather than null

also picked up on a small casing error
threePids vs threepids, most things using the latter apart from the init

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 15:04:20 +01:00
Michael Telatynski
29568feb95 show error if we can't set a filter 
this way it still works for a room we've been in before

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 22:38:57 +01:00
Michael Telatynski
60b13d76a5 conform to Luke's other comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 21:20:56 +01:00
Michael Telatynski
822f2f10f2 conform to Luke's comment 
https://github.com/matrix-org/matrix-react-sdk/pull/880#discussion_r116257726

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 21:16:55 +01:00
Michael Telatynski
69d860e982 revert name overengineering, undefined onClick should be fine on div 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-12 21:06:36 +01:00
Michael Telatynski
5e4467adce hide settings/search appropriately 
pass inRoom prop to RoomHeader (defaults to false)
remove default onSettingsClick, handle if it is passed EVERYWHERE

if onSettingsClick is passes, show that button
show search button only if we are in the room, seems to fail otherwise
this seems to handle all cases I could throw at it. Give it your best

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 17:35:06 +01:00
Michael Telatynski
f55b27f432 looks like it is passed and accessed like a string 
so unless I'm going insane, it should be a string.

fixes
```
rageshake.js:61 Warning: Failed prop type: The prop `onClick` is marked as required in `AccessibleButton`, but its value is `undefined`.
    in AccessibleButton (created by RoomHeader)
    in RoomHeader (created by RoomView)
    in div (created by RoomView)
    in RoomView (created by LoggedInView)
    in main (created by LoggedInView)
    in div (created by LoggedInView)
    in div (created by LoggedInView)
    in LoggedInView (created by MatrixChat)
    in MatrixChat
```

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 17:32:23 +01:00
Luke Barnard
2437eb7910 Merge pull request #874 from matrix-org/luke/fix-rm-not-updating 
Fix RM not updating if RR event unpaginated
 2017-05-11 15:54:49 +01:00
Luke Barnard
852e1eb720 Rename some variables 
`ReadUpTo` -> `RR`
`ReadReceipt` -> `RR`
`ReadMarker` -> `RM`
 2017-05-11 09:31:59 +01:00
Luke Barnard
3815ad6cd0 Sent -> Event 2017-05-11 09:20:34 +01:00
Luke Barnard
8a76c0c142 Merge pull request #878 from matrix-org/t3chguy/wording-1 
change roomsettings wording
 2017-05-10 15:27:05 +01:00
Michael Telatynski
50092a0f1f fixes vector-im/riot-web#3881 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-10 15:16:49 +01:00
Luke Barnard
856ef58d46 fix commen 2017-05-10 14:55:58 +01:00
Luke Barnard
fe8ea4ffe7 Rename vars, linting 2017-05-10 14:51:47 +01:00
Luke Barnard
30e183a7f1 Only send RR if we should 2017-05-10 14:48:01 +01:00
Luke Barnard
7f766d89c3 Rename variables, more comments 2017-05-10 14:42:06 +01:00
Luke Barnard
a05567c378 Merge pull request #875 from matrix-org/t3chguy/871-windows-compat 
make reskindex windows friendly
 2017-05-09 17:40:14 +01:00
Luke Barnard
ca79d9bb6e Separate predicates for RM/RR 
Instead of modifying the condition for updating the RR, separate the RM and RR conditions and use an OR to decide when to set both.

Make some logs only log when DEBUG.
 2017-05-09 17:36:19 +01:00
Michael Telatynski
fdf48def00 make reskindex windows friendly 
makes #871 windows friendly
 2017-05-09 17:13:27 +01:00
Luke Barnard
3549ff2543 Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1 
Fixes 2 issues with Dialog closing
 2017-05-09 11:36:35 +01:00
Michael Telatynski
f02e659fb7 Consume key{up,down,pressed} events 
so they don't trigger other things bubbling up
until Modal is closed
 2017-05-09 11:27:06 +01:00
Luke Barnard
ac25fd6d87 Remove log 2017-05-09 10:16:37 +01:00
Luke Barnard
488fa3745b Fix RM not updating if RR event unpaginated 
If the RR event has been unpaginated, the logic in `sendReadReceipt` will now fallback on the event ID of the RM which in theory is always =< RR event ID stream-wise.
 2017-05-09 10:03:40 +01:00
Luke Barnard
1db677141e Merge pull request #871 from matrix-org/luke/fix-auto-reskindex 
Automatic Reskindex
 2017-05-09 09:36:32 +01:00
David Baker
e5b1e4ce6d Merge pull request #873 from matrix-org/dbkr/room_name_in_leave_confirm 
Put room name in 'leave room' confirmation dialog
 2017-05-08 17:02:53 +01:00