2. admin
  3. Changes

User avatar admin

Resource update

Mapotempo App / Mapotempo App — Arabic

Resource update 7 years ago
User avatar admin

Merged repository

Mapotempo App / Mapotempo App

Merged repository 7 years ago
User avatar admin

Rebased repository

Mapotempo App / Mapotempo App

Rebased repository 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Portuguese

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Hebrew

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Persian

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Spanish

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — English

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Arabic

Resource update 7 years ago
User avatar admin

Merged repository

Mapotempo App / Mapotempo App

Merged repository 7 years ago
User avatar admin

Pushed changes

Mapotempo App / Mapotempo App

Pushed changes 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Portuguese

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Hebrew

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Persian

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Spanish

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — English

Resource update 7 years ago
User avatar admin

Resource update

Mapotempo App / Mapotempo App — Arabic

Resource update 7 years ago
User avatar admin

Rebased repository

Mapotempo App / Mapotempo App

Rebased repository 7 years ago
User avatar admin

Failed merge on repository

Mapotempo App / Mapotempo App 

Auto-merging test/models/vehicle_test.rb
Auto-merging test/models/route_test.rb
Auto-merging test/models/planning_test.rb
Auto-merging test/lib/devices/tomtom_test.rb
CONFLICT (content): Merge conflict in test/lib/devices/tomtom_test.rb
Auto-merging test/controllers/zonings_controller_test.rb
CONFLICT (content): Merge conflict in test/controllers/zonings_controller_test.rb
Auto-merging test/controllers/vehicle_usages_controller_test.rb
CONFLICT (content): Merge conflict in test/controllers/vehicle_usages_controller_test.rb
Auto-merging test/controllers/plannings_controller_test.rb
Auto-merging test/api/v01/plannings_test.rb
Auto-merging test/api/v01/destinations_test.rb
Auto-merging lib/optim/optimizer_wrapper.rb
Auto-merging db/structure.sql
CONFLICT (content): Merge conflict in db/structure.sql
Auto-merging db/migrate/20180219090520_change_hstore_to_jsonb.rb
CONFLICT (add/add): Merge conflict in db/migrate/20180219090520_change_hstore_to_jsonb.rb
Auto-merging config/locales/pt.yml
CONFLICT (content): Merge conflict in config/locales/pt.yml
Auto-merging config/locales/en.devices.yml
Auto-merging app/views/vehicle_usages/_form.html.erb
Auto-merging app/views/customers/_form.html.erb
Auto-merging app/models/vehicle.rb
Auto-merging app/models/route.rb
Auto-merging app/models/planning.rb
CONFLICT (content): Merge conflict in app/models/planning.rb
Auto-merging app/models/customer.rb
Auto-merging app/jobs/importer_destinations.rb
Auto-merging app/controllers/vehicle_usages_controller.rb
Auto-merging app/controllers/plannings_controller.rb
Auto-merging app/controllers/customers_controller.rb
Auto-merging app/controllers/application_controller.rb
CONFLICT (content): Merge conflict in app/controllers/application_controller.rb
Auto-merging app/assets/javascripts/scaffolds.js
Auto-merging app/assets/javascripts/routes_layers.js
CONFLICT (content): Merge conflict in app/assets/javascripts/routes_layers.js
Auto-merging app/assets/javascripts/destinations.js.erb
CONFLICT (content): Merge conflict in app/assets/javascripts/destinations.js.erb
Auto-merging app/api/v01/plannings.rb
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago
User avatar admin

Failed merge on repository

Mapotempo App / Mapotempo App 

Auto-merging test/models/vehicle_test.rb
Auto-merging test/models/route_test.rb
Auto-merging test/models/planning_test.rb
Auto-merging test/lib/devices/tomtom_test.rb
CONFLICT (content): Merge conflict in test/lib/devices/tomtom_test.rb
Auto-merging test/controllers/zonings_controller_test.rb
CONFLICT (content): Merge conflict in test/controllers/zonings_controller_test.rb
Auto-merging test/controllers/vehicle_usages_controller_test.rb
CONFLICT (content): Merge conflict in test/controllers/vehicle_usages_controller_test.rb
Auto-merging test/controllers/plannings_controller_test.rb
Auto-merging test/api/v01/plannings_test.rb
Auto-merging test/api/v01/destinations_test.rb
Auto-merging lib/optim/optimizer_wrapper.rb
Auto-merging db/structure.sql
CONFLICT (content): Merge conflict in db/structure.sql
Auto-merging db/migrate/20180219090520_change_hstore_to_jsonb.rb
CONFLICT (add/add): Merge conflict in db/migrate/20180219090520_change_hstore_to_jsonb.rb
Auto-merging config/locales/pt.yml
CONFLICT (content): Merge conflict in config/locales/pt.yml
Auto-merging config/locales/en.devices.yml
Auto-merging app/views/vehicle_usages/_form.html.erb
Auto-merging app/views/customers/_form.html.erb
Auto-merging app/models/vehicle.rb
Auto-merging app/models/route.rb
Auto-merging app/models/planning.rb
CONFLICT (content): Merge conflict in app/models/planning.rb
Auto-merging app/models/customer.rb
Auto-merging app/jobs/importer_destinations.rb
Auto-merging app/controllers/vehicle_usages_controller.rb
Auto-merging app/controllers/plannings_controller.rb
Auto-merging app/controllers/customers_controller.rb
Auto-merging app/controllers/application_controller.rb
CONFLICT (content): Merge conflict in app/controllers/application_controller.rb
Auto-merging app/assets/javascripts/scaffolds.js
Auto-merging app/assets/javascripts/routes_layers.js
CONFLICT (content): Merge conflict in app/assets/javascripts/routes_layers.js
Auto-merging app/assets/javascripts/destinations.js.erb
CONFLICT (content): Merge conflict in app/assets/javascripts/destinations.js.erb
Auto-merging app/api/v01/plannings.rb
Automatic merge failed; fix conflicts and then commit the result. (1)
7 years ago

Search