Commit Graph

1378 Commits (a76d1548af6fb1e2d02bde1ecbc3d61b39aab357)
 

Author SHA1 Message Date
Faiz Hashmi e585ab7a8c added the text intimation to join the marathon 11 months ago
haroon amjad 39d9136299 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/ui/dialogs/id/business_card_dialog.dart
11 months ago
Haroon6138 66c1e5b9f1 Merge pull request 'sultan-dev' (#9) from sultan-dev into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/9
11 months 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
11 months ago
Sultan khan c9886be2d8 work list ITG str change 11 months ago
Sultan khan d7f45fa0b9 ITG change pushed. 11 months ago
Haroon6138 4194a52685 Merge pull request 'business_trip_settlement && business card design update' (#8) from business_trip_settlement into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/8
11 months ago
Aamir Muhammad 6cf7340417 Business Card Design Update 11 months ago
Sultan khan 6d92a78843 Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev 11 months ago
Sultan khan c56c9533b2 date format issue fixed. 11 months ago
devamirsaleemahmad 12ec0a25ee business trip settlement fix. 1 year ago
haroon amjad 8c1f140b57 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
1 year ago
haroon amjad dc88c461c5 updates 1 year ago
haroon amjad 74b12391d2 update to store for document upload CR 1 year ago
Sikander Saleem 88d2209e86 Merge pull request 'CR-6273 improvement.' (#7) from development_sikander into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/7
1 year ago
Sikander Saleem 7f6f240590 CR-6273 improvement. 1 year ago
Sikander Saleem e504bd13e1 Merge pull request 'CR-6273 implemented.' (#6) from development_sikander into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/6
1 year ago
Sikander Saleem 58962ede03 CR-6273 implemented. 1 year 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
1 year ago
Haroon6138 0589a55c8d Merge pull request 'development_haroon' (#5) from development_haroon into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/5
1 year ago
haroon amjad 281f0bab78 updates 1 year ago
haroon amjad ed9705f18f fixes 1 year 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
1 year ago
haroon amjad a48d703642 ITG ADs update 1 year ago
Sultan khan 333dba3777 business mission issue fixed. 1 year ago
haroon amjad 5098aa7f90 my docs upload fix 1 year ago
haroon amjad 0fd1c8c96b Merge branch 'master' into development_haroon 1 year ago
haroon amjad e39526b5eb Updates & fixes 1 year ago
Sikander Saleem be86ef38fe Merge pull request 'my documents added.' (#4) from development_sikander into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/4
1 year ago
Sikander Saleem 23b4e81170 my documents added. 1 year ago
haroon amjad c3376c0e3b Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
1 year ago
haroon amjad 1a8db3b0ee ERM Channel updates 1 year ago
haroon amjad 04062a3189 HMG Employee digital ID updated 1 year ago
haroon amjad 59116b700a Location check added 1 year ago
haroon amjad 13c5b49fc2 info plist 1 year ago
haroon amjad 4aa35349e1 VersionID Update 1 year ago
haroon amjad 165485965a Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
1 year ago
Haroon6138 0e1963bc39 Merge pull request 'development_haroon' (#3) from development_haroon into master
Reviewed-on: http://34.17.52.79/Haroon6138/mohemm-flutter-app/pulls/3
1 year ago
haroon amjad 15c8e80799 ERM Video fixes 1 year 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
1 year ago
Sultan khan aca223c700 business trip fixed 1 year ago
haroon amjad c4dc3e941d auth key 1 year ago
Sultan khan 790103bdc9 chat changes 1 year ago
haroon amjad ab1aa33ff3 notifications update 1 year ago
haroon amjad 9030b9bc81 Notification details implemented 1 year ago
haroon amjad f8c207d33f updates 1 year ago
haroon amjad d7ab1c8dc2 PageView added to PR Info page 2 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
2 years ago
haroon amjad 373dd3a6d7 Merge branch 'development_haroon' into 'master'
Development haroon

See merge request Cloud_Solution/hmg-mohemm-flutter-app!3
2 years ago
haroon amjad f5957144d5 Merge branch 'master_mohemm_flutter' into development_haroon
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago