Commit Graph

75 Commits (90d9cc04fcda32622ce4e5c0663e69ed07caa161)

Author SHA1 Message Date
Sultan khan 8d9561b570 COC changes 3 years ago
Sikander Saleem 95b60181b1 bug fixes 3 years ago
haroon amjad dd26452663 Fixes & updates 3 years ago
haroon amjad c14bfd22db Mohemm Android build given to QA 3 years ago
haroon amjad e6405b2251 NFC fixes 3 years ago
haroon amjad eb29553d26 NFC Fixes 3 years ago
Sikander Saleem a45b6aece2 improvements 3 years ago
Sikander Saleem 4e22784676 ticket balance dashboard added. 3 years ago
Sikander Saleem 4b935f1dc5 leave balance dashboard added. 3 years ago
Sikander Saleem f3855c3883 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem cbcb3cdc00 item for sale improvement cont. 3 years ago
Fatimah Alshammari 6a1f655b1f Merge branch 'master' into Fatima 3 years ago
Sikander Saleem 8e94d57dae performance evaluation improvements. 3 years ago
Sikander Saleem b79edd701c code improvement & translation added. 3 years ago
Fatimah Alshammari e2720c7057 fix design issues 3 years ago
haroon amjad fb2924964b Merge branch 'master' into development_haroon
# Conflicts:
#	lib/models/generic_response_model.dart
#	lib/ui/landing/widget/app_drawer.dart
#	pubspec.yaml
3 years ago
Sikander Saleem 2f6e40da46 add leave balance cont. 3 years ago
Fatimah Alshammari 89058f9e59 Merge branch 'master' into Fatima 3 years ago
Fatimah Alshammari 416a33b2fd fix design 3 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
3 years ago
Sikander Saleem d6cc5fcc6c pending transaction. 3 years ago
haroon amjad a855e535cd Item for sale implemented 3 years ago
Fatimah Alshammari dc880df35a Merge branch 'master' into Fatima
# Conflicts:
#	lib/config/routes.dart
#	lib/models/generic_response_model.dart
#	lib/models/profile_menu.model.dart
3 years ago
Fatimah Alshammari a22f679908 my team module and workList settings 3 years ago
Sikander Saleem 20f7d98ce5 profile improvements 3 years ago
Sikander Saleem 4edb19c2bb Vacation rule added cont. 3 years ago
haroon amjad 1719c7029e Merge branch 'master' into development_haroon
# Conflicts:
#	lib/config/routes.dart
#	lib/models/generic_response_model.dart
#	lib/ui/landing/widget/app_drawer.dart
#	lib/ui/screens/announcements/announcement_details.dart
#	pubspec.yaml
3 years ago
haroon amjad c63844dcf7 My requests & CCP 3 years ago
Sikander Saleem 2f013ba1ad lint rules added. 3 years ago
Sikander Saleem 0786a1fa03 lint rules added. 3 years ago
Sikander Saleem 2966ca129c monthly pay slip improvement 3 years ago
Sikander Saleem f1c36b5821 monthly pay slip added. 3 years ago
haroon amjad e045374703 Not found svg added, Pending transactions, Announcements. 3 years ago
haroon amjad 427c5fb5b6 Pending Transactions implemented 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
devmirza121 2010e9d6a0 Merge branch 'master' into development_mirza
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/colors.dart
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/attendance/monthly_attendance.dart
#	lib/ui/landing/dashboard.dart
#	lib/widgets/radio/show_radio.dart
#	pubspec.yaml
3 years ago
Sikander Saleem 959750da9b ticket request cont. 3 years ago
devmirza121 42510259bc Worklist & Wifi attendance 3 years ago
devmirza121 a03eb8b11a Worklist (ITG sikp, Delegats and HR multiple requests) 3 years ago
Sikander Saleem ae0a788728 Merge branch 'master' into development_sikander
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
3 years ago
Sikander Saleem 9cc86751eb missing swipe cont 3 years ago
Sultan Khan b5a5399b95 profile 3 years ago
Sultan Khan 13150321d4 Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 3 years ago
Sikander Saleem f2b378e33a dynamic forms cont. 3 years ago
Sultan Khan fad58931f3 profile 3 years ago
Fatimah Alshammari 6529c2aeba profile pages 3 years ago
Fatimah Alshammari 393e28b32c fix profile 3 years ago
devmirza121 3fce58b379 Merge branch 'master' into development_mirza
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
4 years ago
devmirza121 2887894330 Merge branch 'master' into development_mirza
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/ui/login/login_screen.dart
4 years ago
devmirza121 ec845756be Login Issue Fix's 4 years ago