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

Move all Docker Parts into docker-rails-dev project #137

Closed
wants to merge 137 commits into from
Closed

Move all Docker Parts into docker-rails-dev project #137

wants to merge 137 commits into from

Commits on Sep 29, 2017

  1. add postgres to docker-compose

    @chaoticbear
    chaoticbear committed Sep 29, 2017
    Configuration menu
    Copy the full SHA
    67331d9 View commit details
    Browse the repository at this point in the history

  2. ignore posgres db directory

    @chaoticbear
    chaoticbear committed Sep 29, 2017
    Configuration menu
    Copy the full SHA
    cfa775c View commit details
    Browse the repository at this point in the history

  3. build path comment for dev of rails image

    @chaoticbear
    chaoticbear committed Sep 29, 2017
    Configuration menu
    Copy the full SHA
    c7e1ba2 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2018

  1. Bump byebug from 9.1.0 to 10.0.0 

    Bumps [byebug](https://github.com/deivid-rodriguez/byebug) from 9.1.0 to 10.0.0.
- [Release notes](https://github.com/deivid-rodriguez/byebug/releases/tag/v10.0.0)
- [Changelog](https://github.com/deivid-rodriguez/byebug/blob/master/CHANGELOG.md)
- [Commits](deivid-rodriguez/byebug@v9.1.0...v10.0.0)
    @dependabot-support
    dependabot-support committed Jan 29, 2018
    Configuration menu
    Copy the full SHA
    6ecacc0 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2018

  1. docker-compose WIP

    @chaoticbear
    chaoticbear committed Feb 2, 2018
    Configuration menu
    Copy the full SHA
    1683592 View commit details
    Browse the repository at this point in the history

  2. moved env variables to .env.local

    @chaoticbear
    chaoticbear committed Feb 2, 2018
    Configuration menu
    Copy the full SHA
    590e418 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:renocollective/member-portal into… 

    … jfleming/docker-compose-setup
    @chaoticbear
    chaoticbear committed Feb 2, 2018
    Configuration menu
    Copy the full SHA
    123030f View commit details
    Browse the repository at this point in the history

  4. fix from previous conflict merge

    @chaoticbear
    chaoticbear committed Feb 2, 2018
    Configuration menu
    Copy the full SHA
    c2cc171 View commit details
    Browse the repository at this point in the history

  5. fixes to docker-compose setup, env file formatting, latest postgres, … 

    …etc.
    @chaoticbear
    chaoticbear committed Feb 2, 2018
    Configuration menu
    Copy the full SHA
    623b206 View commit details
    Browse the repository at this point in the history

  6. Moved all docker related stuff to the member-portal-docker project

    @chaoticbear
    chaoticbear committed Feb 2, 2018
    Configuration menu
    Copy the full SHA
    13b15e9 View commit details
    Browse the repository at this point in the history

  7. docker readme updates

    @chaoticbear
    chaoticbear committed Feb 2, 2018
    Configuration menu
    Copy the full SHA
    85612c5 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2018

  1. Merge pull request renocollective#133 from renocollective/dependabot/… 

    …bundler/byebug-10.0.0

Bump byebug from 9.1.0 to 10.0.0
    @colinloretz
    colinloretz authored Feb 4, 2018
    Configuration menu
    Copy the full SHA
    2411dd9 View commit details
    Browse the repository at this point in the history

  2. Bump uglifier from 3.2.0 to 4.1.5 

    Bumps [uglifier](https://github.com/lautis/uglifier) from 3.2.0 to 4.1.5.
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md)
- [Commits](lautis/uglifier@v3.2.0...v4.1.5)
    @dependabot-support
    dependabot-support committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    9dac55c View commit details
    Browse the repository at this point in the history

  3. Merge pull request renocollective#132 from renocollective/dependabot/… 

    …bundler/uglifier-4.1.5

Bump uglifier from 3.2.0 to 4.1.5
    @colinloretz
    colinloretz authored Feb 4, 2018
    Configuration menu
    Copy the full SHA
    f53bce6 View commit details
    Browse the repository at this point in the history

  4. Bump puma from 3.11.0 to 3.11.2 

    Bumps [puma](https://github.com/puma/puma) from 3.11.0 to 3.11.2.
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](puma/puma@v3.11.0...v3.11.2)
    @dependabot-support
    dependabot-support committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    89d9c87 View commit details
    Browse the repository at this point in the history

  5. Merge pull request renocollective#130 from renocollective/dependabot/… 

    …bundler/puma-3.11.2

Bump puma from 3.11.0 to 3.11.2
    @colinloretz
    colinloretz authored Feb 4, 2018
    Configuration menu
    Copy the full SHA
    ec9895e View commit details
    Browse the repository at this point in the history

  6. Bump license_finder from 4.0.2 to 5.0.0 

    Bumps [license_finder](https://github.com/pivotal/LicenseFinder) from 4.0.2 to 5.0.0.
- [Release notes](https://github.com/pivotal/LicenseFinder/releases/tag/v5.0.0)
- [Changelog](https://github.com/pivotal/LicenseFinder/blob/master/CHANGELOG.md)
- [Commits](pivotal/LicenseFinder@v4.0.2...v5.0.0)
    @dependabot-support
    dependabot-support committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    540b989 View commit details
    Browse the repository at this point in the history

  7. Merge pull request renocollective#128 from renocollective/dependabot/… 

    …bundler/license_finder-5.0.0

Bump license_finder from 4.0.2 to 5.0.0
    @colinloretz
    colinloretz authored Feb 4, 2018
    Configuration menu
    Copy the full SHA
    b8125cb View commit details
    Browse the repository at this point in the history

  8. Bump turbolinks from 5.0.1 to 5.1.0 

    Bumps [turbolinks](https://github.com/turbolinks/turbolinks) from 5.0.1 to 5.1.0.
- [Release notes](https://github.com/turbolinks/turbolinks/releases)
- [Commits](turbolinks/turbolinks@v5.0.1...v5.1.0)
    @dependabot-support
    dependabot-support committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    2f1af32 View commit details
    Browse the repository at this point in the history

  9. Merge pull request renocollective#126 from renocollective/dependabot/… 

    …bundler/turbolinks-5.1.0

Bump turbolinks from 5.0.1 to 5.1.0
    @colinloretz
    colinloretz authored Feb 4, 2018
    Configuration menu
    Copy the full SHA
    68ab55e View commit details
    Browse the repository at this point in the history

  10. Bump capybara from 2.16.1 to 2.17.0 

    Bumps [capybara](https://github.com/teamcapybara/capybara) from 2.16.1 to 2.17.0.
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](teamcapybara/capybara@2.16.1...2.17.0)
    @dependabot-support
    dependabot-support committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    651cb25 View commit details
    Browse the repository at this point in the history

  11. Merge pull request renocollective#124 from renocollective/dependabot/… 

    …bundler/capybara-2.17.0

Bump capybara from 2.16.1 to 2.17.0
    @colinloretz
    colinloretz authored Feb 4, 2018
    Configuration menu
    Copy the full SHA
    8374afd View commit details
    Browse the repository at this point in the history

  12. Bump carrierwave from 1.2.1 to 1.2.2 

    Bumps [carrierwave](https://github.com/carrierwaveuploader/carrierwave) from 1.2.1 to 1.2.2.
- [Changelog](https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md)
- [Commits](carrierwaveuploader/carrierwave@v1.2.1...v1.2.2)
    @dependabot-support
    dependabot-support committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    55e9bc5 View commit details
    Browse the repository at this point in the history

  13. Merge pull request renocollective#123 from renocollective/dependabot/… 

    …bundler/carrierwave-1.2.2

Bump carrierwave from 1.2.1 to 1.2.2
    @colinloretz
    colinloretz authored Feb 4, 2018
    Configuration menu
    Copy the full SHA
    ff4fd8a View commit details
    Browse the repository at this point in the history

  14. Bump rubocop from 0.51.0 to 0.52.1 

    Bumps [rubocop](https://github.com/bbatsov/rubocop) from 0.51.0 to 0.52.1.
- [Release notes](https://github.com/bbatsov/rubocop/releases)
- [Changelog](https://github.com/bbatsov/rubocop/blob/master/CHANGELOG.md)
- [Commits](rubocop/rubocop@v0.51.0...v0.52.1)
    @dependabot-support
    dependabot-support committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    433fc37 View commit details
    Browse the repository at this point in the history

  15. Merge pull request renocollective#119 from renocollective/dependabot/… 

    …bundler/rubocop-0.52.1

Bump rubocop from 0.51.0 to 0.52.1
    @colinloretz
    colinloretz authored Feb 4, 2018
    Configuration menu
    Copy the full SHA
    43ef89d View commit details
    Browse the repository at this point in the history

  16. Bump faker from 1.8.4 to 1.8.7 

    Bumps [faker](https://github.com/stympy/faker) from 1.8.4 to 1.8.7.
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md)
- [Commits](faker-ruby/faker@v1.8.4...v1.8.7)
    @dependabot-support
    dependabot-support committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    b16c753 View commit details
    Browse the repository at this point in the history

  17. Merge pull request renocollective#118 from renocollective/dependabot/… 

    …bundler/faker-1.8.7

Bump faker from 1.8.4 to 1.8.7
    @colinloretz
    colinloretz authored Feb 4, 2018
    Configuration menu
    Copy the full SHA
    3d29d44 View commit details
    Browse the repository at this point in the history

  18. chore(dependencies): Bump selenium-webdriver from 3.7.0 to 3.8.0 

    Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.7.0 to 3.8.0.
- [Commits](SeleniumHQ/selenium@selenium-3.7.0...selenium-3.8.0)
    @dependabot-support
    dependabot-support committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    4acbf5f View commit details
    Browse the repository at this point in the history

  19. Merge pull request renocollective#111 from renocollective/dependabot/… 

    …bundler/selenium-webdriver-3.8.0

Bump selenium-webdriver from 3.7.0 to 3.8.0
    @colinloretz
    colinloretz authored Feb 4, 2018
    Configuration menu
    Copy the full SHA
    4e2c824 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2018

  1. Added devise

    @BrendaPenn
    BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    8aef1de View commit details
    Browse the repository at this point in the history

  2. Edited validates on new member fields

    @BrendaPenn
    BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    904b985 View commit details
    Browse the repository at this point in the history

  3. Reconcile change from renocollective#98 

    This incorporates changes from `BrendaPenn:DeviseLogin` PR renocollective#98.
    @phlipper @BrendaPenn
    phlipper authored and BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    15daa33 View commit details
    Browse the repository at this point in the history

  4. Added devise

    @BrendaPenn
    BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    5d0c759 View commit details
    Browse the repository at this point in the history

  5. Modified member controller tests

    @BrendaPenn
    BrendaPenn authored and BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    0a8e8ff View commit details
    Browse the repository at this point in the history

  6. Rubocop changes

    @BrendaPenn
    BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    ed1e8fb View commit details
    Browse the repository at this point in the history

  7. Reconcile Phil's rebase

    @BrendaPenn
    BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    ccc0871 View commit details
    Browse the repository at this point in the history

  8. Add logout link to member page

    @BrendaPenn
    BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    01c9df5 View commit details
    Browse the repository at this point in the history

  9. Add confirmable to devise

    @BrendaPenn
    BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    048a3d2 View commit details
    Browse the repository at this point in the history

  10. Modify mailer and tests for confirmation

    @BrendaPenn
    BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    89d2ab0 View commit details
    Browse the repository at this point in the history

  11. Change after confirmation path

    @BrendaPenn
    BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    06b3a3f View commit details
    Browse the repository at this point in the history

  12. Allow unconfirmed access for new user

    @BrendaPenn
    BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    ff69656 View commit details
    Browse the repository at this point in the history

  13. Gemfile.lock

    @BrendaPenn
    BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    fde24f3 View commit details
    Browse the repository at this point in the history

  14. Merge pull request renocollective#98 from BrendaPenn/DeviseLogin 

    Devise login
    @BrendaPenn
    BrendaPenn authored Feb 5, 2018
    Configuration menu
    Copy the full SHA
    70cc49b View commit details
    Browse the repository at this point in the history

  15. Add bootstrap gem

    @BrendaPenn
    BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    dda4d71 View commit details
    Browse the repository at this point in the history

  16. Add jquery-rails gem

    @BrendaPenn
    BrendaPenn committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    d3e464e View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2018

  1. devise_invitable fix migration version issue

    @chaoticbear
    chaoticbear committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    67bf1ff View commit details
    Browse the repository at this point in the history

  2. Merge pull request renocollective#139 from BrendaPenn/add_bootstrap 

    Add bootstrap gem and jquery-rails gem
    Josh Fleming authored Feb 6, 2018
    Configuration menu
    Copy the full SHA
    95540a5 View commit details
    Browse the repository at this point in the history

  3. Bump devise from 4.3.0 to 4.4.1 

    Bumps [devise](https://github.com/plataformatec/devise) from 4.3.0 to 4.4.1.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](heartcombo/devise@v4.3.0...v4.4.1)
    @dependabot-support
    dependabot-support committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    dc04941 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:renocollective/member-portal

    @chaoticbear
    chaoticbear committed Feb 6, 2018
    Configuration menu
    Copy the full SHA
    a7e3bc9 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2018

  1. setup of bootstrap header nav.

    @chaoticbear
    chaoticbear committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    5b15dcd View commit details
    Browse the repository at this point in the history

  2. removed unrelated migration.

    @chaoticbear
    chaoticbear committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    2547214 View commit details
    Browse the repository at this point in the history

  3. Add fields to member model, Add fields to edit member form, Add field… 

    …s to show member view. Add logic to check if a member is the current member when editing.
    @chaoticbear
    chaoticbear committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    0c1a98d View commit details
    Browse the repository at this point in the history

  4. made logic less complex for current member check

    @chaoticbear
    chaoticbear committed Feb 7, 2018
    1 Configuration menu
    Copy the full SHA
    5ebc5f2 View commit details
    Browse the repository at this point in the history

  5. made logic for current member check less complex.

    @chaoticbear
    chaoticbear committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    39b72ef View commit details
    Browse the repository at this point in the history

  6. Shortened lines to pass travis CI

    @chaoticbear
    chaoticbear committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    07db782 View commit details
    Browse the repository at this point in the history

  7. Merge pull request renocollective#143 from renocollective/dependabot/… 

    …bundler/devise-4.4.1

Bump devise from 4.3.0 to 4.4.1
    @colinloretz
    colinloretz authored Feb 7, 2018
    Configuration menu
    Copy the full SHA
    86edf01 View commit details
    Browse the repository at this point in the history

  8. Bump selenium-webdriver from 3.8.0 to 3.9.0 

    Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.8.0 to 3.9.0.
- [Commits](SeleniumHQ/selenium@selenium-3.8.0...selenium-3.9.0)
    @dependabot-support
    dependabot-support committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    1c79dd4 View commit details
    Browse the repository at this point in the history

  9. Merge pull request renocollective#142 from renocollective/dependabot/… 

    …bundler/selenium-webdriver-3.9.0

Bump selenium-webdriver from 3.8.0 to 3.9.0
    @colinloretz
    colinloretz authored Feb 7, 2018
    Configuration menu
    Copy the full SHA
    a4c70ed View commit details
    Browse the repository at this point in the history

  10. Bump license_finder from 5.0.0 to 5.0.2 

    Bumps [license_finder](https://github.com/pivotal/LicenseFinder) from 5.0.0 to 5.0.2.
- [Release notes](https://github.com/pivotal/LicenseFinder/releases)
- [Changelog](https://github.com/pivotal/LicenseFinder/blob/master/CHANGELOG.md)
- [Commits](pivotal/LicenseFinder@v5.0.0...v5.0.2)
    @dependabot-support
    dependabot-support committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    ae5df84 View commit details
    Browse the repository at this point in the history

  11. Merge pull request renocollective#146 from renocollective/dependabot/… 

    …bundler/license_finder-5.0.2

Bump license_finder from 5.0.0 to 5.0.2
    @colinloretz
    colinloretz authored Feb 7, 2018
    Configuration menu
    Copy the full SHA
    03c56e7 View commit details
    Browse the repository at this point in the history

  12. Add setup and installation instructions to readme file

    @BrendaPenn
    BrendaPenn committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    d859121 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' into edit_readme

    @BrendaPenn
    BrendaPenn authored Feb 7, 2018
    Configuration menu
    Copy the full SHA
    5fa5f39 View commit details
    Browse the repository at this point in the history

  14. Merge pull request renocollective#147 from BrendaPenn/edit_readme 

    Add setup and installation instructions to readme file
    @BrendaPenn
    BrendaPenn authored Feb 7, 2018
    Configuration menu
    Copy the full SHA
    25a69a2 View commit details
    Browse the repository at this point in the history

  15. Add and edit documentation on contributing

    @BrendaPenn
    BrendaPenn committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    c475379 View commit details
    Browse the repository at this point in the history

  16. Merge pull request renocollective#148 from BrendaPenn/add_contributin… 

    …g_doc

Add and edit documentation on contributing
    @BrendaPenn
    BrendaPenn authored Feb 7, 2018
    Configuration menu
    Copy the full SHA
    7ae02a8 View commit details
    Browse the repository at this point in the history

  17. Add pull request and issue template

    @BrendaPenn
    BrendaPenn committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    e0342b8 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'master' into add_pr_template

    @BrendaPenn
    BrendaPenn authored Feb 7, 2018
    Configuration menu
    Copy the full SHA
    2dae644 View commit details
    Browse the repository at this point in the history

  19. Added log level config options for testing.

    @chaoticbear
    chaoticbear committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    ef9f8f2 View commit details
    Browse the repository at this point in the history

  20. Changed update member test to check for response success not redirect.

    @chaoticbear
    chaoticbear committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    4a71ad8 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'master' into jfleming/member-profile-fields

    Josh Fleming authored Feb 7, 2018
    Configuration menu
    Copy the full SHA
    6f2bad0 View commit details
    Browse the repository at this point in the history

  22. switched strings to single quotes for Rubocop.

    @chaoticbear
    chaoticbear committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    6aab535 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'jfleming/member-profile-fields' of github.com:revoltmed… 

    …ia/member-portal into jfleming/member-profile-fields
    @chaoticbear
    chaoticbear committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    d77d224 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'jfleming/member-profile-fields' of github.com:revoltmed… 

    …ia/member-portal into jfleming/member-profile-fields
    @chaoticbear
    chaoticbear committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    5911299 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2018

  1. Add mocha gem for test stubbing

    @veronicacannon
    veronicacannon committed Feb 8, 2018
    Configuration menu
    Copy the full SHA
    ccaa375 View commit details
    Browse the repository at this point in the history

  2. Merge pull request renocollective#121 from renocollective/add_mocha 

    Add mocha gem for test stubbing
    @veronicacannon
    veronicacannon authored Feb 8, 2018
    Configuration menu
    Copy the full SHA
    5a7c140 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into jfleming/member-profile-fields

    Josh Fleming authored Feb 8, 2018
    Configuration menu
    Copy the full SHA
    724a4e9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into jfleming/bootstrap-nav

    Josh Fleming authored Feb 8, 2018
    Configuration menu
    Copy the full SHA
    71947c5 View commit details
    Browse the repository at this point in the history

  5. Merge pull request renocollective#145 from revoltmedia/jfleming/membe… 

    …r-profile-fields

Member Profile fields, and current member check logic
    Josh Fleming authored Feb 8, 2018
    Configuration menu
    Copy the full SHA
    2e04871 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into jfleming/bootstrap-nav

    Josh Fleming authored Feb 8, 2018
    Configuration menu
    Copy the full SHA
    a31a3c1 View commit details
    Browse the repository at this point in the history

  7. Merge pull request renocollective#144 from revoltmedia/jfleming/boots… 

    …trap-nav

Bootstrap based Header Navbar
    Josh Fleming authored Feb 8, 2018
    Configuration menu
    Copy the full SHA
    934f807 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into add_pr_template

    Josh Fleming authored Feb 8, 2018
    Configuration menu
    Copy the full SHA
    3c114b1 View commit details
    Browse the repository at this point in the history

  9. Merge pull request renocollective#149 from BrendaPenn/add_pr_template 

    Add pull request and issue templates
    Josh Fleming authored Feb 8, 2018
    Configuration menu
    Copy the full SHA
    386eaab View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2018

  1. Bump uglifier from 4.1.5 to 4.1.6 

    Bumps [uglifier](https://github.com/lautis/uglifier) from 4.1.5 to 4.1.6.
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md)
- [Commits](lautis/uglifier@v4.1.5...v4.1.6)
    @dependabot-support
    dependabot-support committed Feb 9, 2018
    Configuration menu
    Copy the full SHA
    3070f1a View commit details
    Browse the repository at this point in the history

  2. Merge pull request renocollective#152 from renocollective/dependabot/… 

    …bundler/uglifier-4.1.6

Bump uglifier from 4.1.5 to 4.1.6
    @colinloretz
    colinloretz authored Feb 9, 2018
    Configuration menu
    Copy the full SHA
    28347d1 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2018

  1. Set BlockLength to 50 in Rubocop

    Colin Loretz committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    48d6435 View commit details
    Browse the repository at this point in the history

  2. Merge pull request renocollective#153 from colinloretz/rubocop-except… 

    …ions

Set BlockLength to 50 in Rubocop
    @BrendaPenn
    BrendaPenn authored Feb 12, 2018
    Configuration menu
    Copy the full SHA
    248d78f View commit details
    Browse the repository at this point in the history

  3. Revert "Set BlockLength to 50 in Rubocop"

    @colinloretz
    colinloretz authored Feb 12, 2018
    Configuration menu
    Copy the full SHA
    fd1489e View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2018

  1. Merge pull request renocollective#155 from renocollective/revert-153-… 

    …rubocop-exceptions

Revert "Set BlockLength to 50 in Rubocop"
    @colinloretz
    colinloretz authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    3f05335 View commit details
    Browse the repository at this point in the history

  2. Added SMTP settings and documentation for ActionMailer for issue reno… 

    …collective#138
    Colin Loretz committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    dc29bd3 View commit details
    Browse the repository at this point in the history

  3. Reconfigured mailer to use Mailcatcher in local dev mode

    Colin Loretz committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    66afb29 View commit details
    Browse the repository at this point in the history

  4. Disable Metrics/BlockLength in config/environments to support more co… 

    …nfigurations
    Colin Loretz committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    7fcb6f8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request renocollective#140 from colinloretz/add-actionmail… 

    …er-138

Added SMTP settings and documentation for ActionMailer for issue renocollective#138
    @colinloretz
    colinloretz authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    98e6ad4 View commit details
    Browse the repository at this point in the history

  6. Added devise_invitable

    Colin Loretz committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    193cde0 View commit details
    Browse the repository at this point in the history

  7. Installed Devise Invitable as per docs and run migration

    Colin Loretz committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    1111640 View commit details
    Browse the repository at this point in the history

  8. Make invitations expire after 2 weeks

    Colin Loretz committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    411b198 View commit details
    Browse the repository at this point in the history

  9. Add device invitation views

    Colin Loretz committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    82f4b06 View commit details
    Browse the repository at this point in the history

  10. Merge pull request renocollective#159 from colinloretz/add-user-invit… 

    …ations

Add user invitations to close renocollective#110
    @colinloretz
    colinloretz authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    33da2e6 View commit details
    Browse the repository at this point in the history

  11. Add admin attribute to member model

    @BrendaPenn
    BrendaPenn committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    365980e View commit details
    Browse the repository at this point in the history

  12. Rebase with mailer and devise invitations

    @BrendaPenn
    BrendaPenn committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    c17ea70 View commit details
    Browse the repository at this point in the history

  13. remove readme from db

    @BrendaPenn
    BrendaPenn committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    fae98bf View commit details
    Browse the repository at this point in the history

  14. Fix schema indentation

    @BrendaPenn
    BrendaPenn committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    b07afbc View commit details
    Browse the repository at this point in the history

  15. Merge pull request renocollective#154 from BrendaPenn/add_admin_role 

    Add admin attribute to member model
    @BrendaPenn
    BrendaPenn authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    cea475e View commit details
    Browse the repository at this point in the history

  16. Add reconfirmable to devise

    @BrendaPenn
    BrendaPenn committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    bf07b9a View commit details
    Browse the repository at this point in the history

  17. Merge pull request renocollective#161 from BrendaPenn/add_reconfirmab… 

    …le_email

Add reconfirmable to devise
    @colinloretz
    colinloretz authored Feb 14, 2018
    Configuration menu
    Copy the full SHA
    73a10b0 View commit details
    Browse the repository at this point in the history

  18. Bump capybara from 2.17.0 to 2.18.0 

    Bumps [capybara](https://github.com/teamcapybara/capybara) from 2.17.0 to 2.18.0.
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](teamcapybara/capybara@2.17.0...2.18.0)
    @dependabot-support
    dependabot-support committed Feb 14, 2018
    Configuration menu
    Copy the full SHA
    490598c View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2018

  1. Merge pull request renocollective#157 from renocollective/dependabot/… 

    …bundler/capybara-2.18.0

Bump capybara from 2.17.0 to 2.18.0
    @colinloretz
    colinloretz authored Feb 15, 2018
    Configuration menu
    Copy the full SHA
    10c45ef View commit details
    Browse the repository at this point in the history

  2. Bump license_finder from 5.0.2 to 5.0.3 

    Bumps [license_finder](https://github.com/pivotal/LicenseFinder) from 5.0.2 to 5.0.3.
- [Release notes](https://github.com/pivotal/LicenseFinder/releases/tag/v5.0.3)
- [Changelog](https://github.com/pivotal/LicenseFinder/blob/master/CHANGELOG.md)
- [Commits](pivotal/LicenseFinder@v5.0.2...v5.0.3)
    @dependabot-support
    dependabot-support committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    c281b18 View commit details
    Browse the repository at this point in the history

  3. Edit development setup instructions in README

    @BrendaPenn
    BrendaPenn committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    9bcef75 View commit details
    Browse the repository at this point in the history

  4. Merge pull request renocollective#158 from renocollective/dependabot/… 

    …bundler/license_finder-5.0.3

Bump license_finder from 5.0.2 to 5.0.3
    @colinloretz
    colinloretz authored Feb 15, 2018
    Configuration menu
    Copy the full SHA
    9f910a4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into edit_readme

    @BrendaPenn
    BrendaPenn authored Feb 15, 2018
    Configuration menu
    Copy the full SHA
    d59d607 View commit details
    Browse the repository at this point in the history

  6. Bump rails from 5.1.4 to 5.1.5 

    Bumps [rails](https://github.com/rails/rails) from 5.1.4 to 5.1.5.
- [Commits](rails/rails@v5.1.4...v5.1.5)
    @dependabot-support
    dependabot-support committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    cb3d990 View commit details
    Browse the repository at this point in the history

  7. Merge pull request renocollective#163 from renocollective/dependabot/… 

    …bundler/rails-5.1.5

Bump rails from 5.1.4 to 5.1.5
    @colinloretz
    colinloretz authored Feb 15, 2018
    Configuration menu
    Copy the full SHA
    99d8849 View commit details
    Browse the repository at this point in the history

  8. Bump pg from 0.21.0 to 1.0.0 

    Bumps [pg](https://bitbucket.org/ged/ruby-pg) from 0.21.0 to 1.0.0.
- [Changelog](https://bitbucket.org/ged/ruby-pg/src/master/History.rdoc)
- [Commits](https://bitbucket.org/ged/ruby-pg/branches/compare/v1.0.0..v0.21.0)
    @dependabot-support
    dependabot-support committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    f6d93cc View commit details
    Browse the repository at this point in the history

  9. Merge pull request renocollective#127 from renocollective/dependabot/… 

    …bundler/pg-1.0.0

Bump pg from 0.21.0 to 1.0.0
    @colinloretz
    colinloretz authored Feb 15, 2018
    Configuration menu
    Copy the full SHA
    a028b30 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into edit_readme

    @BrendaPenn
    BrendaPenn authored Feb 15, 2018
    Configuration menu
    Copy the full SHA
    955b5fe View commit details
    Browse the repository at this point in the history

  11. Merge pull request renocollective#162 from BrendaPenn/edit_readme 

    Edit development setup instructions in README
    @BrendaPenn
    BrendaPenn authored Feb 15, 2018
    Configuration menu
    Copy the full SHA
    ba80cac View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2018

  1. Add Codeclimate code coverage script to .travis.yml

    Colin Loretz committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    f8094b6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request renocollective#160 from colinloretz/add-test-cover… 

    …age-check

Add Codeclimate test coverage reporting to close renocollective#70
    @colinloretz
    colinloretz authored Feb 21, 2018
    Configuration menu
    Copy the full SHA
    48acc57 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2018

  1. Add administrate gem for admin dashboard

    @BrendaPenn
    BrendaPenn committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    31b2006 View commit details
    Browse the repository at this point in the history

  2. Authenticate admin when accessing admin dashboard and modify dashboar… 

    …d fields
    @BrendaPenn
    BrendaPenn committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    6074377 View commit details
    Browse the repository at this point in the history

  3. Modify to pass rubocop

    @BrendaPenn
    BrendaPenn committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    e71c39d View commit details
    Browse the repository at this point in the history

  4. Approve dependencies with license_finder

    @BrendaPenn
    BrendaPenn committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    605e772 View commit details
    Browse the repository at this point in the history

  5. create admin controller test

    @BrendaPenn
    BrendaPenn committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    e37795d View commit details
    Browse the repository at this point in the history

  6. Merge pull request renocollective#164 from BrendaPenn/add_administrat… 

    …e_gem

Add administrate gem for admin dashboard
    @BrendaPenn
    BrendaPenn authored Feb 26, 2018
    Configuration menu
    Copy the full SHA
    1556b20 View commit details
    Browse the repository at this point in the history

  7. Allow only admin to invite members

    @BrendaPenn
    BrendaPenn committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    2c29ac8 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2018

  1. remove unnecessary helper function

    @BrendaPenn
    BrendaPenn committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    8b7a806 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2018

  1. Merge pull request renocollective#167 from BrendaPenn/admin_invite_only 

    Allow only admin to invite members
    @colinloretz
    colinloretz authored Mar 1, 2018
    Configuration menu
    Copy the full SHA
    3c65192 View commit details
    Browse the repository at this point in the history

  2. add postgres to docker-compose

    @chaoticbear
    chaoticbear committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    e2a3998 View commit details
    Browse the repository at this point in the history

  3. ignore posgres db directory

    @chaoticbear
    chaoticbear committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    b7a3abc View commit details
    Browse the repository at this point in the history

  4. build path comment for dev of rails image

    @chaoticbear
    chaoticbear committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    4b3a052 View commit details
    Browse the repository at this point in the history

  5. docker-compose WIP

    @chaoticbear
    chaoticbear committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    de2a1c4 View commit details
    Browse the repository at this point in the history

  6. moved env variables to .env.local

    @chaoticbear
    chaoticbear committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    e482007 View commit details
    Browse the repository at this point in the history

  7. fixes to docker-compose setup, env file formatting, latest postgres, … 

    …etc.
    @chaoticbear
    chaoticbear committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    bde4c35 View commit details
    Browse the repository at this point in the history

  8. Moved all docker related stuff to the member-portal-docker project

    @chaoticbear
    chaoticbear committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    005996b View commit details
    Browse the repository at this point in the history

  9. docker readme updates

    @chaoticbear
    chaoticbear committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    6ca3360 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'jfleming/docker-compose-setup' of github.com:revoltmedi… 

    …a/member-portal into jfleming/docker-compose-setup
    @chaoticbear
    chaoticbear committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    dc59850 View commit details
    Browse the repository at this point in the history