Compare commits
merge into: s416084:master
s416084:master
s416084:develop
s416084:fix-modal-after-login
s416084:login-activity-rx
s416084:rewrite-whitelist-service
s416084:sharingTabLimitationFixes
s416084:fix-enable-presence-on-wmi
s416084:fix-sharing-gps
s416084:statusFix
s416084:fix-battery-prompt-5.1
s416084:fix-info-battery-prompt
s416084:presence-wifi-approach
s416084:fix-acra
s416084:fix-battery-prompt
s416084:add-beta-student-security
s416084:fix-login-form
s416084:batteryExclusion
s416084:fix-last-seen
s416084:add-google-analytics
s416084:userListEnchancment
s416084:fix-back-button
s416084:users-list-last-seen
s416084:fix-tutor-tab-ui
s416084:fix-offline-box
s416084:add-toggle-password-login
s416084:fix-trans
s416084:floorsManualLoc
s416084:fix-strings
s416084:change-user-list
s416084:fix-manual-without-pref
s416084:fix-manula-bg
s416084:profileUIfix
s416084:sharingTabFixes
s416084:fix-pref-sharing
s416084:newProfile
s416084:profileNewUI
s416084:bottomNavFix
s416084:fix-bugs-related-to-network
s416084:improve-rx-java-blacklists
s416084:showOnMap
s416084:addRemovingManuals
s416084:fix-blacklists
s416084:add-slider
s416084:blackNwhiteLists
s416084:text-fixes
s416084:user-search-query-approach
s416084:bg-fused-done
s416084:search-user-backend
s416084:fix-users-list-UI
s416084:fix-keyboard-layout
s416084:improve-manual-sharing
s416084:online-offline-list
s416084:fix-bg-power-saving
s416084:fix-background-loc
s416084:minor-text-fixes
s416084:improve-BG-battery
s416084:fix-presence-mode
s416084:add-scrap-button
s416084:fix-hints-content
s416084:fix-colors
s416084:fix-tutor-tab-develop
s416084:tempBranch
s416084:extendTutorTab
s416084:fix-manual-sharing
s416084:extendTutorTabVol2
s416084:infoIcons
s416084:fixUXSharingTab
s416084:markers-clusters
s416084:fix-user-list
s416084:one-cord-per-user
s416084:PR-master-auto-online
s416084:fmt-296
s416084:bg-task-increase-interval
s416084:fix-fetching-coords-in-map
s416084:acraReporter
s416084:fix-sharing-active-id
s416084:fix-ssl-config
s416084:fix-approx-loc
s416084:improve-user-modal
s416084:android7okhttpQuickFix3dec
s416084:ACRA
s416084:developMieszko27nov
s416084:BG-improvements
s416084:alpha4
s416084:developMieszko27novVolII
s416084:tutorProfile
s416084:saveManualLocation
s416084:fix-login-as-student
s416084:markers-types
s416084:mapManualLocation
s416084:mapManualLocationHover
s416084:mapManualLocationBug/locationLevel
s416084:tutorTab
s416084:devToMasterAlpha3
s416084:sendFeedbackAndBugToDrawer
s416084:approximated-localizations
s416084:minorUiFixes
s416084:mapBoundsArea
s416084:firstReleseToMaster
s416084:apk_releases
s416084:developToMapPravilnie
s416084:change-user-login-data
s416084:attachedSharingTabToBacgroundTask
s416084:mapPravilnie
s416084:fix-android-permissions
s416084:multilangual-version
s416084:shared-settings-handle-background-task
s416084:tutors-list-activity
s416084:logging-activity-ldap
s416084:fixedDrawerNavigation
s416084:backToMainActivity
s416084:tutorList
s416084:fix-background-task-timer
s416084:markers
s416084:sharing-tab-rest
s416084:mapBoxsToDevelop
s416084:loginRememberFix1
s416084:settingsActivity
s416084:background-task-android-6
s416084:background-to-merge
s416084:mapBoxs
s416084:background-task
s416084:fragsToActs
s416084:navDrawerAndTopToolbar
s416084:workManagerLocalization
s416084:feature/roleDependentLayout
s416084:bottomNaviWithFrags
s416084:feature/login-role-switch
s416084:service-models-coordinates
s416084:feature-get-tutors-list
s416084:feature/user-service
s416084:1.0.0
s416084:0.9.5-beta-fix-presence
s416084:0.9.5-beta18
s416084:0.9.2-alpha
s416084:0.9.0-alpha10
s416084:0.9.1-alpha-code-version-9
s416084:0.9.1-alpha
s416084:0.9.0-alpha3
s416084:0.9.0-alpha
...
pull from: s416084:add-beta-student-security
s416084:develop
s416084:fix-modal-after-login
s416084:login-activity-rx
s416084:rewrite-whitelist-service
s416084:sharingTabLimitationFixes
s416084:fix-enable-presence-on-wmi
s416084:fix-sharing-gps
s416084:statusFix
s416084:master
s416084:fix-battery-prompt-5.1
s416084:fix-info-battery-prompt
s416084:presence-wifi-approach
s416084:fix-acra
s416084:fix-battery-prompt
s416084:add-beta-student-security
s416084:fix-login-form
s416084:batteryExclusion
s416084:fix-last-seen
s416084:add-google-analytics
s416084:userListEnchancment
s416084:fix-back-button
s416084:users-list-last-seen
s416084:fix-tutor-tab-ui
s416084:fix-offline-box
s416084:add-toggle-password-login
s416084:fix-trans
s416084:floorsManualLoc
s416084:fix-strings
s416084:change-user-list
s416084:fix-manual-without-pref
s416084:fix-manula-bg
s416084:profileUIfix
s416084:sharingTabFixes
s416084:fix-pref-sharing
s416084:newProfile
s416084:profileNewUI
s416084:bottomNavFix
s416084:fix-bugs-related-to-network
s416084:improve-rx-java-blacklists
s416084:showOnMap
s416084:addRemovingManuals
s416084:fix-blacklists
s416084:add-slider
s416084:blackNwhiteLists
s416084:text-fixes
s416084:user-search-query-approach
s416084:bg-fused-done
s416084:search-user-backend
s416084:fix-users-list-UI
s416084:fix-keyboard-layout
s416084:improve-manual-sharing
s416084:online-offline-list
s416084:fix-bg-power-saving
s416084:fix-background-loc
s416084:minor-text-fixes
s416084:improve-BG-battery
s416084:fix-presence-mode
s416084:add-scrap-button
s416084:fix-hints-content
s416084:fix-colors
s416084:fix-tutor-tab-develop
s416084:tempBranch
s416084:extendTutorTab
s416084:fix-manual-sharing
s416084:extendTutorTabVol2
s416084:infoIcons
s416084:fixUXSharingTab
s416084:markers-clusters
s416084:fix-user-list
s416084:one-cord-per-user
s416084:PR-master-auto-online
s416084:fmt-296
s416084:bg-task-increase-interval
s416084:fix-fetching-coords-in-map
s416084:acraReporter
s416084:fix-sharing-active-id
s416084:fix-ssl-config
s416084:fix-approx-loc
s416084:improve-user-modal
s416084:android7okhttpQuickFix3dec
s416084:ACRA
s416084:developMieszko27nov
s416084:BG-improvements
s416084:alpha4
s416084:developMieszko27novVolII
s416084:tutorProfile
s416084:saveManualLocation
s416084:fix-login-as-student
s416084:markers-types
s416084:mapManualLocation
s416084:mapManualLocationHover
s416084:mapManualLocationBug/locationLevel
s416084:tutorTab
s416084:devToMasterAlpha3
s416084:sendFeedbackAndBugToDrawer
s416084:approximated-localizations
s416084:minorUiFixes
s416084:mapBoundsArea
s416084:firstReleseToMaster
s416084:apk_releases
s416084:developToMapPravilnie
s416084:change-user-login-data
s416084:attachedSharingTabToBacgroundTask
s416084:mapPravilnie
s416084:fix-android-permissions
s416084:multilangual-version
s416084:shared-settings-handle-background-task
s416084:tutors-list-activity
s416084:logging-activity-ldap
s416084:fixedDrawerNavigation
s416084:backToMainActivity
s416084:tutorList
s416084:fix-background-task-timer
s416084:markers
s416084:sharing-tab-rest
s416084:mapBoxsToDevelop
s416084:loginRememberFix1
s416084:settingsActivity
s416084:background-task-android-6
s416084:background-to-merge
s416084:mapBoxs
s416084:background-task
s416084:fragsToActs
s416084:navDrawerAndTopToolbar
s416084:workManagerLocalization
s416084:feature/roleDependentLayout
s416084:bottomNaviWithFrags
s416084:feature/login-role-switch
s416084:service-models-coordinates
s416084:feature-get-tutors-list
s416084:feature/user-service
s416084:1.0.0
s416084:0.9.5-beta-fix-presence
s416084:0.9.5-beta18
s416084:0.9.2-alpha
s416084:0.9.0-alpha10
s416084:0.9.1-alpha-code-version-9
s416084:0.9.1-alpha
s416084:0.9.0-alpha3
s416084:0.9.0-alpha
These branches are equal. There is no need to create a pull request.