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

aef7174d90 Add new markers Mieszko Wrzeszczyński 2018-11-24 00:11:06 +0100
422b1079da Change icon when user change localization level Mieszko Wrzeszczyński 2018-11-23 23:36:04 +0100
73fc5f9b0b Add default icon for each type of localization Mieszko Wrzeszczyński 2018-11-23 22:27:59 +0100
554c2f7bfa Merge branch 'devToMasterAlpha3' of s416084/find-my-tutor-android into master 0.9.0-alpha3 Adam Domagalski 2018-11-22 12:42:44 +0000
ac27fc3f34 alpha3 without dev fucnitons #46 #45 devToMasterAlpha3 Adam Domagalski 2018-11-22 13:39:48 +0100
fca6cd936c Merge branch 'mapManualLocation' of s416084/find-my-tutor-android into develop Adam Domagalski 2018-11-22 11:45:13 +0000
4eb721fb1a button add rm manual quick fix #44 Adam Domagalski 2018-11-22 12:41:44 +0100
be6a487a92 Merge branch 'sendFeedbackAndBugToDrawer' of s416084/find-my-tutor-android into develop Marcin Jedyński 2018-11-21 07:49:44 +0000
2b4e2d3b99 merge v2 #41 sendFeedbackAndBugToDrawer marcin.jedynski 2018-11-21 08:46:06 +0100
f4ea4a4378 Merge branch 'approximated-localizations' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-11-21 07:37:49 +0000
b75e3e5ae3 Improve logging #43 approximated-localizations Mieszko Wrzeszczyński 2018-11-21 08:37:23 +0100
18841ab372 Merge branch 'develop' into approximated-localizations Mieszko Wrzeszczyński 2018-11-21 08:13:19 +0100
fce151be6f Change endpoint for users Mieszko Wrzeszczyński 2018-11-21 08:11:48 +0100
6fb4b655d8 Merge branch 'minorUiFixes' of s416084/find-my-tutor-android into develop Marcin Jedyński 2018-11-21 04:01:21 +0000
b8eedc565c hiden tutor portion of drawer if student logged in #42 minorUiFixes marcin.jedynski 2018-11-21 04:59:50 +0100
f2357c846e merge marcin.jedynski 2018-11-21 04:38:36 +0100
8c9eb2c706 filled strings with polish names marcin.jedynski 2018-11-21 04:23:22 +0100
662b8c29c4 predefined status service linked to backend marcin.jedynski 2018-11-21 03:38:53 +0100
955f823b25 Merge branch 'mapManualLocation' of s416084/find-my-tutor-android into develop Adam Domagalski 2018-11-20 23:47:23 +0000
ffcc68c107 markers resizing #40 Adam Domagalski 2018-11-21 00:43:42 +0100
549c2f6484 small modifs Adam Domagalski 2018-11-21 00:27:22 +0100
66de4ffa1d ... Adam Domagalski 2018-11-21 00:14:25 +0100
86cafe1d5a Merge branch 'mapManualLocation' into tmp20nov Adam Domagalski 2018-11-20 23:58:35 +0100
18900340ee Merge branch 'approximated-localizations' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-11-20 22:47:40 +0000
688341e072 Remove crosshair from map #39 Mieszko Wrzeszczyński 2018-11-20 23:46:38 +0100
8a29b93533 Revert to LDAP login Mieszko Wrzeszczyński 2018-11-20 23:23:44 +0100
70001e36c3 cancel button improved handle runnable for tmp sending manual location Adam Domagalski 2018-11-20 22:56:30 +0100
5e1e3b5bce Merge branch 'approximated-localizations' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-11-20 21:44:52 +0000
157855d911 Merge with dev #38 Mieszko Wrzeszczyński 2018-11-20 22:44:38 +0100
b02ec917ed Add markers filter Mieszko Wrzeszczyński 2018-11-20 22:29:07 +0100
d62c451adb button choose from map redirects to mapActivity marcin.jedynski 2018-11-20 15:26:42 +0100
892216cc0c Fix search button Mieszko Wrzeszczyński 2018-11-20 00:19:17 +0100
50a427313f Improve user search Mieszko Wrzeszczyński 2018-11-20 00:08:18 +0100
e1496ce65c Merge branch 'approximated-localizations' into mapManualLocation Adam Domagalski 2018-11-19 22:19:01 +0100
d5114a8587 Add presence mode Mieszko Wrzeszczyński 2018-11-19 11:49:28 +0100
aa3c2eb9b8 Send middle of polygon in approximated mode Mieszko Wrzeszczyński 2018-11-19 00:03:31 +0100
1acac4edc4 sharing tab redesigned marcin.jedynski 2018-11-18 16:26:59 +0100
b0e81d474e Merge branch 'sendFeedbackAndBugToDrawer' of s416084/find-my-tutor-android into develop Marcin Jedyński 2018-11-18 01:10:45 +0000
e0973ca732 manual merge to develop #37 marcin.jedynski 2018-11-18 02:10:25 +0100
5dad15f135 removed unused imports from baseactivity marcin.jedynski 2018-11-18 01:58:17 +0100
e664e00212 refactor, moved code from baseactivity to feedbackutils class marcin.jedynski 2018-11-18 01:53:07 +0100
49f47986f0 recon my own marker Adam Domagalski 2018-11-17 19:56:57 +0100
bb4831ec89 typo mapBoundsArea Adam Domagalski 2018-11-17 17:47:36 +0100
c04373a59c manual location fixing Adam Domagalski 2018-11-17 17:46:27 +0100
0aa87c44fa Merge branch 'mapBoundsArea' of s416084/find-my-tutor-android into develop Adam Domagalski 2018-11-17 15:33:42 +0000
fd9cb37fb3 bound area improvment, toggle bounding box in menu fab #36 Adam Domagalski 2018-11-17 16:30:52 +0100
8669e040b5 adjusted modals for feedback/bug Marcin Jedynski 2018-11-13 23:59:39 +0100
f89971d059 added feedback model and service, added sending feedback Marcin Jedynski 2018-11-13 12:16:01 +0100
5d3ba7e1a1 Merge branch 'mapBoundsArea' of s416084/find-my-tutor-android into develop Adam Domagalski 2018-11-12 21:19:50 +0000
8083b67fc4 code refractor - moved boundries method into mapUtils #35 Adam Domagalski 2018-11-12 19:26:41 +0100
bca8cb782b Map bound area for WMI added Adam Domagalski 2018-11-12 16:13:56 +0100
c9b4548f45 added modal asking for user data for bug/feedback report Marcin Jedynski 2018-11-12 00:51:35 +0100
1323c02b30 added code for sending email Marcin Jedynski 2018-11-11 19:55:17 +0100
9f23aae620 added bug icon to resources Marcin Jedynski 2018-11-11 15:54:35 +0100
35311af645 added string values and options to drawer Marcin Jedynski 2018-11-11 15:31:11 +0100
e34ccbb6d8 Merge branch 'develop' of s416084/find-my-tutor-android into master 0.9.0-alpha Adam Domagalski 2018-11-10 17:52:35 +0000
d1a249e5cf Merge branch 'firstReleseToMaster' of s416084/find-my-tutor-android into develop #34 Adam Domagalski 2018-11-10 17:48:32 +0000
b64280bf3f 1st alpha release #33 firstReleseToMaster Adam Domagalski 2018-11-10 18:35:53 +0100
77b7c50e4e Add approximated localization Mieszko Wrzeszczyński 2018-11-09 00:50:15 +0100
64b24cef1b Add approximated localizations Mieszko Wrzeszczyński 2018-11-09 00:49:09 +0100
9d532b48da New build version apk_releases Mieszko Wrzeszczyński 2018-11-07 10:41:45 +0100
200ffa5e97 New version Mieszko Wrzeszczyński 2018-11-07 09:32:41 +0100
647b030b81 Merge branch 'developToMapPravilnie' of s416084/find-my-tutor-android into develop developToMapPravilnie Mieszko Wrzeszczyński 2018-11-07 07:56:56 +0000
98cc5bcc20 Merge branch 'develop' into developToMapPravilnie #32 Mieszko Wrzeszczyński 2018-11-07 08:51:12 +0100
511d1a8fef Merge branch 'change-user-login-data' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-11-07 07:45:56 +0000
505e890f8b Add custom status & change userName #31 change-user-login-data Mieszko Wrzeszczyński 2018-11-07 08:45:09 +0100
5d595c4c65 if statemnt added in case of empty Adam Domagalski 2018-11-07 00:28:19 +0100
295be86eee Merge branch 'develop' into developToMapPravilnie Adam Domagalski 2018-11-07 00:01:41 +0100
9cd0f053e3 Merge branch 'developToMapPravilnie' of git.wmi.amu.edu.pl:s416084/find-my-tutor-android into developToMapPravilnie Adam Domagalski 2018-11-07 00:00:23 +0100
5f65d8e6fb marker removing Adam Domagalski 2018-11-06 23:51:46 +0100
1094ef942b Add FusedLocalizationApi Mieszko Wrzeszczyński 2018-11-06 23:50:13 +0100
c62b901c10 Merge branch 'developToMapPravilnie' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-11-06 09:35:38 +0000
b23d82d74d Merge from develop & add label to coordinate on map #30 Mieszko Wrzeszczyński 2018-11-06 10:30:27 +0100
ba4e097f86 Merge branch 'attachedSharingTabToBacgroundTask' of s416084/find-my-tutor-android into develop Marcin Jedyński 2018-11-06 02:06:56 +0000
5757a58edf adjusted background task and shared pref file to work together throught PrefUtils #29 attachedSharingTabToBacgroundTask Marcin Jedynski 2018-11-06 03:04:17 +0100
583305ff31 Add modal on marker click Mieszko Wrzeszczyński 2018-11-05 23:25:29 +0100
03235ce18b Handle properly background task life cycle Mieszko Wrzeszczyński 2018-11-05 10:37:25 +0100
03c38a8f23 Fix permissions Mieszko Wrzeszczyński 2018-11-05 10:04:32 +0100
8ca2f7dc31 button view gone Adam Domagalski 2018-11-05 01:22:09 +0100
90074affb1 * markerks fix Adam Domagalski 2018-11-05 00:29:49 +0100
98ee8d1a21 Merge branch 'developToMapPravilnie' of s416084/find-my-tutor-android into develop Adam Domagalski 2018-11-04 17:25:16 +0000
61f94c7beb clean up * animated marker onTap removed, * bg loc function removed * todos updated #28 Adam Domagalski 2018-11-04 18:15:54 +0100
2b53506651 ready to test and PR to develop Adam Domagalski 2018-11-04 13:24:45 +0100
1e40b77205 Merge branch 'develop' into developToMapPravilnie Adam Domagalski 2018-11-04 13:05:32 +0100
40101ef7d0 a mapPravilnie Adam Domagalski 2018-11-04 12:39:57 +0100
cad9f466c2 * location centre button with nice animation * location accuracyArea and direction indicator * POST on manual selection * removing markers after 5mins Adam Domagalski 2018-11-04 01:37:57 +0100
5ef2a188c6 new version from develop & fix logging & multilangual Mieszko Wrzeszczyński 2018-11-03 16:18:19 +0100
7189193dac Merge branch 'fix-android-permissions' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-11-03 15:16:38 +0000
64256d2d67 Update login validation #27 fix-android-permissions Mieszko Wrzeszczyński 2018-11-03 16:15:55 +0100
8553b934a6 hot fix Mieszko Wrzeszczyński 2018-11-03 16:02:01 +0100
2c61d22db7 Merge branch 'multilangual-version' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-11-03 14:03:45 +0000
afbf736e63 Add working language switcher #26 multilangual-version Mieszko Wrzeszczyński 2018-11-03 15:02:44 +0100
48ba6f84a5 Add apk Mieszko Wrzeszczyński 2018-11-03 11:28:03 +0100
2ce65b1fe6 Add apk from develop Mieszko Wrzeszczyński 2018-11-03 11:27:14 +0100
d2b5fbf35d Merge branch 'shared-settings-handle-background-task' of s416084/find-my-tutor-android into develop Mieszko Wrzeszczyński 2018-11-03 10:23:23 +0000
d8cf220293 Improve UI of userlist #25 shared-settings-handle-background-task Mieszko Wrzeszczyński 2018-11-03 11:21:52 +0100
8a0ccfa60a custom markers, gitignore for ds store noobish mac files Adam Domagalski 2018-11-03 01:31:39 +0100
f57141d0f2 diff colors of markers added, manual loc select without api connection Adam Domagalski 2018-11-03 01:26:46 +0100
05e4de95c2 Run in thread Mieszko Wrzeszczyński 2018-11-02 23:21:01 +0100
78957bb62b Add stop and start possibility to background task Mieszko Wrzeszczyński 2018-11-02 21:46:05 +0100