Commit Graph

45 Commits (107846dd82d024a198ffdadd04414cc25e2ddf81)

Author SHA1 Message Date
aamir-csol 107846dd82 Merge branch 'refs/heads/master' into flutter_upgrade_with_timesheet_changes
# Conflicts:
#	android/app/build.gradle
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/landing/widget/services_widget.dart
2 weeks ago
aamir-csol c8fa64171e coreLibraryDesugaringEnabled 2 months ago
haroon amjad 7384f22942 Update to stores, VersionID 9.2 3 months ago
Aamir Muhammad 0e54c7dac9 worklist actions fragment action button changes 3 months ago
Aamir Muhammad d651b34381 Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade
# Conflicts:
#	android/app/build.gradle
#	android/build.gradle
#	android/gradle.properties
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/settings.gradle
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/api/dashboard_api_client.dart
#	lib/classes/consts.dart
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
#	lib/widgets/mark_attendance_widget.dart
#	pubspec.yaml
3 months ago
Syed Taha Alam e50d1f70b2 upgraded the sdk to 35 3 months ago
Aamir Muhammad cd36d61640 logins apis 4 months ago
haroon amjad e91b33805e fixes & updates, Time sheet changes, Update to stores VersionID 8.7 6 months ago
sultan khan c26b2d9a5f search employee inprogress 8 months ago
haroon amjad d55d2dee50 Mohemm identity updated 1 year ago
haroon amjad 39375f48ff updates 1 year ago
haroon amjad 096c52d979 worklist updates 1 year ago
haroon amjad 55c096aa7e Chat video fixes 2 years ago
haroon amjad d3358d578c Update to stores 2 years ago
haroon amjad 29643489d6 Added permissions for viewing files 2 years ago
haroon amjad 0728cc3dd4 Updated Mowadhafi Attachment Handling 2 years ago
haroon amjad c104de86ba Updates 2 years ago
Sikander Saleem d971f4a651 po worklist forward & approve and forward RespondAttributeList payload improvement. 3 years ago
haroon amjad 20109cbe9e Attendance fixes 3 years ago
haroon amjad 3b13701cec Android fixes 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 e0d02554b1 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 182fa6774e Huawei push implementation 3 years ago
Aamir Muhammad a8008bb9a7 Chat Fix & Web RTC Methods 3 years ago
mirza.shafique aa511f02ac Merge branch 'master' into development_mirza
# Conflicts:
#	lib/classes/consts.dart
#	pubspec.yaml
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
mirza.shafique 5f525f16a0 local network test 3 years ago
haroon amjad a9bf383164 Updates & fixes 3 years ago
Aamir Muhammad c8f9826266 Permission Issue 3 years ago
haroon amjad b4fc3dd5fd version fixes 3 years ago
haroon amjad 2790d18c1d fixes 3 years ago
haroon amjad dd26452663 Fixes & updates 3 years ago
haroon amjad c14bfd22db Mohemm Android build given to QA 3 years ago
devmirza121 8fe51a654c Merge branch 'master' into development_mirza
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/main.dart
#	lib/ui/landing/today_attendance_screen.dart
#	lib/ui/landing/widget/app_drawer.dart
#	pubspec.yaml
3 years ago
devmirza121 2ced8313da QR, Digital Card & Employee ID Implementation 3 years ago
Sikander Saleem ce7183a137 merge conflicts fixed. 3 years ago
Sikander Saleem 95e2e74fd0 Merge branch 'master' into development_sikander
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/extensions/string_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/main.dart
#	lib/models/generic_response_model.dart
#	lib/ui/my_attendance/my_attendance_screen.dart
#	lib/ui/work_list/worklist_detail_screen.dart
3 years ago
Sikander Saleem 1841057ce6 app icon added. 3 years ago
devmirza121 a03eb8b11a Worklist (ITG sikp, Delegats and HR multiple requests) 3 years ago
devmirza121 68729ddbb9 NFC Attendance implement 4 years ago
Sikander Saleem 6b9ea200ad login flow added. 4 years ago
Sikander Saleem 78ca9e2c70 icons added & dashboard ui 4 years ago
Sikander Saleem 8470495332 Gradle updated, fonts added & structure improvements 4 years ago
tall3at 1b6ebc67c3 first commit 4 years ago