Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Get rid of dependence on usercontent.riot.im #12292

Merged
merged 9 commits into from
Feb 19, 2020
Merged

Get rid of dependence on usercontent.riot.im #12292

merged 9 commits into from
Feb 19, 2020

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Feb 7, 2020 •
edited
Loading

@t3chguy t3chguy mentioned this pull request Feb 7, 2020
Merged
@jryans
Copy link
Collaborator

jryans commented Feb 7, 2020

Please also clean up README.md and config.md which mention this.

@t3chguy
Merge branches 'develop' and 't3chguy/usercontent' of github.com:vect…
2645e6f 
…or-im/riot-web into t3chguy/usercontent
@t3chguy
Update comments and such
b7ed7a1 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
update README
22d0d10 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy t3chguy marked this pull request as ready for review February 13, 2020 16:55
@t3chguy
Move bulk to react-sdk and reference it from riot-web land
7664eb2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
update webpack paths
56f9149 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
Copy link
Member Author

t3chguy commented Feb 13, 2020

image

origin=null :D

@t3chguy t3chguy requested a review from a team February 13, 2020 17:03
@dbkr dbkr requested review from dbkr and removed request for a team February 17, 2020 11:25
dbkr
dbkr approved these changes Feb 17, 2020
View reviewed changes
Copy link
Member

@dbkr dbkr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left some comments over in the react-sdk pr

@t3chguy
Merge branches 'develop' and 't3chguy/usercontent' of github.com:vect…
44ec819 
…or-im/riot-web into t3chguy/usercontent

� Conflicts:
�	README.md
@t3chguy t3chguy merged commit 2c572bb into develop Feb 19, 2020
stoically added a commit to stoically/radical that referenced this pull request Mar 2, 2020
@stoically
fix: usercontent injection behavior changed
fb25335 
See: element-hq/element-web#12292
@t3chguy t3chguy deleted the t3chguy/usercontent branch February 16, 2021 18:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbkr dbkr dbkr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Replace cross origin renderer (usercontent.riot.im) with something better
3 participants
@t3chguy @jryans @dbkr