Skip to content
This repository has been archived by the owner on Mar 27, 2022. It is now read-only.

CSV Import Redesign #519

Merged
merged 32 commits into from Aug 30, 2015
Merged

CSV Import Redesign #519

merged 32 commits into from Aug 30, 2015

Commits on Feb 9, 2015

  1. Copy the full SHA
    aa29c7d View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2015

  1. Tweak how error messages are built

    `errors.full_messages` will now read attribute + ' ' + error, as is the
    default. Use `errors.values` for errors without attribute prepended.
    seven1m committed Feb 14, 2015
    Copy the full SHA
    4fbb6e8 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    a5f135c View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into import

    Conflicts:
    	db/schema.rb
    seven1m committed Feb 14, 2015
    Copy the full SHA
    39b27f6 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    7dbf9e1 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    467cada View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2015

  1. Copy the full SHA
    75f813a View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2015

  1. Copy the full SHA
    98e3b2d View commit details
    Browse the repository at this point in the history
  2. Build some of the import UI

    seven1m committed Feb 23, 2015
    Copy the full SHA
    5cdefce View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2015

  1. Build more import stuff

    seven1m committed Apr 11, 2015
    Copy the full SHA
    ce5922c View commit details
    Browse the repository at this point in the history
  2. Upgrade spring

    seven1m committed Apr 11, 2015
    Copy the full SHA
    6654abe View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2015

  1. Merge branch 'master' into import

    Conflicts:
    	.rubocop.yml
    	Gemfile
    	app/assets/stylesheets/app/tables.css.scss
    	app/controllers/application_controller.rb
    	app/models/family.rb
    	app/models/search.rb
    	app/views/administration/checkin/groups/update.js.erb
    	app/views/administration/dashboards/show.html.haml
    	config/routes.rb
    	db/schema.rb
    	spec/factories/people.rb
    seven1m committed Aug 22, 2015
    Copy the full SHA
    9478fe3 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    ba02175 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2015

  1. Import preview works

    seven1m committed Aug 25, 2015
    Copy the full SHA
    bdbf7e9 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2015

  1. Improve import previews

    seven1m committed Aug 26, 2015
    Copy the full SHA
    32ad7dc View commit details
    Browse the repository at this point in the history
  2. Make import execution work

    seven1m committed Aug 26, 2015
    Copy the full SHA
    a0f65d3 View commit details
    Browse the repository at this point in the history
  3. Fix issue previewing data

    seven1m committed Aug 26, 2015
    Copy the full SHA
    daf7de4 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'master' into import

    Conflicts:
    	app/models/setup.rb
    seven1m committed Aug 26, 2015
    Copy the full SHA
    be0b37f View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    a2d7bf9 View commit details
    Browse the repository at this point in the history
  6. Fix issues with attributes

    seven1m committed Aug 26, 2015
    Copy the full SHA
    a1454f5 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    98f2233 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2015

  1. Copy the full SHA
    5267d7e View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2015

  1. Fix spec

    seven1m committed Aug 28, 2015
    Copy the full SHA
    63006b1 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2015

  1. Remove old import code

    seven1m committed Aug 30, 2015
    Copy the full SHA
    cba92d4 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into import

    Conflicts:
    	db/schema.rb
    seven1m committed Aug 30, 2015
    Copy the full SHA
    22feab6 View commit details
    Browse the repository at this point in the history
  3. Sort entries in Gemfile

    seven1m committed Aug 30, 2015
    Copy the full SHA
    1be8e94 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    1d85c54 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    f01c470 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    0c6dfe5 View commit details
    Browse the repository at this point in the history
  7. Fix specs

    seven1m committed Aug 30, 2015
    Copy the full SHA
    3450f95 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    c94632c View commit details
    Browse the repository at this point in the history
  9. I18n import pages

    seven1m committed Aug 30, 2015
    Copy the full SHA
    c246896 View commit details
    Browse the repository at this point in the history