OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
20,459 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

128 Commits (0ef362a79317c2a1dc77f987816b6fddef32e4c7)

Author SHA1 Message Date
Travis Ralston d763d7e633 Merge branch 'develop' into travis/ftue/user-lists/5.2-i18n 2020-01-15 10:49:38 -07:00
Travis Ralston b69b284efa Humanize the recent DM rooms ourselves for translations 2020-01-13 21:20:01 -07:00
Travis Ralston 5fd27a10bb Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:19:41 -07:00
RiotRobot 389e1194ff Merge branch 'master' into develop 2020-01-13 13:09:56 +00:00
RiotRobot 9a3ca28978 js-sdk 3.0.0 2020-01-13 13:01:36 +00:00
Travis Ralston d7dd67f69e Remove subtly irrelevant package 2020-01-09 17:28:32 -07:00
Travis Ralston 0e8af15b9c Add webcrypto dep back 
Probably accidentally merge-conflicted out
 2020-01-09 17:15:13 -07:00
Travis Ralston 23eb6cbeb3 Upgrade Jest and babel-jest to match js-sdk 
This also magically gets rid of a ton of errors
 2020-01-09 16:17:27 -07:00
Travis Ralston a8c8406ac4 Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps 2020-01-09 16:06:46 -07:00
Travis Ralston a6376461d0 Use yarn's updated lockfile 
Didn't manually handle this conflict, just let yarn do its thing.
 2020-01-09 14:19:19 -07:00
Travis Ralston fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Michael Telatynski f3f929207c Update yarn.lock 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-09 12:18:14 +00:00
Travis Ralston 1d9d706b9c
Merge pull request #3789 from matrix-org/t3chguy/render_html_entities_in_og-description 
Render encoded html entities in og:description
 2020-01-08 21:38:31 -07:00
RiotRobot 6b8f6239c5 js-sdk 3.0.0-rc.1 2020-01-06 13:58:43 +00:00
RiotRobot 93c4439045 js-sdk rc.1 2020-01-06 13:30:56 +00:00
Michael Telatynski d31c863563 Remove all usages of slate in favour of CIDER 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:15:48 +00:00
Michael Telatynski 4bea87f00d Merge branches 'develop' and 't3chguy/render_html_entities_in_og-description' of github.com:matrix-org/matrix-react-sdk into t3chguy/render_html_entities_in_og-description 
 Conflicts:
	package.json
 2020-01-05 22:23:03 +00:00
Michael Telatynski 378a82e6fb Use html-entities instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 22:22:09 +00:00
Travis Ralston 4de0f7257a Initial implementation of FTUE user lists design 
This covers the "recents" section and rough design exclusively. It is known that the Field does nothing and that there's a bunch of missing functionality - this is to be iterated upon in future PRs. Labs flag is to aide development and should be removed in a very near future PR.

Also, this is focusing on DMs and not user lists in general because I misinterpreted the scope. I'll fix this in a future PR and instead make this the best DM invite dialog it can be.

Closes https://github.com/vector-im/riot-web/issues/11197
 2020-01-02 17:40:18 -07:00
Travis Ralston 23e5333935 Introduce babel's export-default-from plugin to fix build errors 
We do a lot of default exporting, so we kinda need this. It even asks for it to be installed when it is missing.
 2019-12-22 21:36:56 -07:00
Michael Telatynski 4fe0150944 Regen yarn.lock 2019-12-19 10:51:55 +00:00
Michael Telatynski 4a2217bb79 Regenerate yarn.lock 2019-12-16 12:23:21 +00:00
Travis Ralston 20a615396b Implementation of new potential skinning mechanism 
With a switch to Only One Webpack™ we need a way to help developers generate the component index without a concurrent watch task. The best way to do this is to have developers import their components, but how do they do that when we support skins? The answer in this commit is to change skinning.

Skinning now expects to receive your list of overrides instead of the react-sdk+branded components. For Riot this means we send over *only* the Vector components and not Vector+react-sdk. 

Components can then be annotated with the `replaceComponent` decorator to have them be skinnable. The decorator must take a string with the dot path of the component because we can't reliably calculate it ourselves, sadly. 

The decorator does a call to `getComponent` which is where the important part of the branded components not including the react-sdk is important: if the branded app includes the react-sdk then the decorator gets executed before the skin has finished loading, leading to all kinds of fun errors. This is also why the skinner lazily loads the react-sdk components to avoid importing them too early, breaking the app.

The decorator will end up receiving null for a component because of the getComponent loop mentioned: the require() call is still in progress when the decorator is called, therefore we can't error out. All usages of getComponent() within the app are safe to not need such an error (the return won't be null, and developers shouldn't use getComponent() after this commit anyways).

The AuthPage, being a prominent component, has been converted to demonstrate this working. Changes to riot-web are required to have this work.

The reskindex script has also been altered to reflect these skinning changes - it no longer should set the react-sdk as a parent. The eventual end goal is to get rid of `getComponent()` entirely as it'll be easily replaced by imports.
 2019-12-12 19:48:45 -07:00
Travis Ralston ff584d1644 yarn.lock changes for upgrade 2019-12-12 14:38:12 -07:00
J. Ryan Stinnett 108293dcba Flip back to develop 2019-12-11 10:39:04 +00:00
Michael Telatynski 4be8b87869 Add what-input to allow different scoping to focus-visible for MessageActionBar keyboard a11y 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-07 13:07:52 +00:00
David Baker 5b64c1c6e7 yarn upgrade 2019-12-04 14:22:00 +00:00
J. Ryan Stinnett 54d6b6aa73 Flip JS SDK back to develop 2019-11-27 13:31:44 +00:00
RiotRobot 6223ca8243 Merge branch 'master' into develop 2019-11-27 10:39:33 +00:00
RiotRobot d9e322bbca Upgrade to JS SDK 2.4.5 2019-11-27 10:32:21 +00:00
RiotRobot a6fdd5e5dd Merge branch 'master' into develop 2019-11-25 13:35:30 +00:00
RiotRobot 942db34e92 released js-sdk 2019-11-25 13:27:15 +00:00
Michael Telatynski d3f872bf7a Merge branches 'develop' and 't3chguy/remove_bluebird' of github.com:matrix-org/matrix-react-sdk into t3chguy/remove_bluebird 2019-11-21 11:15:32 +00:00
Michael Telatynski fccf9f138e Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-20 22:32:11 +00:00
RiotRobot 966f84115d js-sdk rc.1 2019-11-20 18:26:29 +00:00
Michael Telatynski d4d51dc61f Rip out the remainder of Bluebird 2019-11-18 10:03:05 +00:00
Travis Ralston 6d0b388fa2
Merge branch 'develop' into travis/mjolnir 2019-11-12 10:00:01 -07:00
Travis Ralston bdcf3890a5 Fix HTML fallback in replies 
Correctly encode the `body` to avoid problems down the line. We also convert newlines to `<br/>` to better represent the message as a fallback.

Fixes https://github.com/vector-im/riot-web/issues/9413
 2019-11-08 16:07:11 -07:00
RiotRobot aba557f023 Released react-sdk 2019-11-04 15:09:19 +00:00
Travis Ralston e6e12df82d Add structural base for handling Mjolnir lists 2019-10-31 13:20:18 -06:00
RiotRobot 8dfa464202 js-sdk rc.1 2019-10-30 16:44:18 +00:00
Michael Telatynski c5d5cd72bc
Merge pull request #3465 from matrix-org/t3chguy/nvl/userinfo 
UserInfo consolidation of GroupMemberInfo and MemberInfo panels
 2019-10-21 15:50:08 +01:00
Michael Telatynski 0e6359ab24 replace @use-it/event-listener as it doesn't like Node EE's 2019-10-19 16:39:06 +01:00
J. Ryan Stinnett 5333201823 Change back to develop branch for deps 2019-10-18 16:12:20 +01:00
RiotRobot d05ef40694 Merge branch 'master' into develop 2019-10-18 14:49:40 +01:00
RiotRobot 21bb1dc837 Upgrade to JS SDK v2.4.2 2019-10-18 14:43:08 +01:00
RiotRobot bd7e909699 js-sdk rc.1 2019-10-09 16:54:05 +01:00
Michael Telatynski aae5bb9f39 Use new React Shallow renderer with hooks support 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-09 13:08:16 +02:00
Michael Telatynski efeb6e87c4 Use new React Shallow renderer with hooks support 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-09 12:51:08 +02:00
Michael Telatynski df02eb8e92 Add UserInfo panel (consolidation of MemberInfo & GroupMemberInfo) Labs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-07 16:52:50 +01:00