asergiop21 · fythal · Nov 23, 2013
diff --git a/:wq b/:wq
diff --git a/Capfile b/Capfile
diff --git a/Gemfile b/Gemfile
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/README.md b/README.md
diff --git a/README.rdoc b/README.rdoc
diff --git a/Rakefile b/Rakefile
diff --git a/app/assets/images/User-icon.png b/app/assets/images/User-icon.png
diff --git a/app/assets/images/llave.png b/app/assets/images/llave.png
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
diff --git a/app/assets/images/user-icon.jpg b/app/assets/images/user-icon.jpg
diff --git a/app/assets/images/wifi-logo.png b/app/assets/images/wifi-logo.png
diff --git a/app/assets/javascripts/accounts_receivables.js.coffee b/app/assets/javascripts/accounts_receivables.js.coffee
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
diff --git a/app/assets/javascripts/autocomplete.js.coffee b/app/assets/javascripts/autocomplete.js.coffee
diff --git a/app/assets/javascripts/categories.js.coffee b/app/assets/javascripts/categories.js.coffee
diff --git a/app/assets/javascripts/customers.js b/app/assets/javascripts/customers.js
diff --git a/app/assets/javascripts/equipment.js b/app/assets/javascripts/equipment.js
diff --git a/app/assets/javascripts/ips.js.coffee b/app/assets/javascripts/ips.js.coffee
diff --git a/app/assets/javascripts/loans.js.coffee b/app/assets/javascripts/loans.js.coffee
diff --git a/app/assets/javascripts/locations.js.coffee b/app/assets/javascripts/locations.js.coffee
diff --git a/app/assets/javascripts/makes.js.coffee b/app/assets/javascripts/makes.js.coffee
diff --git a/app/assets/javascripts/models.js.coffee b/app/assets/javascripts/models.js.coffee
diff --git a/app/assets/javascripts/permissions.js.coffee b/app/assets/javascripts/permissions.js.coffee
diff --git a/app/assets/javascripts/plans.js.coffee b/app/assets/javascripts/plans.js.coffee
diff --git a/app/assets/javascripts/registrations.js.coffee b/app/assets/javascripts/registrations.js.coffee
diff --git a/app/assets/javascripts/roles.js.coffee b/app/assets/javascripts/roles.js.coffee
diff --git a/app/assets/javascripts/roles_and_permissions.js.coffee b/app/assets/javascripts/roles_and_permissions.js.coffee
diff --git a/app/assets/javascripts/suppliers.js.coffee b/app/assets/javascripts/suppliers.js.coffee
diff --git a/app/assets/javascripts/tickets.js b/app/assets/javascripts/tickets.js
diff --git a/app/assets/javascripts/tickets_answers.js.coffee b/app/assets/javascripts/tickets_answers.js.coffee
diff --git a/app/assets/javascripts/users.js.coffee b/app/assets/javascripts/users.js.coffee
diff --git a/app/assets/stylesheets/accounts_receivables.css.scss b/app/assets/stylesheets/accounts_receivables.css.scss
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
diff --git a/app/assets/stylesheets/categories.css.scss b/app/assets/stylesheets/categories.css.scss
diff --git a/app/assets/stylesheets/customers.css.scss b/app/assets/stylesheets/customers.css.scss
diff --git a/app/assets/stylesheets/customers.css.scss~ b/app/assets/stylesheets/customers.css.scss~
@@ -3,7 +3,7 @@
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
 .side{
-  heigth: 15%;
+  height: 15%;
 
 }
 

diff --git a/app/assets/stylesheets/equipment.css.scss b/app/assets/stylesheets/equipment.css.scss
diff --git a/app/assets/stylesheets/footer.css b/app/assets/stylesheets/footer.css
diff --git a/app/assets/stylesheets/ips.css.scss b/app/assets/stylesheets/ips.css.scss
diff --git a/app/assets/stylesheets/loans.css.scss b/app/assets/stylesheets/loans.css.scss
diff --git a/app/assets/stylesheets/locations.css.scss b/app/assets/stylesheets/locations.css.scss
diff --git a/app/assets/stylesheets/login.css b/app/assets/stylesheets/login.css
diff --git a/app/assets/stylesheets/makes.css.scss b/app/assets/stylesheets/makes.css.scss
diff --git a/app/assets/stylesheets/models.css.scss b/app/assets/stylesheets/models.css.scss
diff --git a/app/assets/stylesheets/permissions.css.scss b/app/assets/stylesheets/permissions.css.scss
diff --git a/app/assets/stylesheets/plans.css.scss b/app/assets/stylesheets/plans.css.scss
diff --git a/app/assets/stylesheets/registrations.css.scss b/app/assets/stylesheets/registrations.css.scss
diff --git a/app/assets/stylesheets/roles.css.scss b/app/assets/stylesheets/roles.css.scss
diff --git a/app/assets/stylesheets/roles_and_permissions.css.scss b/app/assets/stylesheets/roles_and_permissions.css.scss
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
diff --git a/app/assets/stylesheets/suppliers.css.scss b/app/assets/stylesheets/suppliers.css.scss
diff --git a/app/assets/stylesheets/tickets.css.scss b/app/assets/stylesheets/tickets.css.scss
diff --git a/app/assets/stylesheets/tickets_answers.css.scss b/app/assets/stylesheets/tickets_answers.css.scss
diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb
diff --git a/app/controllers/equipment_controller.rb b/app/controllers/equipment_controller.rb
diff --git a/app/controllers/equipments_controller.rb b/app/controllers/equipments_controller.rb
diff --git a/app/controllers/locations_controller.rb b/app/controllers/locations_controller.rb
diff --git a/app/controllers/makes_controller.rb b/app/controllers/makes_controller.rb
diff --git a/app/controllers/models_controller.rb b/app/controllers/models_controller.rb
diff --git a/app/controllers/permissions_controller.rb b/app/controllers/permissions_controller.rb
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
diff --git a/app/controllers/suppliers_controller.rb b/app/controllers/suppliers_controller.rb
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
diff --git a/app/helpers/.tickets_helper.rb.swp b/app/helpers/.tickets_helper.rb.swp
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
diff --git a/app/helpers/categories_helper.rb b/app/helpers/categories_helper.rb
diff --git a/app/helpers/customers_helper.rb b/app/helpers/customers_helper.rb
diff --git a/app/helpers/equipment_helper.rb b/app/helpers/equipment_helper.rb
diff --git a/app/helpers/locations_helper.rb b/app/helpers/locations_helper.rb
diff --git a/app/helpers/makes_helper.rb b/app/helpers/makes_helper.rb
diff --git a/app/helpers/models_helper.rb b/app/helpers/models_helper.rb
diff --git a/app/helpers/permissions_helper.rb b/app/helpers/permissions_helper.rb
diff --git a/app/helpers/suppliers_helper.rb b/app/helpers/suppliers_helper.rb
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
diff --git a/app/mailers/.gitkeep b/app/mailers/.gitkeep
diff --git a/app/models/.gitkeep b/app/models/.gitkeep
diff --git a/app/models/ability.rb b/app/models/ability.rb
diff --git a/app/models/category.rb b/app/models/category.rb
diff --git a/app/models/customer.rb b/app/models/customer.rb
diff --git a/app/models/equipment.rb b/app/models/equipment.rb
diff --git a/app/models/location.rb b/app/models/location.rb
diff --git a/app/models/make.rb b/app/models/make.rb
diff --git a/app/models/model.rb b/app/models/model.rb
diff --git a/app/models/permission.rb b/app/models/permission.rb
diff --git a/app/models/phone.rb b/app/models/phone.rb
diff --git a/app/models/supplier.rb b/app/models/supplier.rb
diff --git a/app/models/user.rb b/app/models/user.rb
diff --git a/app/views/categories/_form.html.erb b/app/views/categories/_form.html.erb
diff --git a/app/views/categories/edit.html.erb b/app/views/categories/edit.html.erb
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
diff --git a/app/views/categories/new.html.erb b/app/views/categories/new.html.erb
diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb
diff --git a/app/views/customers/._form.html.erb.swp b/app/views/customers/._form.html.erb.swp
diff --git a/app/views/customers/_form.html.erb b/app/views/customers/_form.html.erb
diff --git a/app/views/customers/_phones.html.erb b/app/views/customers/_phones.html.erb
diff --git a/app/views/customers/edit.html.erb b/app/views/customers/edit.html.erb
diff --git a/app/views/customers/index.html.erb b/app/views/customers/index.html.erb
diff --git a/app/views/customers/index.html.erb~ b/app/views/customers/index.html.erb~
diff --git a/app/views/customers/new.html.erb b/app/views/customers/new.html.erb
diff --git a/app/views/customers/show.html.erb b/app/views/customers/show.html.erb
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
diff --git a/app/views/devise/registrations/.edit.html.erb.swp b/app/views/devise/registrations/.edit.html.erb.swp
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
diff --git a/app/views/devise/sessions/.new.html.erb.swp b/app/views/devise/sessions/.new.html.erb.swp
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
diff --git a/app/views/devise/sessions/new.html.erb~ b/app/views/devise/sessions/new.html.erb~
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
diff --git a/app/views/equipment/.show.html.erb.swp b/app/views/equipment/.show.html.erb.swp
diff --git a/app/views/equipment/_form.html.erb b/app/views/equipment/_form.html.erb
diff --git a/app/views/equipment/edit.html.erb b/app/views/equipment/edit.html.erb
diff --git a/app/views/equipment/index.html.erb b/app/views/equipment/index.html.erb
diff --git a/app/views/equipment/new.html.erb b/app/views/equipment/new.html.erb
diff --git a/app/views/equipment/show.html.erb b/app/views/equipment/show.html.erb
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
diff --git a/app/views/layouts/_menu.html.erb b/app/views/layouts/_menu.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
diff --git a/app/views/locations/_form.html.erb b/app/views/locations/_form.html.erb
diff --git a/app/views/locations/edit.html.erb b/app/views/locations/edit.html.erb
diff --git a/app/views/locations/index.html.erb b/app/views/locations/index.html.erb
diff --git a/app/views/locations/new.html.erb b/app/views/locations/new.html.erb
diff --git a/app/views/locations/show.html.erb b/app/views/locations/show.html.erb
diff --git a/app/views/makes/_form.html.erb b/app/views/makes/_form.html.erb
diff --git a/app/views/makes/edit.html.erb b/app/views/makes/edit.html.erb
diff --git a/app/views/makes/index.html.erb b/app/views/makes/index.html.erb
diff --git a/app/views/makes/new.html.erb b/app/views/makes/new.html.erb
diff --git a/app/views/makes/show.html.erb b/app/views/makes/show.html.erb
diff --git a/app/views/models/_form.html.erb b/app/views/models/_form.html.erb
diff --git a/app/views/models/edit.html.erb b/app/views/models/edit.html.erb
diff --git a/app/views/models/index.html.erb b/app/views/models/index.html.erb
diff --git a/app/views/models/new.html.erb b/app/views/models/new.html.erb
diff --git a/app/views/models/show.html.erb b/app/views/models/show.html.erb
diff --git a/app/views/models/show.pdf.prawn b/app/views/models/show.pdf.prawn
diff --git a/app/views/suppliers/_form.html.erb b/app/views/suppliers/_form.html.erb
diff --git a/app/views/suppliers/edit.html.erb b/app/views/suppliers/edit.html.erb
diff --git a/app/views/suppliers/index.html.erb b/app/views/suppliers/index.html.erb
diff --git a/app/views/suppliers/new.html.erb b/app/views/suppliers/new.html.erb
diff --git a/app/views/suppliers/show.html.erb b/app/views/suppliers/show.html.erb
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
diff --git a/bk/:wq b/bk/:wq
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     // You can use Sass (SCSS) here: http://sass-lang.com/
     .side{
-      heigth: 15%;
+      height: 15%;
     }
@@ Expand Down @@