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

Commits on Feb 7, 2020

  1. Get rid of dependence on usercontent.riot.im

    @t3chguy
    t3chguy committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    98773df View commit details
    Browse the repository at this point in the history

  2. revert modernizr change

    @t3chguy
    t3chguy committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    d39d89d View commit details
    Browse the repository at this point in the history

  3. revert webpack changes

    @t3chguy
    t3chguy committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    0c62db3 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2020

  1. Merge branches 'develop' and 't3chguy/usercontent' of github.com:vect… 

    …or-im/riot-web into t3chguy/usercontent
    @t3chguy
    t3chguy committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    2645e6f View commit details
    Browse the repository at this point in the history

  2. Update comments and such 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    b7ed7a1 View commit details
    Browse the repository at this point in the history

  3. update README 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    22d0d10 View commit details
    Browse the repository at this point in the history

  4. Move bulk to react-sdk and reference it from riot-web land 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    7664eb2 View commit details
    Browse the repository at this point in the history

  5. update webpack paths 

    Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
    @t3chguy
    t3chguy committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    56f9149 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2020

  1. Merge branches 'develop' and 't3chguy/usercontent' of github.com:vect… 

    …or-im/riot-web into t3chguy/usercontent

� Conflicts:
�	README.md
    @t3chguy
    t3chguy committed Feb 19, 2020
    Configuration menu
    Copy the full SHA
    44ec819 View commit details
    Browse the repository at this point in the history