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
f3274426db
revert f999aa9 and support full date formats when desired
2017-05-15 00:25:20 +01:00
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
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
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
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
60b13d76a5
conform to Luke's other comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-12 21:20:56 +01:00
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
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
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
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
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
852e1eb720
Rename some variables
...
`ReadUpTo` -> `RR`
`ReadReceipt` -> `RR`
`ReadMarker` -> `RM`
2017-05-11 09:31:59 +01:00
3815ad6cd0
Sent -> Event
2017-05-11 09:20:34 +01:00
8a76c0c142
Merge pull request #878 from matrix-org/t3chguy/wording-1
...
change roomsettings wording
2017-05-10 15:27:05 +01:00
50092a0f1f
fixes vector-im/riot-web#3881
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-10 15:16:49 +01:00
856ef58d46
fix commen
2017-05-10 14:55:58 +01:00
fe8ea4ffe7
Rename vars, linting
2017-05-10 14:51:47 +01:00
30e183a7f1
Only send RR if we should
2017-05-10 14:48:01 +01:00
7f766d89c3
Rename variables, more comments
2017-05-10 14:42:06 +01:00
a05567c378
Merge pull request #875 from matrix-org/t3chguy/871-windows-compat
...
make reskindex windows friendly
2017-05-09 17:40:14 +01:00
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
fdf48def00
make reskindex windows friendly
...
makes #871 windows friendly
2017-05-09 17:13:27 +01:00
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
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
ac25fd6d87
Remove log
2017-05-09 10:16:37 +01:00
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
1db677141e
Merge pull request #871 from matrix-org/luke/fix-auto-reskindex
...
Automatic Reskindex
2017-05-09 09:36:32 +01:00
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
85ed39b9d8
Put room name in 'leave room' confirmation dialog
...
https://github.com/vector-im/riot-web/issues/3850
2017-05-08 16:49:40 +01:00
c01e8e85ac
Merge pull request #872 from matrix-org/dbkr/fix_left_panel
...
Fix this/self fail in LeftPanel
2017-05-08 16:40:17 +01:00
805354bd2c
Revert unintentional change
2017-05-08 16:39:11 +01:00
9af9603373
Only watch indexed files
2017-05-08 16:29:53 +01:00
574c836941
Move chokidar to devDeps
2017-05-08 16:24:13 +01:00
9cae667c06
Fix Create Room button
...
Opened the DM dialog rather than the new room dialog
2017-05-08 16:03:52 +01:00
534f9277d4
Fix this/self fail in LeftPanel
2017-05-08 15:37:40 +01:00
598f5e20c6
Merge pull request #870 from matrix-org/luke/fix-null-url-previews
...
Don't show null URL previews
2017-05-08 15:23:18 +01:00
7d1940620d
Add (watching) reskindex to `npm start`
...
also add reskindex in non-watching mode to `npm run build`
2017-05-08 15:07:58 +01:00
2eaaa97451
Give `reskindex.js` a watch mode (-w)
...
`scripts/reskindex.js -w` will run reskindex in watch mode whereby FS events will cause a reskindex to occur.
This depends on `chokidar`
2017-05-08 15:07:05 +01:00
1addc7e2c5
Update header copyright
2017-05-08 14:56:38 +01:00
ca7989a1fd
.gitignore auto-generated component-index
2017-05-08 14:55:55 +01:00
d1f467ee91
Remove auto-generated component-index
...
This will now be generated as part of the build process (`npm run build`) and whilst developing (`npm run start`).
2017-05-08 14:53:00 +01:00
39323647d1
Don't show null URL previews
...
These are URLs that were spidered by the server without error but yielded an empty response from the server. There's nothing to display, so return an empty div.
2017-05-08 14:01:44 +01:00
11d039477d
Merge pull request #869 from matrix-org/dbkr/addressselector_keys
...
Fix keys for AddressSelector
2017-05-08 12:47:52 +01:00
cafbe14589
Fix keys for AddressSelector
...
Was using a property which just did not exist.
2017-05-08 11:59:06 +01:00
c841eb641b
Fix 'start chat' button
2017-05-08 11:26:25 +01:00
3366d3bbae
Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2
...
Make left panel better for new users (mk II)
2017-05-08 10:37:55 +01:00
bd32df4ef6
comment wording
2017-05-07 20:58:30 +01:00
360f1cd250
completely missed the ESC check
...
I need sleep
2017-05-07 20:57:54 +01:00
78e7272344
Fixes 2 issues with Dialog closing
...
+ Upload Confirmation dialog would just change focus on ESC and not close
+ Keywords Dialog in UserSettings would also close UserSettings because event bubbled up
2017-05-07 20:43:42 +01:00
Matthew Hodgson