Commit Graph

480 Commits

Author SHA1 Message Date
261002d131 Merge branch 'develop' of s416084/find-my-tutor-android into master 2018-12-05 13:25:24 +00:00
899fb9958b Merge branch 'fix-sharing-active-id' of s416084/find-my-tutor-android into develop 2018-12-05 13:23:49 +00:00
ce3d261c48 Merge branch 'develop' into fix-sharing-active-id 2018-12-05 14:22:37 +01:00
7fb1d90ab7 Increase build version 2018-12-05 14:22:04 +01:00
e095e9069f Merge branch 'fix-sharing-active-id' of s416084/find-my-tutor-android into develop 2018-12-05 13:18:56 +00:00
f0f1e59947 Fix default value 2018-12-05 14:17:34 +01:00
118296aa03 Merge branch 'develop' of s416084/find-my-tutor-android into master 2018-12-05 11:41:14 +00:00
9c9402c8c1 Merge branch 'fix-ssl-config' of s416084/find-my-tutor-android into develop 2018-12-05 11:40:56 +00:00
2ca64a66ba Rollback ssl config 2018-12-05 12:25:31 +01:00
3eed883079 Merge branch 'develop' of s416084/find-my-tutor-android into master 2018-12-05 09:04:20 +00:00
fc4f49c3e0 Merge branch 'fix-approx-loc' of s416084/find-my-tutor-android into develop 2018-12-05 09:03:45 +00:00
b2e5a0e0c5 Fix unknown location 2018-12-05 09:59:18 +01:00
5e51be5d0b First attempt 2018-12-05 00:45:16 +01:00
5fc5140866 Merge branch 'improve-user-modal' of s416084/find-my-tutor-android into develop 2018-12-04 21:23:09 +00:00
76c3ba5054 Change app icon 2018-12-04 22:18:16 +01:00
15529eccb4 Merge branch 'master' of s416084/find-my-tutor-android into develop 2018-12-04 20:37:06 +00:00
7174d7d117 Merge branch 'android7okhttpQuickFix3dec' of s416084/find-my-tutor-android into master 2018-12-03 15:04:47 +00:00
Adam Domagalski
e3e88d168f eliptic curve cipher TLS change for android 7 nougat 2018-12-03 16:00:35 +01:00
6115958efb Add Lato font & improve user modal 2018-12-02 22:15:39 +01:00
Adam Domagalski
f3f2f3b90a acra wtih intented crash on manual loc select 2018-12-02 21:29:47 +01:00
ee6d11fe44 Improve colors & margins 2018-12-02 16:28:20 +01:00
7c1b9e4494 Merge branch 'develop' of s416084/find-my-tutor-android into master 2018-12-01 16:13:12 +00:00
957cee1b23 Merge branch 'developMieszko27nov' of s416084/find-my-tutor-android into develop 2018-12-01 11:46:54 +00:00
eb1ab75d6d Merge branch 'develop' into developMieszko27nov 2018-12-01 11:50:17 +01:00
c05d03a4d0 Fix partially manual predefined locations 2018-12-01 11:49:27 +01:00
a7ba5bf27c Merge branch 'developMieszko27nov' of s416084/find-my-tutor-android into master 2018-11-29 21:35:16 +00:00
a52e5dd89b Increase version 2018-11-29 22:34:31 +01:00
79d48bb269 Fix BG & markers filter & boundaries 2018-11-29 22:31:47 +01:00
f6cfb7f352 Version to deploy 2018-11-29 12:15:58 +01:00
1e07168725 adjuested feedback model 2018-11-28 18:37:48 +01:00
d7bc56f5f9 adjust code to master 2018-11-28 09:37:38 +01:00
72f2ac798a Merge branch 'developMieszko27nov' of s416084/find-my-tutor-android into develop 2018-11-27 19:54:41 +00:00
c452e5dbf5 Fix BG & UI 2018-11-27 20:53:01 +01:00
ab74f0b7e1 Fix manual pop up windows 2018-11-27 19:52:36 +01:00
Adam Domagalski
66dba76ed4 istutor bugifx map 2018-11-27 16:12:02 +01:00
8fbce4d9d3 Merge branch 'tutorProfile' of s416084/find-my-tutor-android into develop 2018-11-27 13:52:39 +00:00
Marcin Jedynski
e96981c8b9 fixed post update tutortab 2018-11-27 14:51:55 +01:00
519115ed5e Merge branch 'tutorProfile' of s416084/find-my-tutor-android into develop 2018-11-27 12:09:41 +00:00
Marcin Jedynski
c43aabf739 added save/fetch functionality to tutortab 2018-11-27 13:03:45 +01:00
6dbe50761a Fix retrofit rxjava 2018-11-27 11:45:50 +01:00
2b19229552 added icons, translations, renamed activites in manifest 2018-11-27 11:40:02 +01:00
abbd887db7 added basic layout and fetching of profile activity, but save note not implemented yet, got some problems 2018-11-27 06:51:49 +01:00
6684274488 Merge branch 'saveManualLocation' of s416084/find-my-tutor-android into develop 2018-11-27 05:33:39 +00:00
50ef5b1e8b merge 2018-11-27 06:21:19 +01:00
bbc7803177 added handling of choosing manual location from list in sharing tab 2018-11-27 03:10:33 +01:00
3177b43f26 Merge branch 'fix-login-as-student' of s416084/find-my-tutor-android into develop 2018-11-26 23:27:38 +00:00
012f2af3f2 Fix login 2018-11-27 00:26:43 +01:00
db3ac7378c Merge branch 'markers-types' of s416084/find-my-tutor-android into develop 2018-11-26 23:17:43 +00:00
789a2dbaf1 Merge from dev 2018-11-27 00:16:36 +01:00
ba67a8b088 Add predifined 2018-11-27 00:00:37 +01:00