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

Merge 'master' to 'production' branch #202

Merged
merged 29 commits into from Apr 15, 2014
Merged

Merge 'master' to 'production' branch #202

merged 29 commits into from Apr 15, 2014

Commits on Mar 26, 2014

  1. Fixing writeit start script

    Felipe Álvarez committed Mar 26, 2014
    Configuration menu
    Copy the full SHA
    b4a693f View commit details
    Browse the repository at this point in the history

  2. Fixing a test

    Felipe Álvarez committed Mar 26, 2014
    Configuration menu
    Copy the full SHA
    90a1a40 View commit details
    Browse the repository at this point in the history

  3. Testing show method of the bills controller

    Felipe Álvarez committed Mar 26, 2014
    Configuration menu
    Copy the full SHA
    d807948 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2014

  1. Passing tests for the bill controller mimiquing the response at morph

    Felipe Álvarez committed Mar 27, 2014
    Configuration menu
    Copy the full SHA
    f85e2ae View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2014

  1. WIP

    Felipe Álvarez committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    f1ee8d2 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2014

  1. Commenting not tested code and solving conflict

    Felipe Álvarez committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    bf1f8a9 View commit details
    Browse the repository at this point in the history

  2. Passing test 'assigns the requested bill as @Bill'

    Felipe Álvarez committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    c3a0a31 View commit details
    Browse the repository at this point in the history

  3. Passing bills_controller spec

    Felipe Álvarez committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    2e7d482 View commit details
    Browse the repository at this point in the history

  4. decoupling mocks

    Felipe Álvarez committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    5f23438 View commit details
    Browse the repository at this point in the history

  5. Mocking everything

    Felipe Álvarez committed Apr 10, 2014
    Configuration menu
    Copy the full SHA
    c483a5e View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2014

  1. Passing with mocked billit

    Felipe Álvarez committed Apr 11, 2014
    Configuration menu
    Copy the full SHA
    3c88788 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2014

  1. Mocking update in billit

    Felipe Álvarez committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    f5feff1 View commit details
    Browse the repository at this point in the history

  2. Updating travis

    Felipe Álvarez committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    5cbb475 View commit details
    Browse the repository at this point in the history

  3. Solving conflict

    Felipe Álvarez committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    98b7120 View commit details
    Browse the repository at this point in the history

  4. Adding apt get install virtualenv to travis file

    Felipe Álvarez committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    49e7f33 View commit details
    Browse the repository at this point in the history

  5. Trying to fix travis

    Felipe Álvarez committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    5091cdf View commit details
    Browse the repository at this point in the history

  6. Fixing travis

    Felipe Álvarez committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    2cddd61 View commit details
    Browse the repository at this point in the history

  7. Update README.md

    @maugsbur
    maugsbur committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    f2ec20b View commit details
    Browse the repository at this point in the history

  8. Adding services to travis

    Felipe Álvarez committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    a9fb776 View commit details
    Browse the repository at this point in the history

  9. Copying database.yml.example into database.yml

    Felipe Álvarez committed Apr 14, 2014
    Configuration menu
    Copy the full SHA
    e310fdb View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2014

  1. updates README.md 

    - more information for initial setup
- instructions for deploy in production
    @rezzo
    rezzo committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    0f08143 View commit details
    Browse the repository at this point in the history

  2. added key for testing environment

    @rezzo
    rezzo committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    afb2b6f View commit details
    Browse the repository at this point in the history

  3. fixed gem require, webmock only for test environment

    @rezzo
    rezzo committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    58313d9 View commit details
    Browse the repository at this point in the history

  4. removed unused models files

    @rezzo
    rezzo committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    4f63a6e View commit details
    Browse the repository at this point in the history

  5. added tests for agendas controller

    @rezzo
    rezzo committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    bc8bb4f View commit details
    Browse the repository at this point in the history

  6. added mocks for agendas table and district weeks

    @rezzo
    rezzo committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    4fbae98 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #201 from ciudadanointeligente/testing 

    Testing
    @rezzo
    rezzo committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    fd1ee4e View commit details
    Browse the repository at this point in the history

  8. removed deprecated files

    @rezzo
    rezzo committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    1b2e0ca View commit details
    Browse the repository at this point in the history

  9. Merge branch 'testing' into 'master'

    @rezzo
    rezzo committed Apr 15, 2014
    Configuration menu
    Copy the full SHA
    515cefc View commit details
    Browse the repository at this point in the history