Commit Graph

62531 Commits

Author SHA1 Message Date
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 5181eb3ea5 Merge pull request #3894 from vector-im/t3chguy/change_release_vector2riot
change vector->riot on the surface
2017-05-15 01:43:57 +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 c3477a30a7 oops, rebuild modernizr to pull in new tests 2017-05-15 01:22:32 +01:00
Matthew Hodgson 8e2e6cee35 require indexeddb & webworkers in modernizr 2017-05-15 01:07:25 +01:00
Matthew Hodgson 25a727b8d8 use full date formats on timestamps - fixes https://github.com/vector-im/riot-web/issues/3874 2017-05-15 00:26:02 +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 aa7728cad3 tidy up tray.js - it made my eyes hurt
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:41:13 +01:00
Michael Telatynski 808240eef9 shouldn't need this try-catch
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:40:17 +01:00
Michael Telatynski 6aae97b812 Update tray tooltip based on document.title
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:39:55 +01:00
Michael Telatynski 8927afca03 re-add electron node modules to gitignore
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:37:27 +01:00
Michael Telatynski bbda658b7f make Electron tray icon mimic the Favico.js one
DRY: moved Favicon stuff into the base platform

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:37:13 +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 67297bf827 Merge pull request #3906 from vector-im/luke/new-guest-access-welcome-user
Add welcomeUserId to sample config
2017-05-12 19:17:33 +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 f60be2d658 Add welcomeUserId to sample config 2017-05-12 16:12:17 +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
Michael Telatynski ea0b166da7 change wording to not confuse users building repo
change default repos to match their current naming

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 17:49:31 +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 f248477f82 stage 0.5 rebrand (rename dist release)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 17:46:08 +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 607ba57f48 Merge branch 'develop' into new-guest-access
Conflicts:
	src/component-index.js
2017-05-11 13:23:31 +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 0e0918d07c Merge pull request #3888 from vector-im/pr/3799
move manifest.json outward so it is scoped properly
2017-05-11 13:20:33 +01:00
Michael Telatynski 3c5594e034 move manifest.json outward so it is scoped properly
this will matter more when we add a service worker

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 13:12:26 +01:00
Luke Barnard 15db686f33 Merge pull request #3799 from t3chguy/manifest
add to manifest
2017-05-11 13:05:00 +01:00
Michael Telatynski ffa53ca205 Update manifest.json 2017-05-11 11:17:55 +01:00
Luke Barnard 4c0e8cd372 Merge pull request #3886 from vector-im/luke/auto-reskindex
Automatically update component-index
2017-05-11 10:47:06 +01:00
Luke Barnard 6d94f35c33 Automatically update component-index
Following changes to the react-sdk, reskindex can now be updated using the "-w" (watch) equivalent of the reskindex script.

-Alter npm scripts so that reskindex is run when building once and so that reskindex:start is runwhen developing
-Remove and stop tracking component-index, this will now only be created at build-time
2017-05-11 10:37:13 +01:00
Luke Barnard ee33490553 Merge pull request #3885 from vector-im/luke/new-guest-access-set-mxid-4
CSS for mxIdDialog redesign
2017-05-11 10:28:23 +01:00
Luke Barnard d2ea162b3f Unmuddle the component-index header 2017-05-11 10:11:30 +01:00
Luke Barnard 2eccdf56b9 Merge branch 'develop' into new-guest-access 2017-05-11 09:50:13 +01:00
Luke Barnard ab24994e37 Move general CSS to more specific so as not to affect other dialogs 2017-05-11 09:42:21 +01:00