Safemobile/safedispatch-mobile
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
83 Commits 25 Branches 1 Tag 27 MiB
e22f6eb24b
Commit Graph

83 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurențiu Constantin
e22f6eb24b Merge pull request 'radio for App Server Mobile + refactor' (#26) from SD-205_Radio_App_Server_Mobile into develop 
Reviewed-on: #26
 2022-04-08 15:26:34 +00:00
Laurentiu
dc2cb825bb resoving merge 2022-04-08 18:25:53 +03:00
Laurentiu
04fa7a5b2e radio for App Server Mobile + refactor 2022-04-08 17:54:45 +03:00
CiufudeanDani
f6cb72368d Merge pull request 'fix unit selection' (#25) from SD-221 into develop 
Reviewed-on: #25
 2022-04-08 11:50:39 +00:00
CiufudeanDani
97b7e2d9a7 fix unit selection 2022-04-08 14:48:07 +03:00
CiufudeanDani
33d00c27d7 Merge pull request 'display satelite map' (#24) from SD-220 into develop 
Reviewed-on: #24
 2022-04-08 10:54:18 +00:00
CiufudeanDani
cc78f29f26 display satelite map 2022-04-08 13:52:16 +03:00
CiufudeanDani
e7c3672b93 Merge pull request 'update info bubble box info' (#23) from SD-219 into develop 
Reviewed-on: #23
 2022-04-07 10:32:52 +00:00
CiufudeanDani
feb7bd654c update info bubble box info 2022-04-07 13:31:23 +03:00
CiufudeanDani
539170109d Merge pull request 'when receiving a new alarm && current tab is alarms, refresh alarm list' (#22) from SD-224 into develop 
Reviewed-on: #22
 2022-04-07 10:16:35 +00:00
CiufudeanDani
0bdd161d69 when receiving a new alarm && current tab is alarms, refresh alarm list 2022-04-07 13:14:58 +03:00
CiufudeanDani
680dd0f803 Merge pull request 'fix login button display when internet connection is available' (#21) from SD-217 into develop 
Reviewed-on: #21
 2022-04-06 07:05:25 +00:00
CiufudeanDani
0b890b74e0 fix login button display when internet connection is available 2022-04-06 10:03:37 +03:00
CiufudeanDani
73d2cedfba Merge pull request 'display alarm notification' (#20) from SD-224 into develop 
Reviewed-on: #20
 2022-04-04 07:07:40 +00:00
CiufudeanDani
5c075ee168 display alarm notification 2022-04-04 09:59:49 +03:00
CiufudeanDani
1299ff2d2e Merge pull request 'make messages view match parent' (#19) from SD-225 into develop 
Reviewed-on: #19
 2022-04-04 05:58:15 +00:00
CiufudeanDani
8ab29576c5 make messages view match parent 2022-04-04 08:56:52 +03:00
CiufudeanDani
d9a031a46d Merge pull request 'feature/notifications' (#18) from feature/notifications into develop 
Reviewed-on: #18
 2022-04-01 07:03:54 +00:00
CiufudeanDani
ba0dc850f7 display notifications 2022-03-31 14:12:03 +03:00
Bogdan Ungureanu
b2fdb1c8d7 Merge pull request 'SD-203- added dialogs similar to SafeDispatch History to inform of 0 positions or >2000 positions' (#17) from features/SD-203-add-dialogs-for-history-tab into develop 
Reviewed-on: #17
 2022-03-31 05:13:10 +00:00
Bogdan
19f5fe01a3 SD-203- added dialogs similar to SafeDispatch History to inform of 0 positions or >2000 positions 2022-03-31 08:07:39 +03:00
Bogdan Ungureanu
7b45edb624 Merge pull request 'SD-216 - fix back button functionality for recordings and history tabs' (#16) from fix/SD-216-back-navigation-broken into develop 
Reviewed-on: #16
 2022-03-31 04:21:59 +00:00
Bogdan
3a0fe96708 SD-216 - fix back button functionality for recordings and history tabs 2022-03-31 07:19:40 +03:00
Bogdan Ungureanu
5cd598bec9 Merge pull request 'features/SD-211-recordings-tab' (#14) from features/SD-211-recordings-tab into develop 
Reviewed-on: #14
 2022-03-30 11:26:25 +00:00
Bogdan
79234c9830 Merge branch 'develop' into features/SD-211-recordings-tab 2022-03-30 14:22:20 +03:00
CiufudeanDani
ca4255943a clean code 2022-03-30 12:52:38 +03:00
CiufudeanDani
cbeb912820 Merge pull request 'allow server to reconnect on mobile data' (#15) from feature/allow_server_reconnection_on_mobile_data into develop 
Reviewed-on: #15
 2022-03-30 08:52:35 +00:00
CiufudeanDani
f15688b9a1 allow server to reconnect on mobile data 2022-03-30 11:50:48 +03:00
Bogdan
3935b3ad0b SD-211 - fix file rename issue after merge 2022-03-30 11:19:33 +03:00
Bogdan
e59b522ccb Merge branch 'develop' into features/SD-211-recordings-tab 
# Conflicts:
#	libSafeMobile/src/main/java/com/safemobile/services/TCPhandler.java
#	safeDispatch/src/main/res/layout/dialog_login.xml
 2022-03-30 10:38:47 +03:00
Bogdan
3f96055a6e SD-211 - show all recordings and play them 2022-03-30 10:34:57 +03:00
CiufudeanDani
94091a9a31 Merge pull request 'text color on radio' (#13) from feature/icon_and_background into develop 
Reviewed-on: #13
 2022-03-28 13:38:39 +00:00
CiufudeanDani
d9d325b18b text color on radio 2022-03-28 16:34:53 +03:00
CiufudeanDani
f4c6b8163d Merge pull request 'change text color + small changes' (#12) from feature/icon_and_background into develop 
Reviewed-on: #12
 2022-03-28 11:09:20 +00:00
CiufudeanDani
17a7e1711e merge with develop 2022-03-28 14:06:36 +03:00
CiufudeanDani
9b302d0461 change text color + small changes 2022-03-28 14:02:10 +03:00
Bogdan
8bb6f36e60 SD-211 - fix case when the app was sending request on the ui thread 
-fix audio hadler
-small refactor
 2022-03-25 17:28:53 +02:00
Bogdan Ungureanu
e80272e0a4 Merge pull request 'features/SD-188-Create_Permission_module_and_request_audio' (#11) from features/SD-188-Create_Permission_module_and_request_audio into develop 
Reviewed-on: #11
Reviewed-by: Adriana <adriana.epure@safemobile.com>
 2022-03-24 16:59:12 +00:00
Bogdan
3268286e76 #SD-188 - fix merge conflicts 2022-03-24 12:55:53 +02:00
Bogdan
c07986d604 Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio 
# Conflicts:
#	safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java
#	safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
 2022-03-24 12:29:12 +02:00
Bogdan
81937a5e0f SD-188 - navigate to phone settings if permission is denied 2022-03-24 12:16:30 +02:00
CiufudeanDani
c70a1b71a1 Merge pull request 'change package name + apk && aab' (#10) from feature/change_package_name into develop 
Reviewed-on: #10
 2022-03-24 09:42:32 +00:00
CiufudeanDani
142558d057 change package name + apk && aab 2022-03-24 11:18:49 +02:00
Bogdan
66625bcdd1 SD-188 - request audio permission on radio tab select 2022-03-23 19:50:15 +02:00
CiufudeanDani
968d9e7296 Merge pull request 'new credential generated' (#9) from feature/new_signature into develop 
Reviewed-on: #9
 2022-03-23 11:35:40 +00:00
CiufudeanDani
2855e9bde6 new credential generated 2022-03-23 13:33:54 +02:00
Bogdan
34c578fdf5 SD-188 - cleaned up TabLayoutActivity of unused code 
- small refactor
- null checks
 2022-03-23 13:07:40 +02:00
CiufudeanDani
ee8bfe56b4 Merge pull request 'feature/icon_and_background' (#8) from feature/icon_and_background into develop 
Reviewed-on: #8
 2022-03-23 09:23:35 +00:00
CiufudeanDani
d519a2be14 change app name 2022-03-23 11:12:20 +02:00
CiufudeanDani
1b3912c682 change background image 2022-03-23 11:12:00 +02:00