Haroon6138
/
hmg-mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,288 Commits
10 Branches
0 Tags
14 MiB
master
development_haroon
development_aamir
faiz_cs
development_mirza
development_sikander
sultan-dev
fatima
faiz_marathon_signalR_critical
main
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6d92a78843'
${ noResults }
Commit Graph

188 Commits (6d92a78843c1f26110838c5c8cf5d129665c7be1)

Author SHA1 Message Date
Aamir Muhammad 8ba3dcf43b Chat Fixes & Favorite Api Implementation 2 years ago
haroon amjad 2fdde18b52 Merge branch 'faiz_cs' into 'master' 
Updated Banner Again :D

See merge request Cloud_Solution/mohemm-flutter-app!49
 2 years ago
FaizHashmiCS22 9bdb6bfb71 Updated Banner Again :D 2 years ago
haroon amjad 00e81999de Merge branch 'faiz_cs' into 'master' 
Updated Banner Design and Success tone on Lottiee

See merge request Cloud_Solution/mohemm-flutter-app!46
 2 years ago
FaizHashmiCS22 034436425a Added success tone 2 years ago
FaizHashmiCS22 b2e03b2647 Added attendance svg 2 years ago
FaizHashmiCS22 fe8c6f9060 Updated Marathon Banner Design 2 years ago
haroon amjad 221bf28ddd Merge branch 'master' into development_haroon 2 years ago
haroon amjad ea676e19ca JIRA Fixes 2 years ago
haroon amjad 7cc110b9a1 JIRA fixes 2 years ago
mirza.shafique 5880e22771 merge fix 2 years ago
mirza.shafique e9de5c340b Merge branch 'master' into development_mirza 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
 2 years ago
devmirza121 f06238a93f OTP dialog new design 2 years ago
Aamir Muhammad 235dc6b1f4 Merge branch 'master' into development_aamir 2 years ago
haroon amjad 1a2c9d1b15 Merge branch 'fatima' into 'master' 
Fatima

See merge request Cloud_Solution/mohemm-flutter-app!37
 2 years ago
haroon amjad ba588cd3a3 Merge branch 'faiz_cs' into 'master' 
Added Answer Selection Status in Marathon

See merge request Cloud_Solution/mohemm-flutter-app!38
 2 years ago
haroon amjad d77f9a3362 Worklist fixes 2 years ago
Aamir Muhammad c0ee98b06e Merge branch 'master' into development_aamir 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
 2 years ago
Aamir Muhammad 6d5b2323ac Merge branch 'master' into development_aamir 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
 2 years ago
FaizHashmiCS22 710ec44293 Merge branch 'master' into development_faiz 
# Conflicts:
#	lib/ui/login/login_screen.dart
#	lib/ui/marathon/marathon_screen.dart
 2 years ago
Fatimah Alshammari 79774416b4 Merge branch 'master' into fatima 
# Conflicts:
#	lib/generated/codegen_loader.g.dart
 2 years ago
Fatimah Alshammari 69ded3dc43 fix my request 2 years ago
FaizHashmiCS22 db174035ca Icons updated 2 years ago
devmirza121 937c4c18b5 Mark Attandence success animation and font settings 2 years ago
FaizHashmiCS22 f3623e29dc Merge branch 'master' into development_faiz 
# Conflicts:
#	lib/generated/codegen_loader.g.dart
 2 years ago
haroon amjad 966fb5e209 Worklist fixes 2 years ago
FaizHashmiCS22 5ed9991428 Added new Intimmation Screens with Lottie 2 years ago
FaizHashmiCS22 3d7b80b8a0 Merge branch 'master' into faiz_cs 
# Conflicts:
#	lib/generated/codegen_loader.g.dart
 2 years ago
FaizHashmiCS22 60e7b5a2a0 Adjusted the font settings 2 years ago
FaizHashmiCS22 ab59821428 Merge conflicts resolved 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
Fatimah Alshammari f515c0b39a Merge branch 'master' into fatima 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
 2 years ago
Fatimah Alshammari 7b4fe5bcbc fix issues 2 years ago
FaizHashmiCS22 38c7d78db3 Added UI Components for Marathon Module.. WIP 2 years ago
Aamir Muhammad 912ac80707 Chat Fixes 2 years ago
Sikander Saleem defa8a8adb redirection added on worklist detail when approve or reject. 2 years ago
FaizHashmiCS22 5c848fec87 Added UI Components for Marathon Module.. WIP 2 years ago
haroon amjad 5b5cc16b90 Advanced Search implemented 2 years ago
Sikander Saleem 200b56a992 improvements 2 years ago
Aamir Muhammad 57ebe40b5d Merge branch 'master' into development_aamir 
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
 2 years ago
Sikander Saleem d61315a5fe Merge branch 'master' into development_sikander 2 years ago
Sikander Saleem f0ec4843b4 end employment dynamic forms added. exit-reEntry getvaluesSetvalues issue fixed. request submit screen title issue fixed. 2 years ago
Aamir Muhammad b190a248bf Chat Implementation Version 1 2 years ago
devmirza121 0d0832277f 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/work_list/worklist_fragments/detail_fragment.dart
#	lib/ui/work_list/worklist_fragments/info_fragments.dart
#	pubspec.yaml
 2 years ago
devmirza121 116175efaa Work list UI Change 2 years ago
Fatimah Alshammari 53dabdd853 Merge branch 'master' into fatima 2 years ago
Fatimah Alshammari be506fa059 fix issues 2 years ago
Sikander Saleem 95b60181b1 bug fixes 2 years ago
Sikander Saleem e090b9be0b Merge branch 'development_mirza' into 'master' 
Login with face and finger fixed

See merge request mirza.shafique/mohem_flutter_app!83
 2 years ago
devmirza121 8ce3a09375 Login with face and finger fixed 2 years ago
Fatimah Alshammari 07d4aadc4e added survey screen 2 years ago
Fatimah Alshammari 957c88f58f fix issues 2 years ago
Fatimah Alshammari 241172b7e7 fix issues 2 years ago
Fatimah Alshammari b7685295d9 fix design issues 2 years ago
Sikander Saleem cfe0460ea5 my team issues fixed 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 2eedef7c2c Merge branch 'master' into development_sikander 2 years ago
Sikander Saleem 7eadd97869 item for sale ui improvements & translation added. 2 years ago
Sultan Khan 70a7108d9c Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/config/routes.dart
#	lib/models/generic_response_model.dart
#	lib/ui/landing/widget/app_drawer.dart
 2 years ago
Sultan Khan f3477fb5f3 perforamce page updates 2 years ago
Sikander Saleem b79edd701c code improvement & translation added. 2 years ago
Sikander Saleem 2ce3c535d2 Merge branch 'master' into development_sikander 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
 2 years ago
Sikander Saleem 6be8510b86 drawer menu ui changed. 2 years ago
Fatimah Alshammari 907b205d21 added subordinate leave 2 years ago
Sikander Saleem 9314ea0514 Merge branch 'master' into development_sikander 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
 2 years ago
Fatimah Alshammari 416a33b2fd fix design 2 years ago
Sikander Saleem 169a9bcc60 leave balance cont. 2 years ago
Sikander Saleem 1404715425 Vacation rule translation added. 2 years ago
Sikander Saleem 3750f2c904 Vacation rule added complete. 2 years ago
Sultan Khan 39b916bcc8 performance page added 2 years ago
Sultan Khan ff4a546e5f Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 2 years ago
Fatimah Alshammari d52cc2d5cd Merge branch 'master' into Fatima 2 years ago
Fatimah Alshammari b502e038a5 fix issue 2 years ago
Sikander Saleem 0d812cf266 Vacation rule added. 2 years ago
Sikander Saleem 4ebba3900c dashboard improvements, monthly attendance & vacation rule added. 2 years ago
Sikander Saleem 68146ecd97 dynamic forms finalized & improvements 2 years ago
Fatimah Alshammari aca788ae26 fix translations 2 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
 2 years ago
Fatimah Alshammari 1604cba140 fix translation. 2 years ago
Fatimah Alshammari 57bf34a93a fix translation. 2 years ago
Fatimah Alshammari 1ef3783fb9 Merge branch 'master' into Fatima 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/profile_api_client.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/landing/widget/app_drawer.dart
#	lib/ui/profile/delete_familyMember.dart
#	lib/ui/profile/family_members.dart
#	lib/ui/profile/phone_numbers.dart
#	lib/ui/screens/profile/profile_screen.dart
 2 years ago
Fatimah Alshammari 30ca1894db fix issues. 2 years ago
devmirza121 2ced8313da QR, Digital Card & Employee ID Implementation 2 years ago
Sultan Khan 06b14394bd Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into development_sultan 2 years ago
Sultan Khan e6e150b9e3 address phone numbers 2 years ago
Sikander Saleem f1c36b5821 monthly pay slip added. 2 years ago
haroon amjad a55c98c5ba Not found svg 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
Fatimah Alshammari 4ddd967177 Merge branch 'master' into Fatima 
# Conflicts:
#	lib/generated/codegen_loader.g.dart
#	pubspec.yaml
 2 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
 2 years ago
Fatimah Alshammari 60db9041a1 Merge branch 'master' of https://gitlab.com/mirza.shafique/mohem_flutter_app into Fatima 
 Conflicts:
	assets/langs/en-US.json
	lib/ui/profile/contact_details.dart
	lib/ui/profile/personal_info.dart
	pubspec.yaml
 2 years ago
Fatimah Alshammari d2a6ed8de7 fix monthly attendance 2 years ago
devmirza121 a03eb8b11a Worklist (ITG sikp, Delegats and HR multiple requests) 2 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
 2 years ago
Sikander Saleem 3e6fdd2cb5 missing swipe added. 2 years ago
Sikander Saleem 1e9a26e3df missing swipe cont 2 years ago