HSLdevcom / parkandrideAPI

84%

master: 90%

LAST BUILD ON BRANCH style-responsive

branch: style-responsive

CHANGE BRANCH

x

Reset

• style-responsive
• HSLstyling
• LIIP-131
• LIIP-133
• LIIP-140
• LIIP-147
• LIIP-150
• LIIP-151
• LIIP-152
• LIIP-153
• LIIP-156
• LIIP-157
• LIIP-161
• LIIP-184
• LIIP-186
• LIIP-189
• LIIP-209
• LIIP-256
• LIIP-260
• LIIP-261
• LIIP-49
• LIIP-87
• LIIP30-list-all-facilities
• about-tab
• action-log
• admin-as-permission
• angular-ui-select-update
• area-fix
• auth-troubleshoot
• authorization
• authorization-fix
• aws-doc
• beans-coverage
• bootstrap-grid-fix
• build-cleanup
• build-speedup
• capacities-as-object
• capacity-pricing
• capacity-pricing-ui
• capacity-type-path-translator
• change-password
• combine-hubs-and-facilities
• contact-info
• content-styles
• controller-as
• coordinate-validation-message-fix
• coordinates-validator
• copyright
• cors
• create-facility-contact
• custom-pricing-fix
• day-type-fix
• deadcode
• deploy-demo
• dev-subnet-nexus
• dev-subnet-proxy
• disable-edit-user
• disable-operator-select
• disallow-numbers-for-enums
• docker-deploy-for-testenv
• dockerless-deploy
• docs-base-url
• documentation
• dynamic-hub-facilities
• e2e-bash
• e2e-grunt
• e2e-hubs
• e2e-maven
• e2e-refactor
• e2e-unlink-facility
• e2e-xvfb
• edit-capacities
• enum
• enumerations
• facilities-list
• facilities-summary
• facility-contact-view
• facility-contacts
• facility-hubs
• facility-operator
• facility-operator-validation
• facility-status
• facility-usages-materialization-on-create-fix
• find-all
• first-report
• fix-grunt
• fix-validation-2
• front-validation-fix
• gate-addresses
• gates
• getters-n-setters
• gocd-agent-upgrade
• gocd-troubleshooting
• gocd-vnc
• help-texts
• hub-address
• hub-and-facilities-list
• hub-facilities
• hub-search
• hubs
• hubs-api
• indexes
• indexes-refined
• istonikula-stateful-service-poc
• liip-119
• liip-121
• liip-123
• liip-123-be
• liip-123-v2
• liip-124
• liip-128
• liip-129
• liip-130
• liip-73-fullscreen-fix
• liip-76
• logging
• login-tests
• logout
• map-directive
• map-info
• map-no-tiles-2
• master
• media-type-exception
• multilingual-data-backend
• multilingual-string-tests
• nexus-upgrade
• nodev
• non-negative-built-capacity
• not-null-elements
• opening-hours
• operators
• order-by
• payment-methods
• pornainen
• port-tests
• prediction
• predictions
• pricing-improvements
• pricing-method
• pricing-price
• pricing-table-buttons
• pricing-table-fix
• pricing-tests
• protractor-config
• protractor-coverage
• rds
• refactor-auth-pageobject
• refactor-dev-utils
• refactor-protractor
• refactor-resource-loading
• refactor-resources
• refactor-sweetalert
• refresh-contacts
• regions
• remove-contact-search-by-name
• report-filtering
• rest-test
• review-fixes
• sass
• screenshot
• search
• search-demo
• secondary-navi-fix
• select-all-pricing-rows
• services
• spring-boot-1.2.1
• spring-boot-gh-2121
• spring-boot-upgrade
• stateful-service-poc
• style-checkbox-fix
• style-column-fix
• style-column-mixin
• style-contacts
• style-cursor
• style-navigation
• style-pricing
• style-services
• style-status
• style-user-admin
• style-user-management
• styling
• submit-button
• swagger-docs
• sweet-alert-styling
• tabs
• test-agent2
• test-contacts
• test-data-page
• timezone
• tomcat
• translates
• ui-auth
• ui-default-data
• ui-dev
• ui-fixes
• ui-naming-conventions
• ui-select-fix
• ui-study
• ui-validations
• unavailable-capacity
• unique-names
• unused-code-cleanup
• update-ol3
• usages-materialization
• utilization
• utilization-checks
• validation
• version
• view-ports
• violations-refactor
• wkt-parser

chore(merge): Merge branch 'master' into style-responsive

Conflicts:
	application/src/main/frontend/src/app/contacts/contactListNavi.tpl.html
	application/src/main/frontend/src/app/facilities/facilityEditNavi.tpl.html
	application/src/main/frontend/src/app/facilities/facilityViewNavi.tpl.html
	application/src/main/frontend/src/app/hubs/hubEditNavi.tpl.html
	application/src/main/frontend/src/app/hubs/hubListNavi.tpl.html
	application/src/main/frontend/src/app/hubs/hubViewNavi.tpl.html
	application/src/main/frontend/src/app/operators/operatorListNavi.tpl.html