Commit Graph

54 Commits (5e3477da4c11ab41d85ebe2111bc1844b95661c9)

Author SHA1 Message Date
haroon amjad 7c9fc2f29c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	pubspec.yaml
9 months ago
haroon amjad e91b33805e fixes & updates, Time sheet changes, Update to stores VersionID 8.7 10 months ago
sultan khan c26b2d9a5f search employee inprogress 11 months ago
sultan khan be46dcb9b1 employee search work in progress 11 months ago
haroon amjad 77de3ed4cf updates 1 year ago
haroon amjad d55d2dee50 Mohemm identity updated 1 year ago
haroon amjad 39375f48ff updates 1 year ago
haroon amjad 55c096aa7e Chat video fixes 2 years ago
haroon amjad 609d3ca48a Merge branch 'master_mohemm_flutter'
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/app_state/app_state.dart
#	pubspec.yaml
2 years ago
haroon amjad c104de86ba Updates 2 years ago
haroon amjad 281f0bab78 updates 2 years ago
haroon amjad 13c5b49fc2 info plist 3 years ago
haroon amjad 165485965a Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
3 years ago
haroon amjad 15c8e80799 ERM Video fixes 3 years ago
haroon amjad c4dc3e941d auth key 3 years ago
haroon amjad f1382adf25 updates 3 years ago
haroon amjad bbcc9dc147 no message 3 years ago
haroon amjad ba46cf8dee no message 3 years ago
haroon amjad 246c9500c7 Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/app_state/app_state.dart
#	lib/ui/login/login_screen.dart
3 years ago
haroon amjad d65fb5f9ff iOS Deployment target 3 years ago
haroon amjad d3c5fd1467 Revert "Merge branch 'development_haroon' into 'master'"
This reverts merge request !158
3 years ago
haroon amjad 6436062642 HMG Mohemm Setup 3 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 3 years ago
Aamir Muhammad 4a431fb752 Notification Fix 3 years ago
Amir Saleem 992490812e Notification IOS Fix 3 years ago
Aamir Muhammad 698aee3482 Notification 3 years ago
Aamir Muhammad 1eca46600d Merge branch 'master' into development_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	ios/Runner/Info.plist
#	lib/api/chat/chat_api_client.dart
#	lib/ui/login/login_screen.dart
3 years ago
Sikander Saleem 33da1a103d mark attendance session expire fixed 3 years ago
haroon amjad a9bf383164 Updates & fixes 3 years ago
Aamir Muhammad c8f9826266 Permission Issue 3 years ago
haroon amjad 2790d18c1d fixes 3 years ago
Faiz Hashmi 790cb727e9 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
3 years ago
Faiz Hashmi 35a4b780a7 Added initial APIs for Marathon 3 years ago
Aamir Muhammad 9720399fbf Revert "Chat Count Api / Chat Token Updates / Chat Call UI"
This reverts commit 42287f24d1
3 years ago
Aamir Muhammad 1fcb6250f5 Revert "Chat Fixes"
This reverts commit c6cd550dbc
3 years ago
Aamir Muhammad 42287f24d1 Chat Count Api / Chat Token Updates / Chat Call UI 3 years ago
Aamir Muhammad 4d35767784 Revert "Chat Count Api / Chat Token Updates / Chat Call UI"
This reverts commit 826c39bafc72f27eceb7a2fbb975740e2a18c7db.
3 years ago
Sikander Saleem c6cd550dbc Chat Fixes 3 years ago
Sikander Saleem 29626ea408 Chat Fixes 3 years ago
Sikander Saleem 528b0930c2 mark attendance counter 1.0 3 years ago
Sultan khan 8d9561b570 COC changes 3 years ago
haroon amjad 8f396f9ecf ios config for testing 3 years ago
haroon amjad c14bfd22db Mohemm Android build given to QA 3 years ago
Sikander Saleem e71c5c829f Merge branch 'master' into development_mirza
# Conflicts:
#	ios/Runner/Info.plist
#	lib/ui/my_team/view_attendance.dart
#	pubspec.yaml
3 years ago
Sikander Saleem 3c49a45516 ios fixes 3 years ago
haroon amjad e6405b2251 NFC fixes 3 years ago
haroon amjad eb29553d26 NFC Fixes 3 years ago
haroon amjad b0b84c572c Last Login Fixes 3 years ago
haroon amjad a855e535cd Item for sale implemented 4 years ago
Sikander Saleem 3fcbd9946a configs for ios. 4 years ago