find-my-tutor-android

s416084/find-my-tutor-android

Fork 0

Commit Graph

Select branches

Hide Pull Requests

ACRA

BG-improvements

PR-master-auto-online

acraReporter

add-beta-student-security

add-google-analytics

add-scrap-button

add-slider

add-toggle-password-login

addRemovingManuals

alpha4

android7okhttpQuickFix3dec

apk_releases

approximated-localizations

attachedSharingTabToBacgroundTask

backToMainActivity

background-task

background-task-android-6

background-to-merge

batteryExclusion

bg-fused-done

bg-task-increase-interval

blackNwhiteLists

bottomNavFix

bottomNaviWithFrags

change-user-list

change-user-login-data

devToMasterAlpha3

develop

developMieszko27nov

developMieszko27novVolII

developToMapPravilnie

extendTutorTab

extendTutorTabVol2

feature-get-tutors-list

feature/login-role-switch

feature/roleDependentLayout

feature/user-service

firstReleseToMaster

fix-acra

fix-android-permissions

fix-approx-loc

fix-back-button

fix-background-loc

fix-background-task-timer

fix-battery-prompt

fix-battery-prompt-5.1

fix-bg-power-saving

fix-blacklists

fix-bugs-related-to-network

fix-colors

fix-enable-presence-on-wmi

fix-fetching-coords-in-map

fix-hints-content

fix-info-battery-prompt

fix-keyboard-layout

fix-last-seen

fix-login-as-student

fix-login-form

fix-manual-sharing

fix-manual-without-pref

fix-manula-bg

fix-modal-after-login

fix-offline-box

fix-pref-sharing

fix-presence-mode

fix-sharing-active-id

fix-sharing-gps

fix-ssl-config

fix-strings

fix-trans

fix-tutor-tab-develop

fix-tutor-tab-ui

fix-user-list

fix-users-list-UI

fixUXSharingTab

fixedDrawerNavigation

floorsManualLoc

fmt-296

fragsToActs

improve-BG-battery

improve-manual-sharing

improve-rx-java-blacklists

improve-user-modal

infoIcons

logging-activity-ldap

login-activity-rx

loginRememberFix1

mapBoundsArea

mapBoxs

mapBoxsToDevelop

mapManualLocation

mapManualLocationBug/locationLevel

mapManualLocationHover

mapPravilnie

markers

markers-clusters

markers-types

master

minor-text-fixes

minorUiFixes

multilangual-version

navDrawerAndTopToolbar

newProfile

one-cord-per-user

online-offline-list

presence-wifi-approach

profileNewUI

profileUIfix

rewrite-whitelist-service

saveManualLocation

search-user-backend

sendFeedbackAndBugToDrawer

service-models-coordinates

settingsActivity

shared-settings-handle-background-task

sharing-tab-rest

sharingTabFixes

sharingTabLimitationFixes

showOnMap

statusFix

tempBranch

text-fixes

tutorList

tutorProfile

tutorTab

tutors-list-activity

user-search-query-approach

userListEnchancment

users-list-last-seen

workManagerLocalization

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

0.9.0-alpha

0.9.0-alpha10

0.9.0-alpha3

0.9.1-alpha

0.9.1-alpha-code-version-9

0.9.2-alpha

0.9.5-beta-fix-presence

0.9.5-beta18

1.0.0

fc428451a9 map info pop up Domagalski 2018-12-08 13:20:03 +0100
5fe12a3f4b Merge branch 'fixUXSharingTab' of s416084/find-my-tutor-android into develop Marcin Jedyński 2018-12-08 09:57:43 +0000
3344449bf4 fixed choosing/viewing values from sharing tab #77 Marcin Jedynski 2018-12-08 10:55:53 +0100
1abae28ae9 Merge branch 'mapboxUpgrade' of s416084/find-my-tutor-android into develop Adam Domagalski 2018-12-08 09:13:31 +0000
3a38c1052d mapbox update + acra switch in settings #76 Domagalski 2018-12-08 10:10:53 +0100
c8e49af5da Increase build version Mieszko Wrzeszczyński 2018-12-07 19:16:29 +0100
e5f7a81c9a Merge branch 'develop' of s416084/find-my-tutor-android into master 0.9.2-alpha Mieszko Wrzeszczyński 2018-12-07 18:01:01 +0000
80cd393cc9 Merge branch 'PR-master-auto-online' of s416084/find-my-tutor-android into develop #75 Mieszko Wrzeszczyński 2018-12-07 18:00:13 +0000
fd49c66ee1 Adjust to master #74 PR-master-auto-online Mieszko Wrzeszczyński 2018-12-07 18:59:30 +0100
77ddbc39a5 Merge branch 'develop' into PR-master-auto-online Mieszko Wrzeszczyński 2018-12-07 18:58:02 +0100
527701420b Add onfline and offline zones Mieszko Wrzeszczyński 2018-12-07 18:57:26 +0100
f177b80fa4 Merge branch 'develop' into infoIcons Adam Domagalski 2018-12-07 15:18:15 +0100
f8abf61553 no misleading values but summary mising on fragment reload marcin.jedynski 2018-12-07 02:59:01 +0100
5a8ec2d9fc Merge branch 'fmt-296' of s416084/find-my-tutor-android into develop Marcin Jedyński 2018-12-06 23:08:27 +0000
a9469cce76 reverted api url back to master #73 fmt-296 marcin.jedynski 2018-12-06 23:58:47 +0100
26e12d68f3 Merge branch 'PR-master-auto-online' of s416084/find-my-tutor-android into master Mieszko Wrzeszczyński 2018-12-06 22:38:02 +0000
d735950e7a Merge #72 Mieszko Wrzeszczyński 2018-12-06 23:37:22 +0100
ca91124b8f Merge branch 'master' into PR-master-auto-online Mieszko Wrzeszczyński 2018-12-06 23:28:21 +0100
8f6a07acea Merge branch 'develop' of git.wmi.amu.edu.pl:s416084/find-my-tutor-android into develop marcin.jedynski 2018-12-06 22:45:15 +0100
8a44eaa8d0 Merge branch 'bg-task-increase-interval' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-12-06 21:39:57 +0000
c96e19cb2d Fix map #70 bg-task-increase-interval Mieszko Wrzeszczyński 2018-12-06 22:38:22 +0100
367bc7518e fixed toast on send feedback, minor model adjustment of feedback marcin.jedynski 2018-12-06 22:31:02 +0100
0182d2e041 Merge branch 'develop' into bg-task-increase-interval Mieszko Wrzeszczyński 2018-12-06 22:00:04 +0100
d9909a66bd Adjust to develop Mieszko Wrzeszczyński 2018-12-06 21:59:37 +0100
0cec17dd16 Create handlers for coming in and out from building Mieszko Wrzeszczyński 2018-12-06 21:32:13 +0100
8be7d3aa11 Merge branch 'fix-fetching-coords-in-map' of s416084/find-my-tutor-android into develop Adam Domagalski 2018-12-05 23:59:19 +0000
b4dd785504 map ico info in progress Domagalski 2018-12-06 00:57:53 +0100
57702fd3a1 Merge branch 'develop' into fix-fetching-coords-in-map #69 fix-fetching-coords-in-map Mieszko Wrzeszczyński 2018-12-05 23:39:04 +0100
381373b4b7 Fetch markers only when screen is on Mieszko Wrzeszczyński 2018-12-05 23:38:13 +0100
45dac22ec4 Merge branch 'acraReporter' of s416084/find-my-tutor-android into develop Adam Domagalski 2018-12-05 21:49:52 +0000
0dd0b0dc23 added some translation and removed throwing error for testing #68 acraReporter Domagalski 2018-12-05 22:45:11 +0100
d1adf451a0 Merge branch 'develop' into acraReporter Domagalski 2018-12-05 21:26:12 +0100
261002d131 Merge branch 'develop' of s416084/find-my-tutor-android into master #71 Mieszko Wrzeszczyński 2018-12-05 13:25:24 +0000
899fb9958b Merge branch 'fix-sharing-active-id' of s416084/find-my-tutor-android into develop #67 Mieszko Wrzeszczyński 2018-12-05 13:23:49 +0000
ce3d261c48 Merge branch 'develop' into fix-sharing-active-id #66 fix-sharing-active-id Mieszko Wrzeszczyński 2018-12-05 14:22:37 +0100
7fb1d90ab7 Increase build version Mieszko Wrzeszczyński 2018-12-05 14:22:04 +0100
e095e9069f Merge branch 'fix-sharing-active-id' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-12-05 13:18:56 +0000
f0f1e59947 Fix default value #65 Mieszko Wrzeszczyński 2018-12-05 14:17:34 +0100
118296aa03 Merge branch 'develop' of s416084/find-my-tutor-android into master Mieszko Wrzeszczyński 2018-12-05 11:41:14 +0000
9c9402c8c1 Merge branch 'fix-ssl-config' of s416084/find-my-tutor-android into develop #64 Mieszko Wrzeszczyński 2018-12-05 11:40:56 +0000
2ca64a66ba Rollback ssl config #63 fix-ssl-config Mieszko Wrzeszczyński 2018-12-05 12:25:31 +0100
3eed883079 Merge branch 'develop' of s416084/find-my-tutor-android into master Mieszko Wrzeszczyński 2018-12-05 09:04:20 +0000
fc4f49c3e0 Merge branch 'fix-approx-loc' of s416084/find-my-tutor-android into develop #62 Mieszko Wrzeszczyński 2018-12-05 09:03:45 +0000
b2e5a0e0c5 Fix unknown location #61 fix-approx-loc Mieszko Wrzeszczyński 2018-12-05 09:59:18 +0100
5e51be5d0b First attempt Mieszko Wrzeszczyński 2018-12-05 00:45:16 +0100
5fc5140866 Merge branch 'improve-user-modal' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-12-04 21:23:09 +0000
76c3ba5054 Change app icon #60 improve-user-modal Mieszko Wrzeszczyński 2018-12-04 22:18:16 +0100
15529eccb4 Merge branch 'master' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-12-04 20:37:06 +0000
7174d7d117 Merge branch 'android7okhttpQuickFix3dec' of s416084/find-my-tutor-android into master 0.9.0-alpha10 #59 Adam Domagalski 2018-12-03 15:04:47 +0000
e3e88d168f eliptic curve cipher TLS change for android 7 nougat #58 android7okhttpQuickFix3dec Adam Domagalski 2018-12-03 16:00:35 +0100
6115958efb Add Lato font & improve user modal Mieszko Wrzeszczyński 2018-12-02 22:15:39 +0100
f3f2f3b90a acra wtih intented crash on manual loc select Adam Domagalski 2018-12-02 21:29:47 +0100
ee6d11fe44 Improve colors & margins Mieszko Wrzeszczyński 2018-12-02 16:28:20 +0100
7c1b9e4494 Merge branch 'develop' of s416084/find-my-tutor-android into master 0.9.1-alpha-code-version-9 Mieszko Wrzeszczyński 2018-12-01 16:13:12 +0000
7ef6e088a6 acra test ACRA Adam Domagalski 2018-12-01 16:48:33 +0100
957cee1b23 Merge branch 'developMieszko27nov' of s416084/find-my-tutor-android into develop #57 Adam Domagalski 2018-12-01 11:46:54 +0000
eb1ab75d6d Merge branch 'develop' into developMieszko27nov #56 developMieszko27nov Mieszko Wrzeszczyński 2018-12-01 11:50:17 +0100
c05d03a4d0 Fix partially manual predefined locations Mieszko Wrzeszczyński 2018-12-01 11:49:27 +0100
a7ba5bf27c Merge branch 'developMieszko27nov' of s416084/find-my-tutor-android into master 0.9.1-alpha Mieszko Wrzeszczyński 2018-11-29 21:35:16 +0000
a52e5dd89b Increase version #55 Mieszko Wrzeszczyński 2018-11-29 22:34:31 +0100
79d48bb269 Fix BG & markers filter & boundaries Mieszko Wrzeszczyński 2018-11-29 22:31:47 +0100
f6cfb7f352 Version to deploy Mieszko Wrzeszczyński 2018-11-29 12:15:58 +0100
1e07168725 adjuested feedback model marcin.jedynski 2018-11-28 18:37:48 +0100
d7bc56f5f9 adjust code to master Mieszko Wrzeszczyński 2018-11-28 09:37:38 +0100
a744c4d783 Improve BG BG-improvements Mieszko Wrzeszczyński 2018-11-28 09:21:41 +0100
1154366024 Improvements BG alpha4 Mieszko Wrzeszczyński 2018-11-28 01:31:36 +0100
cd3e058d51 dev to master enpoitn, fake validate to nomal, def functions removed Adam Domagalski 2018-11-27 21:22:57 +0100
72f2ac798a Merge branch 'developMieszko27nov' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-11-27 19:54:41 +0000
c452e5dbf5 Fix BG & UI #54 Mieszko Wrzeszczyński 2018-11-27 20:53:01 +0100
ab74f0b7e1 Fix manual pop up windows Mieszko Wrzeszczyński 2018-11-27 19:52:36 +0100
6bd3300768 pozar developMieszko27novVolII Adam Domagalski 2018-11-27 16:50:32 +0100
66dba76ed4 istutor bugifx map Adam Domagalski 2018-11-27 16:12:02 +0100
8fbce4d9d3 Merge branch 'tutorProfile' of s416084/find-my-tutor-android into develop Marcin Jedyński 2018-11-27 13:52:39 +0000
e96981c8b9 fixed post update tutortab #53 tutorProfile Marcin Jedynski 2018-11-27 14:51:55 +0100
519115ed5e Merge branch 'tutorProfile' of s416084/find-my-tutor-android into develop Marcin Jedyński 2018-11-27 12:09:41 +0000
c43aabf739 added save/fetch functionality to tutortab #52 Marcin Jedynski 2018-11-27 13:03:45 +0100
6dbe50761a Fix retrofit rxjava Mieszko Wrzeszczyński 2018-11-27 11:45:50 +0100
2b19229552 added icons, translations, renamed activites in manifest marcin.jedynski 2018-11-27 11:40:02 +0100
abbd887db7 added basic layout and fetching of profile activity, but save note not implemented yet, got some problems marcin.jedynski 2018-11-27 06:51:49 +0100
6684274488 Merge branch 'saveManualLocation' of s416084/find-my-tutor-android into develop Marcin Jedyński 2018-11-27 05:33:39 +0000
50ef5b1e8b merge #51 saveManualLocation marcin.jedynski 2018-11-27 06:21:19 +0100
bbc7803177 added handling of choosing manual location from list in sharing tab marcin.jedynski 2018-11-27 03:10:33 +0100
3177b43f26 Merge branch 'fix-login-as-student' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-11-26 23:27:38 +0000
012f2af3f2 Fix login #50 fix-login-as-student Mieszko Wrzeszczyński 2018-11-27 00:26:43 +0100
db3ac7378c Merge branch 'markers-types' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-11-26 23:17:43 +0000
789a2dbaf1 Merge from dev #49 markers-types Mieszko Wrzeszczyński 2018-11-27 00:16:36 +0100
ba67a8b088 Add predifined Mieszko Wrzeszczyński 2018-11-27 00:00:37 +0100
52ff05767e Merge branch 'mapManualLocation' of s416084/find-my-tutor-android into develop Adam Domagalski 2018-11-26 22:57:48 +0000
64082727b2 static marker bug removal #48 mapManualLocation Adam Domagalski 2018-11-26 23:54:12 +0100
9b291117ef temporary timestamp check for removing marker Adam Domagalski 2018-11-26 23:04:35 +0100
2cd51e9920 hovering marker mapManualLocationHover Adam Domagalski 2018-11-26 21:34:10 +0100
493395d36a moved manualLocation logic from MapActivity to ManualLocationUtils marcin.jedynski 2018-11-26 20:54:54 +0100
3a2c4f10d4 Improve marker browser Mieszko Wrzeszczyński 2018-11-26 20:22:04 +0100
b14052eb21 Merge branch 'mapManualLocationBug/locationLevel' of s416084/find-my-tutor-android into mapManualLocation Adam Domagalski 2018-11-26 16:17:54 +0000
854ddadeea fixed switching location mode, adding custom status, and switching on location service when choosing manual location from map tab #47 mapManualLocationBug/locationLevel marcin.jedynski 2018-11-26 16:21:29 +0100
35ba11129c added fake validate marcin.jedynski 2018-11-26 13:02:38 +0100
144d11528e fixed == to equals in sharfrag switched to fakevalidate tutorTab marcin.jedynski 2018-11-26 10:53:46 +0100
ffff4bb7c0 green locs bug fixed Adam Domagalski 2018-11-26 09:13:27 +0100
da944c37d5 manual location connected to sharing tab and uses bg task for sending cors Adam Domagalski 2018-11-26 00:46:36 +0100
f0df7b7440 Add proper markers icons Mieszko Wrzeszczyński 2018-11-25 22:27:57 +0100