Commit Graph

66 Commits (281f0bab7885f2f1e1c2a7c7fac04566878d0552)

Author SHA1 Message Date
haroon amjad e39526b5eb Updates & fixes 1 year ago
Faiz Hashmi 601a0cdbfd Added test Dialog for Huawei 2 years ago
Faiz Hashmi 14cb0b7e1f Added Marathon Specific Language Support 2 years ago
Faiz Hashmi 8f33d48c23 Added Marathon Specific Language Support 2 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 2 years ago
Faiz Hashmi 580c7d62f5 some fixes while testing 2 years ago
Faiz Hashmi 7f02dff689 Added the Sequence Number in Question Options and Removed isCorrectOption 2 years ago
Faiz Hashmi 5ff4c19301 Merge branch 'master' into faiz_cs 2 years ago
Faiz Hashmi 5bb998a8d2 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/utils.dart
#	lib/ui/marathon/widgets/marathon_banner.dart
2 years ago
Sikander Saleem 47732d67cb drawer item align issue fixed on arabic. 2 years ago
Faiz Hashmi 4cb7bbee5d Pushing while testing! 2 years ago
Sikander Saleem 9602e95fe7 improvements 2 years ago
Sikander Saleem 86d6b57cbc dynamic list screen items grid view improvements 2 years ago
Faiz Hashmi 8ae8f6d2fe Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/generated/codegen_loader.g.dart
2 years ago
Faiz Hashmi 810920a934 Pushing after resolving multiple times API calling issue 2 years ago
haroon amjad d66f841ca4 App security implemented, Offers & discounts fixes 2 years ago
Faiz Hashmi 49b57cae08 Code Reformatting and Added Logics 2 years ago
Sikander Saleem 7d651c247a marathon improvements. 2 years ago
Sultan khan ee553ae476 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 2 years ago
Sultan khan aadc7203a6 no message 2 years ago
haroon amjad 4ff3a5093b Action duration implemented 2 years ago
Aamir Muhammad 8ba3dcf43b Chat Fixes & Favorite Api Implementation 2 years ago
Sikander Saleem 39240b734e mark attendance counter & ios nfc fixed 2 years ago
devmirza121 937c4c18b5 Mark Attandence success animation and font settings 2 years ago
FaizHashmiCS22 3c6e4a725f Merge branch 'master' into faiz_cs
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	pubspec.yaml
2 years ago
FaizHashmiCS22 38c7d78db3 Added UI Components for Marathon Module.. WIP 2 years ago
FaizHashmiCS22 5c848fec87 Added UI Components for Marathon Module.. WIP 2 years ago
haroon amjad 5b5cc16b90 Advanced Search implemented 2 years ago
devmirza121 116175efaa Work list UI Change 2 years ago
Fatimah Alshammari 07d4aadc4e added survey screen 2 years ago
Sikander Saleem f3855c3883 Merge branch 'master' into development_sikander 2 years ago
Sikander Saleem cbcb3cdc00 item for sale improvement cont. 2 years ago
Fatimah Alshammari 6a1f655b1f Merge branch 'master' into Fatima 2 years ago
Fatimah Alshammari 3d11273738 fix design issues 2 years ago
Sikander Saleem 8e94d57dae performance evaluation improvements. 2 years ago
Sikander Saleem f647b32c65 item for sale improvement. 2 years ago
Sikander Saleem b79edd701c code improvement & translation added. 2 years ago
Sikander Saleem 3cd3aaa6d3 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/ui/landing/widget/app_drawer.dart
2 years ago
Sikander Saleem 6be8510b86 drawer menu ui changed. 2 years ago
haroon amjad a05d037211 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/colors.dart
#	lib/extensions/string_extensions.dart
#	lib/ui/screens/announcements/announcement_details.dart
#	lib/ui/screens/announcements/announcements.dart
#	lib/ui/screens/mowadhafhi/mowadhafhi_home.dart
#	lib/widgets/dynamic_forms/dynamic_textfield_widget.dart
2 years ago
haroon amjad 028caf1379 Offers & Discounts implemented 2 years ago
Sikander Saleem 20f7d98ce5 profile improvements 2 years ago
Sikander Saleem 3750f2c904 Vacation rule added complete. 2 years ago
Sikander Saleem 4edb19c2bb Vacation rule added cont. 2 years ago
Sikander Saleem 68146ecd97 dynamic forms finalized & improvements 2 years ago
Sikander Saleem 0786a1fa03 lint rules added. 2 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
2 years ago
Sikander Saleem eaac923580 imp 2 years ago
Fatimah Alshammari 15cfc0b9f4 merge conflict fixed 2 years ago
devmirza121 a03eb8b11a Worklist (ITG sikp, Delegats and HR multiple requests) 2 years ago