sultan-dev #17

Open
khansultan1 wants to merge 64 commits from sultan-dev into master

64 Commits (master)

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
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
Aamir Muhammad 3f6c5b9c30 Updates To 3.10 2 years ago
Aamir Muhammad 73cb717bfb Merge branch 'master' into development_aamir
# Conflicts:
#	pubspec.yaml
2 years ago
Aamir Muhammad 71fe4b6242 Updates To 3.10 2 years ago
Aamir Muhammad 42c3b7a8af Updates To 3.10 2 years ago
Aamir Muhammad e90d9eecd2 Ios Voip Kit Changes 2 years ago
Aamir Muhammad 41e4ec0eee Ios Voip Kit Changes 2 years ago
Aamir Muhammad f903700639 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
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 7eec7e252c 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
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
Aamir Muhammad 3330052f47 Exclude 2 years ago
Aamir Muhammad 5870e80255 End Call Android 2 years ago
Aamir Muhammad 8aa92d127c End Call 2 years ago
Aamir Muhammad 2e22bfb483 End Call 2 years ago
Aamir Muhammad a8b1a001f8 Android Native 2 years ago
Aamir Muhammad fc2aceae0f Merge remote-tracking branch 'origin/development_aamir' into development_aamir 2 years ago
Aamir Muhammad 9e437b7ee9 Call Decline & Fixes 2 years ago
haroon amjad d7d90f620e VoIP udpates 2 years ago
Aamir Muhammad 8daa975be2 Merge branch 'development_aamir' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into development_aamir 2 years ago
Aamir Muhammad 748e170e02 Changes 2 years ago
Aamir Muhammad 6e85b81c73 Call Decline & Fixes 2 years ago
Aamir Muhammad a992c8dae9 Changes On iOS 2 years ago
Aamir Muhammad b417a158be Changes On iOS 2 years ago
Aamir Muhammad 39bcf5c3d9 Changes On iOS 2 years ago
Aamir Muhammad aed4a9602b Changes On iOS 2 years ago
Aamir Muhammad 8db09f20b7 Changes On iOS 2 years ago
Aamir Muhammad 88ac343203 Changes On iOS 2 years ago
Aamir Muhammad 9dcbdee156 Changes On iOS 2 years ago
Aamir Muhammad 02073faf9d Changes On iOS 2 years ago
Aamir Muhammad 68f4d21a4a Changes On iOS 2 years ago
Aamir Muhammad 02870af3d2 Changes On iOS 2 years ago
Aamir Muhammad 2e05bea49d Merge remote-tracking branch 'origin/development_aamir' into development_aamir
# Conflicts:
#	lib/classes/chat_call_kit.dart
#	lib/classes/notifications.dart
2 years ago
Aamir Muhammad 8623942677 OnIos 2 years ago
Aamir Muhammad fa62bb13d5 Changes 2 years ago
Aamir Muhammad 01939abc2f Merge remote-tracking branch 'origin/development_aamir' into development_aamir
# Conflicts:
#	lib/classes/chat_call_kit.dart
#	lib/classes/consts.dart
3 years ago
Aamir Muhammad 104c93f95a OnIos 3 years ago
Aamir Muhammad 6166b5399f Changes 3 years ago
Aamir Muhammad 9dd4456c51 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/notifications.dart
#	lib/ui/landing/itg/its_add_screen_video_image.dart
#	lib/ui/login/login_screen.dart
#	pubspec.yaml
3 years ago
Aamir Muhammad c4c7a91d7b Chat Fix & Calling 3 years ago
Aamir Muhammad 11227b00b4 Ios Changes 3 years ago
Aamir Muhammad d1ccaf7f56 Chat Fix & Calling 3 years ago
Aamir Muhammad 7191e25ea5 Chat Redirect Fix 3 years ago
Aamir Muhammad 595c47acbb Changes 3 years ago
Aamir Muhammad 617145fd07 Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad 7af10ec337 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
3 years ago
Aamir Muhammad 55cf39a364 Changes 3 years ago
Aamir Muhammad 5a338199b9 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/ui/login/login_screen.dart
3 years ago
Aamir Muhammad b21142e4af Webrtc Calling 3 years ago
Aamir Muhammad 304f77b9bb Webrtc Calling 3 years ago
Aamir Muhammad acbafd8d84 Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad 74e01e60fb Chat Fix & Web RTC Methods 3 years ago