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

User administration; Statistics #530

Merged
merged 11 commits into from
Aug 21, 2015
Merged

User administration; Statistics #530

merged 11 commits into from
Aug 21, 2015

Commits on Aug 20, 2015

  1. Changes to user administration

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

  2. Button to make or remove user as admin

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

  3. Merge branch 'master' into administration

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

  4. User administration: edit user; set user as admin;

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

  5. Translations

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

  6. Merge branch 'master' into administration

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

  7. Manually approve new registrations (default: false)

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

Commits on Aug 21, 2015

  1. Statistics and Average Statistics

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

  2. Merge branch 'master' into statistics 

    Conflicts:
	server/lib/collections.coffee
    @marceloschmidt
    marceloschmidt committed Aug 21, 2015
    Configuration menu
    Copy the full SHA
    594a40d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into administration

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

  4. Merge branch 'statistics' into administration

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