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

Settings #495

Merged
merged 7 commits into from
Aug 18, 2015
Merged

Settings #495

merged 7 commits into from
Aug 18, 2015

Commits on Aug 18, 2015

  1. Using settings that are already loaded into startup

    @marceloschmidt
    marceloschmidt committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    54390ff View commit details
    Browse the repository at this point in the history

  2. 1st attempt on keeping message history

    @marceloschmidt
    marceloschmidt committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    e677742 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'settings' into settings-keep-history

    @marceloschmidt
    marceloschmidt committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    6e38b1b View commit details
    Browse the repository at this point in the history

  4. Keep history

    @marceloschmidt
    marceloschmidt committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    8dcddde View commit details
    Browse the repository at this point in the history

  5. Enable edit and delete messages based on settings

    @marceloschmidt
    marceloschmidt committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    eb6d49a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into settings-keep-history 

    Conflicts:
	client/views/main.coffee
    @marceloschmidt
    marceloschmidt committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    753b70c View commit details
    Browse the repository at this point in the history

  7. Undo rocketchat-external changes

    @marceloschmidt
    marceloschmidt committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    eacc78e View commit details
    Browse the repository at this point in the history