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

Entrega 3.3 - Final : Víctor Hugo Bazán Milla - Enrique Pardo Vázquez-Bruno #11

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open

Entrega 3.3 - Final : Víctor Hugo Bazán Milla - Enrique Pardo Vázquez-Bruno #11

wants to merge 24 commits into from

Commits on Dec 7, 2011

  1. añadido autores

    Victor H. Bazán committed Dec 7, 2011
    Configuration menu
    Copy the full SHA
    21aa5ad View commit details
    Browse the repository at this point in the history

  2. Merge branch 'entrega3.1'

    Victor H. Bazán committed Dec 7, 2011
    Configuration menu
    Copy the full SHA
    600e930 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2011

  1. creacion de scaffold site

    Victor H. Bazán committed Dec 11, 2011
    Configuration menu
    Copy the full SHA
    58574d6 View commit details
    Browse the repository at this point in the history

  2. cambios modelo y migracion site

    Victor H. Bazán committed Dec 11, 2011
    Configuration menu
    Copy the full SHA
    f6a80a6 View commit details
    Browse the repository at this point in the history

  3. Adaptacion vistas a relaciones modelo

    Victor H. Bazán committed Dec 11, 2011
    Configuration menu
    Copy the full SHA
    9eb7f60 View commit details
    Browse the repository at this point in the history

  4. Rutas anidadas types/:id/sites

    Victor H. Bazán committed Dec 11, 2011
    Configuration menu
    Copy the full SHA
    5375432 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2011

  1. Cambio de look con nuevas vistas y CSS

    Victor H. Bazán committed Dec 13, 2011
    Configuration menu
    Copy the full SHA
    82fd3ab View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2011

  1. modif para entrega 3.3

    Victor H. Bazán committed Dec 18, 2011
    Configuration menu
    Copy the full SHA
    8fb2775 View commit details
    Browse the repository at this point in the history

  2. scaffold y migration tip

    Victor H. Bazán committed Dec 18, 2011
    Configuration menu
    Copy the full SHA
    d273cf7 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2011

  1. añad cleditor y mejora vistas trip

    Victor H. Bazán committed Dec 20, 2011
    Configuration menu
    Copy the full SHA
    b5ac442 View commit details
    Browse the repository at this point in the history

  2. scaffold y migracion selected

    Victor H. Bazán committed Dec 20, 2011
    Configuration menu
    Copy the full SHA
    fc63aeb View commit details
    Browse the repository at this point in the history

  3. definición relación entre selected y trip, site

    Victor H. Bazán committed Dec 20, 2011
    Configuration menu
    Copy the full SHA
    c2c5b79 View commit details
    Browse the repository at this point in the history

  4. include selected in view trip

    Victor H. Bazán committed Dec 20, 2011
    Configuration menu
    Copy the full SHA
    90ed7d9 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2011

  1. selected with AJAX in view trip/show.html.erb

    Victor H. Bazán committed Dec 22, 2011
    Configuration menu
    Copy the full SHA
    0be5995 View commit details
    Browse the repository at this point in the history

  2. add seeds.rb for DB init / UTF-8

    Victor H. Bazán committed Dec 22, 2011
    Configuration menu
    Copy the full SHA
    339f2b5 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2011

  1. add canvas & map in trips/show.html.erb

    Victor H. Bazán committed Dec 23, 2011
    Configuration menu
    Copy the full SHA
    ce26f8b View commit details
    Browse the repository at this point in the history

  2. create array-hash:@datos_sitios for manage site data

    Victor H. Bazán committed Dec 23, 2011
    Configuration menu
    Copy the full SHA
    7860d94 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2011

  1. add upload pic option

    Victor H. Bazán committed Dec 24, 2011
    Configuration menu
    Copy the full SHA
    91ec40c View commit details
    Browse the repository at this point in the history

  2. adaptación sitios con el upload_file

    Victor H. Bazán committed Dec 24, 2011
    Configuration menu
    Copy the full SHA
    8cdfd50 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2011

  1. add column added_times to site

    Victor H. Bazán committed Dec 25, 2011
    Configuration menu
    Copy the full SHA
    c4719c6 View commit details
    Browse the repository at this point in the history

  2. adaptation views to counter sites: added_times

    Victor H. Bazán committed Dec 25, 2011
    Configuration menu
    Copy the full SHA
    6941d32 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2011

  1. added inc/dec added_times en selecteds_controller

    Victor H. Bazán committed Dec 27, 2011
    Configuration menu
    Copy the full SHA
    7b1e137 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2012

  1. added icons to map

    Victor H. Bazán committed Jan 9, 2012
    Configuration menu
    Copy the full SHA
    3701379 View commit details
    Browse the repository at this point in the history

  2. remove log messages from views and controller

    Victor H. Bazán committed Jan 9, 2012
    Configuration menu
    Copy the full SHA
    bf578b2 View commit details
    Browse the repository at this point in the history