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

Phase 3 controller merging #425

Merged
merged 15 commits into from
Nov 27, 2015
Merged

Phase 3 controller merging #425

merged 15 commits into from
Nov 27, 2015

Commits on Nov 26, 2015

  1. Move and merge Change* components to React SDK. Update references.

    @kegsay
    kegsay committed Nov 26, 2015
    Configuration menu
    Copy the full SHA
    fdad007 View commit details
    Browse the repository at this point in the history

  2. Move and merge ProgressBar

    @kegsay
    kegsay committed Nov 26, 2015
    Configuration menu
    Copy the full SHA
    7595071 View commit details
    Browse the repository at this point in the history

  3. Move and merge MessageComposer

    @kegsay
    kegsay committed Nov 26, 2015
    Configuration menu
    Copy the full SHA
    6dea8e7 View commit details
    Browse the repository at this point in the history

  4. Move and merge UserSelector

    @kegsay
    kegsay committed Nov 26, 2015
    Configuration menu
    Copy the full SHA
    1a6afc2 View commit details
    Browse the repository at this point in the history

  5. Move and merge MemberInfo to React SDK

    @kegsay
    kegsay committed Nov 26, 2015
    Configuration menu
    Copy the full SHA
    3ce2962 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2015

  1. Merge and move RoomHeader/RoomSettings into React SDK

    @kegsay
    kegsay committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    b007edc View commit details
    Browse the repository at this point in the history

  2. Move and merge RoomTile/MemberTile to react SDK. Keep DND stuff in ve… 

    …ctor as RoomDNDView.
    @kegsay
    kegsay committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    f969ccb View commit details
    Browse the repository at this point in the history

  3. Move all Event/Message Tiles to React SDK.

    @kegsay
    kegsay committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    40b974f View commit details
    Browse the repository at this point in the history

  4. Move HtmlUtils to react SDK

    @kegsay
    kegsay committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    a5d00c7 View commit details
    Browse the repository at this point in the history

  5. Move velocity stuff to react sdk

    @kegsay
    kegsay committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    05c9b44 View commit details
    Browse the repository at this point in the history

  6. Move ContextualMenu to React SDK

    @kegsay
    kegsay committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    df86e85 View commit details
    Browse the repository at this point in the history

  7. Remove unusued imports

    @kegsay
    kegsay committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    af30ef1 View commit details
    Browse the repository at this point in the history

  8. Use the right name

    @kegsay
    kegsay committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    0ef7c8d View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into kegan/controller-merging3

    @kegsay
    kegsay committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    cd216e2 View commit details
    Browse the repository at this point in the history

  10. Remove unused files

    @kegsay
    kegsay committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    07001ae View commit details
    Browse the repository at this point in the history