Commit Graph

881 Commits (2f301da9b94ed69599c90da0885a5622af2e663b)

Author SHA1 Message Date
Sultan khan 2f301da9b9 monthly attendance fixed 2 years ago
Sultan khan f21348d9b7 Merge branch 'development_haroon_merge_aamir' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	android/gradle/wrapper/gradle-wrapper.properties
#	lib/api/chat/chat_api_client.dart
#	lib/classes/consts.dart
#	lib/generated_plugin_registrant.dart
#	lib/main.dart
#	lib/provider/chat_provider_model.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
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
Faiz Hashmi 5723b64234 Join MarathonProviderFix 2 years ago
Sultan khan d4a795dda1 half day leave bug fixed 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 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
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 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
Sikander Saleem 7f6f240590 CR-6273 improvement. 2 years ago
Sikander Saleem 58962ede03 CR-6273 implemented. 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 cd4b9d8c74 updates 2 years ago
haroon amjad 3037925016 Merge branch 'development_aamir' into development_haroon_merge_aamir
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
haroon amjad 5098aa7f90 my docs upload fix 2 years ago
Aamir Muhammad 73cb717bfb Merge branch 'master' into development_aamir
# Conflicts:
#	pubspec.yaml
2 years ago
Aamir Muhammad 42c3b7a8af Updates To 3.10 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
Aamir Muhammad 41e4ec0eee Ios Voip Kit Changes 2 years ago
Aamir Muhammad 3ec44940df Ios Voip Kit Changes 2 years ago
Aamir Muhammad 9f33b2e0e7 Revert "Ios Voip Kit"
This reverts commit 4f3437cba9.
2 years ago
haroon amjad 1a8db3b0ee ERM Channel updates 2 years ago
Aamir Muhammad 4f3437cba9 Ios Voip Kit 2 years ago
Aamir Muhammad 23820e7e5e Ios Voip Kit 2 years ago
Aamir Muhammad 364d1292a0 OneSignal Api 2 years ago
Aamir Muhammad bceae623ed End Call Android Native 2 years ago
Aamir Muhammad fb63963905 Merge branch 'aamir_dev' into development_aamir_testing
# Conflicts:
#	lib/api/chat/chat_api_client.dart
#	lib/classes/chat_call_kit.dart
#	lib/main.dart
#	lib/provider/chat_call_provider.dart
#	lib/ui/chat/call/chat_incoming_call_screen.dart
#	lib/ui/chat/chat_detailed_screen.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
2 years ago
Aamir Muhammad 1d7de73d28 End Call Android Native 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
Aamir Muhammad bce79efdd2 End Call Android Native 2 years ago
Aamir Muhammad 7bc36188c4 End Call Android Native 2 years ago
Aamir Muhammad 3a821a1744 End Call Android Native 2 years ago