Commit Graph

1024 Commits (dc6195259d952f3f9ded1d4a79e068fbfc93f562)

Author SHA1 Message Date
haroon amjad a4761ffec7 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/api/marathon/marathon_api_client.dart
2 years ago
haroon amjad a2ed4e52f3 Marathon changes 2 years ago
Faiz Hashmi 684a200285 Join MarathonProviderFix 2 years ago
Faiz Hashmi 9a6d2d44e1 before staring participant fix. 2 years ago
haroon amjad 2744eff281 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/ui/app_update_screen.dart
#	lib/ui/chat/group_chat_detaied_screen.dart
#	pubspec.yaml
2 years ago
haroon amjad 6811015a0d updates 2 years ago
haroon amjad 52d389b268 In App update implemented 2 years ago
haroon amjad 5fae260ffa Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app 2 years ago
haroon amjad ff908bd2a7 updates 2 years ago
Faiz Hashmi e585ab7a8c added the text intimation to join the marathon 2 years ago
haroon amjad 39d9136299 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/ui/dialogs/id/business_card_dialog.dart
2 years ago
Sultan khan 88be17249d Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
2 years ago
Sultan khan c9886be2d8 work list ITG str change 2 years ago
Sultan khan d7f45fa0b9 ITG change pushed. 2 years ago
Aamir Muhammad 6cf7340417 Business Card Design Update 2 years ago
Sultan khan 6d92a78843 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev 2 years ago
Sultan khan c56c9533b2 date format issue fixed. 2 years ago
devamirsaleemahmad 12ec0a25ee business trip settlement fix. 2 years ago
haroon amjad 8c1f140b57 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
haroon amjad dc88c461c5 updates 2 years ago
haroon amjad 74b12391d2 update to store for document upload CR 2 years ago
Sikander Saleem 7f6f240590 CR-6273 improvement. 2 years ago
Sikander Saleem 58962ede03 CR-6273 implemented. 2 years ago
haroon amjad e433c011e4 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/notifications.dart
#	lib/generated_plugin_registrant.dart
#	pubspec.yaml
2 years ago
haroon amjad 281f0bab78 updates 2 years ago
haroon amjad ed9705f18f fixes 2 years ago
haroon amjad a58d4753e4 Merge branch 'sultan-dev' into development_haroon
# Conflicts:
#	assets/langs/en-US.json
#	lib/classes/utils.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
2 years ago
haroon amjad a48d703642 ITG ADs update 2 years ago
Sultan khan 333dba3777 business mission issue fixed. 2 years ago
haroon amjad 5098aa7f90 my docs upload fix 2 years ago
haroon amjad 0fd1c8c96b Merge branch 'master' into development_haroon 2 years ago
haroon amjad e39526b5eb Updates & fixes 2 years ago
Sikander Saleem 23b4e81170 my documents added. 2 years ago
haroon amjad c3376c0e3b Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
2 years ago
haroon amjad 1a8db3b0ee ERM Channel updates 2 years ago
haroon amjad 04062a3189 HMG Employee digital ID updated 2 years ago
haroon amjad 59116b700a Location check added 2 years ago
haroon amjad 4aa35349e1 VersionID Update 2 years ago
haroon amjad 165485965a Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
2 years ago
haroon amjad 15c8e80799 ERM Video fixes 2 years ago
Sultan khan 608a8fcb97 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
2 years ago
Sultan khan aca223c700 business trip fixed 2 years ago
Sultan khan 790103bdc9 chat changes 2 years ago
haroon amjad ab1aa33ff3 notifications update 2 years ago
haroon amjad 9030b9bc81 Notification details implemented 2 years ago
haroon amjad f8c207d33f updates 2 years ago
haroon amjad d7ab1c8dc2 PageView added to PR Info page 3 years ago
Sultan khan fd6058e87d Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/locale_keys.g.dart
3 years ago
haroon amjad f5957144d5 Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	lib/app_state/app_state.dart
3 years ago
haroon amjad 45fdb4a466 updates 3 years ago
haroon amjad 1f369e9122 survey updates 3 years ago
haroon amjad 1dca3076d9 Survey dynamic questions 3 years ago
haroon amjad 11d7e8bb8a Merge branch 'master_mohemm_flutter' into development_haroon 3 years ago
haroon amjad c0b728d8f4 Merge branch 'master' into development_haroon 3 years ago
Sikander Saleem 879e2aa561 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 571b8bd7af itg active directory password change added. 3 years ago
haroon amjad 6e35a6f9cc Confirm dialog in worklist fixed 3 years ago
haroon amjad 7c53a39167 Merge branch 'master_mohemm_flutter' into development_haroon 3 years ago
haroon amjad b1e140fb75 PR Details implemented 3 years ago
Sultan khan 9cb71b525e group chat started 3 years ago
haroon amjad babe36232e Image slider fixed 3 years ago
haroon amjad cc110df55e Merge branch 'master_mohemm_flutter' into development_haroon 3 years ago
haroon amjad 16194525ef updates 3 years ago
haroon amjad 064be6d195 updates & fixes 3 years ago
Sikander Saleem dc458f126e Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem cd091b696a worklist pagination added. 3 years ago
Sikander Saleem 227855a6a5 dynamic text field improvement. 3 years ago
Sikander Saleem d971f4a651 po worklist forward & approve and forward RespondAttributeList payload improvement. 3 years ago
Faiz Hashmi 1dc6e1ae67 Reduced the option selection threshold from One to Zero 3 years ago
haroon amjad 8dcefa4f55 Merge branch 'master_mohemm_flutter' into development_haroon 3 years ago
haroon amjad c34d8a2633 Location updates 3 years ago
haroon amjad 1eb6065ed8 Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	lib/app_state/app_state.dart
3 years ago
haroon amjad 33294ee697 survey changes 3 years ago
haroon amjad 3c15f168d3 Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app 3 years ago
haroon amjad a9e9e51f86 Version ID changed 3 years ago
mirza.shafique 13d8aac22e ERM fixes 3 years ago
mirza.shafique 7d7acfa2df Merge branch 'master' into development_mirza
# Conflicts:
#	lib/main.dart
3 years ago
haroon amjad 5eb82d04ae Merge branch 'master_mohemm_flutter' into development_haroon 3 years ago
haroon amjad e14f046456 updates 3 years ago
haroon amjad 204aeebe5f Item for sale updates 3 years ago
haroon amjad e2cb0a3dec Add attachment fix 3 years ago
haroon amjad f39e40128e Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	lib/classes/notifications.dart
#	lib/classes/utils.dart
3 years ago
Faiz Hashmi e59b315438 Reduced the option selection threshold from One to Zero 3 years ago
haroon amjad 724227fc12 Item for sale attachment updates 3 years ago
haroon amjad d49a030580 PR details from PO implemented 3 years ago
haroon amjad 1ebcbd1079 ERM Channel Audio playback implemented 3 years ago
haroon amjad 09a20f130b Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/ui/landing/dashboard_screen.dart
#	pubspec.yaml
3 years ago
haroon amjad 379015ca6c chat privilege added 3 years ago
haroon amjad 4bac19f9b8 Platform ID & Huawei fixes 3 years ago
haroon amjad 2911886803 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 72501fd0d9 ITG Ads fix 3 years ago
Faiz Hashmi 8f1c223469 removed google api availability 3 years ago
Faiz Hashmi 990b830bfa Added test Dialog for Huawei 3 years ago
Faiz Hashmi 601a0cdbfd Added test Dialog for Huawei 3 years ago
Faiz Hashmi 8439b58759 Added Huawei Checks 3 years ago
haroon amjad 13822c2534 Merge branch 'faiz_cs' into 'master'
QuickFix

See merge request Cloud_Solution/mohemm-flutter-app!170
3 years ago
Faiz Hashmi 7d0c5598a0 QuickFix 3 years ago
haroon amjad f1382adf25 updates 3 years ago
haroon amjad 2d8ae1ce2f Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	pubspec.yaml
3 years ago
haroon amjad 8f83f89dc7 Item for sale improvements 3 years ago