Commit Graph

1063 Commits (4f96629467341dd3fa1ccedc67f4e01dffd570d7)

Author SHA1 Message Date
haroon amjad f28090e3a9 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
2 years ago
haroon amjad a76d1548af Update to stores 5.9 2 years ago
Sultan khan 348e4713ec worklist-PO-PR issue fixed. 2 years ago
haroon amjad f77854c794 update to stores version 5.9 2 years ago
haroon amjad eb070fcec2 Merge branch 'master_mohemm_flutter' 2 years ago
Sikander Saleem 2b7df41f35 advance search bottom sheet issue when keyboard appear. 2 years ago
haroon amjad 10a337ddd7 Added additional details in VIDA Access Request in ITG 2 years ago
haroon amjad 5e18b98a20 Update to stores 2 years ago
haroon amjad 2ea045cc81 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	pubspec.yaml
2 years ago
haroon amjad 22af6fa2f9 Huawei location fix 2 years ago
haroon amjad 557c356233 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
2 years ago
haroon amjad 55c096aa7e Chat video fixes 2 years ago
haroon amjad 6ae71c2f9b Update to stores 2 years ago
haroon amjad 609d3ca48a Merge branch 'master_mohemm_flutter'
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/app_state/app_state.dart
#	pubspec.yaml
2 years ago
haroon amjad d3358d578c Update to stores 2 years ago
haroon amjad 5f3c4b034f Monthly attendance fixes 2 years ago
haroon amjad 697d44635c Storage permissions handled 2 years ago
Sikander Saleem df07a5f9f6 Merge branch 'master' into development_sikander 2 years ago
haroon amjad c7ff754dd8 Password expired fixes & ITG Attachments implementation 2 years ago
Sikander Saleem 2cea45f0e1 Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
haroon amjad 43e1e4df6b forgot password changes 2 years ago
haroon amjad 771914326f Forgot password flow updated 2 years ago
haroon amjad 4e7e5bc0e7 document type name updated in My Documents 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 fc3c1c057a Attachments handled in transactions list mowadhafi 2 years ago
Haroon6138 7faf1ca530 Merge pull request 'half day leave bug fixed' (#15) from sultan-dev into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/15
2 years ago
haroon amjad bd46589607 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app 2 years ago
haroon amjad a411b8e978 File picker permission issue fixed 2 years ago
Sultan khan 74bc09d5d6 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
Sultan khan c86d9f4678 termination work-list fixed 2 years ago
Sikander Saleem 449c93649a multiple survey added. 2 years ago
Sikander Saleem d1e2d0f59b Merge branch 'master' into development_sikander
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
Faiz Hashmi 5723b64234 Join MarathonProviderFix 2 years ago
Sikander Saleem 610d4788c2 parameter added in survey. 2 years ago
Faiz Hashmi ada971c7e4 Merge branch 'master' into faiz_dev_marathon_text_fix
# Conflicts:
#	lib/classes/consts.dart
2 years ago
Faiz Hashmi 753d3de3c2 Join MarathonProviderFix 2 years ago
Sultan khan d4a795dda1 half day leave bug fixed 2 years ago
Sikander Saleem d44bc37681 marathon tutorial added. 2 years ago
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 3 years ago
haroon amjad 0fd1c8c96b Merge branch 'master' into development_haroon 3 years ago
haroon amjad e39526b5eb Updates & fixes 3 years ago
Sikander Saleem 23b4e81170 my documents added. 3 years ago
haroon amjad c3376c0e3b Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
3 years ago
haroon amjad 1a8db3b0ee ERM Channel updates 3 years ago
haroon amjad 04062a3189 HMG Employee digital ID updated 3 years ago
haroon amjad 59116b700a Location check added 3 years ago
haroon amjad 4aa35349e1 VersionID Update 3 years ago
haroon amjad 165485965a Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
3 years ago
haroon amjad 15c8e80799 ERM Video fixes 3 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
3 years ago
Sultan khan aca223c700 business trip fixed 3 years ago
Sultan khan 790103bdc9 chat changes 3 years ago
haroon amjad ab1aa33ff3 notifications update 3 years ago
haroon amjad 9030b9bc81 Notification details implemented 3 years ago
haroon amjad f8c207d33f updates 3 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