Commit Graph

4809 Commits (b2a17fea08acba34ee3de3b444b2d8e9de6ca98d)

Author SHA1 Message Date
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
Luke Barnard 683f1b8a1a Invite the welcome user after registration if configured
This will shift focus to the welcome user DM.

We probably don't want to do this for teams, but I shall leave that for another PR that fixes teams WRT to new-guest-access.
2017-05-12 17:39:38 +01:00
Luke Barnard 2b4c87aca6 Remove useless comment 2017-05-12 16:02:38 +01:00
Luke Barnard 536724e7c5 ES6 SessionStore 2017-05-12 15:58:44 +01:00
Luke Barnard 6ffe7ef9b2 Use same singleton impl as MatrixClientPeg for SessionStore 2017-05-12 15:50:01 +01:00
Luke Barnard 5c8187dc8f Explicitly pass thru userHasGeneratedPassword 2017-05-12 15:47:37 +01:00
Luke Barnard 1176573f39 Implement SessionStore
This wraps session-related state into a basic flux store. The localStorage item 'mx_pass' is the only thing managed by this store for now but it could easily be extended to track other items (like the teamToken which is passed around through props a lot)
2017-05-12 12:02:45 +01:00
Luke Barnard 81806e23bf Merge pull request #879 from matrix-org/luke/rou-set-mxid
Prevent ROUs from creating new chats/new rooms
2017-05-11 17:52:38 +01:00
Luke Barnard 8725ef3863 Remove "Current Password" input if mx_pass exists
If the user is PWLU, do not show "Current Password" field in ChangePassword and when setting a new password, use the cached password.
2017-05-11 17:47:45 +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 cfa108a28c No need to dispatch, just call setMxId 2017-05-11 17:07:03 +01:00
Luke Barnard 6326a95b39 Prevent ROUs from creating new chats/new rooms
Spawn a SetMxIdDialog instead and do nothing.
2017-05-11 17:04:11 +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 5151264f60 Merge branch 'develop' into new-guest-access
Conflicts:
	src/component-index.js
2017-05-11 13:22:30 +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 6ba1d382b0 Merge pull request #877 from matrix-org/luke/new-guest-access-set-mxid-2
Redesign mxID chooser, add availability checking
2017-05-10 18:03:28 +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 6257bfcd87 Add prop type for onDifferentServerClicked 2017-05-10 14:28:48 +01:00
Luke Barnard ad2ed12980 Redesign mxID chooser, add availability checking
Requires https://github.com/matrix-org/matrix-js-sdk/pull/432 for availability checking.

Changes:
 - Redesign the dialog to look more like https://github.com/vector-im/riot-web/issues/3604#issuecomment-299226875
 - Attempt to fix wrong password being stored by generating one per SetMxIdDialog (there's no issue tracking this for now, I shall open one if it persists)
 - Backwards compatible with servers that don't support register/availability - a spinner will appear the first time a username is checked because server support can only be determined after a request.
 - Rate-limited by a 2s debounce
 - General style improvements
2017-05-10 14:22:17 +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
David Baker 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
David Baker 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
David Baker 805354bd2c Revert unintentional change 2017-05-08 16:39:11 +01:00
Luke Barnard 9af9603373 Only watch indexed files 2017-05-08 16:29:53 +01:00
Luke Barnard 574c836941 Move chokidar to devDeps 2017-05-08 16:24:13 +01:00
David Baker 9cae667c06 Fix Create Room button
Opened the DM dialog rather than the new room dialog
2017-05-08 16:03:52 +01:00
David Baker 534f9277d4 Fix this/self fail in LeftPanel 2017-05-08 15:37:40 +01:00
Luke Barnard 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