Labels Milestones

Voip & Calling #11

Closed

aamir.muhammad wants to merge 79 commits from development_aamir into master

pull from: development_aamir

merge into: Haroon6138:master

Haroon6138:master

Haroon6138:coc-into-ensat

Haroon6138:flutter_upgrade_with_timesheet_changes

Haroon6138:Courses-CR#-7150

Haroon6138:etqan_ovr_integration

Haroon6138:greeting_card

Haroon6138:a5_chatbot

Haroon6138:worklist-change

Haroon6138:master-Api2.0_update3.29

Haroon6138:mohem_flutter_upgrade

Haroon6138:flutter_upgrade

Haroon6138:master_eventActivity

Haroon6138:master-Api2.0

Haroon6138:mohemm_poc

Haroon6138:faiz_disclosure

Haroon6138:payment_worklist_CR_6939

Haroon6138:development_sikander

Haroon6138:sultan-dev

Haroon6138:faiz_dev_marathon_text_fix

Haroon6138:business_trip_settlement

Haroon6138:development_haroon

Haroon6138:development_haroon_merge_aamir

Haroon6138:dev_faiz

Haroon6138:development_aamir_testing23

Haroon6138:development_faiz

Haroon6138:mirza_hmg_wifi_phase_1

Haroon6138:development_mirza

Haroon6138:fatima

Haroon6138:faiz_marathon_signalR_critical

Haroon6138:main

Conversation 0 Commits 79 Files Changed 56

aamir.muhammad commented 3 years ago

Collaborator

There is no content yet.

aamir.muhammad added 60 commits 3 years ago

74e01e60fb Chat Fix & Web RTC Methods

acbafd8d84 Merge branch 'master' into development_aamir

304f77b9bb Webrtc Calling

b21142e4af Webrtc Calling

5a338199b9 Merge branch 'master' into development_aamir ...

# Conflicts:
#	lib/ui/login/login_screen.dart

55cf39a364 Changes

7af10ec337 Merge branch 'master' into development_aamir ...

# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart

617145fd07 Merge branch 'master' into development_aamir

595c47acbb Changes

7191e25ea5 Chat Redirect Fix

d1ccaf7f56 Chat Fix & Calling

11227b00b4 Ios Changes

c4c7a91d7b Chat Fix & Calling

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

6166b5399f Changes

104c93f95a OnIos

01939abc2f Merge remote-tracking branch 'origin/development_aamir' into development_aamir ...

# Conflicts:
#	lib/classes/chat_call_kit.dart
#	lib/classes/consts.dart

fa62bb13d5 Changes

8623942677 OnIos

2e05bea49d Merge remote-tracking branch 'origin/development_aamir' into development_aamir ...

# Conflicts:
#	lib/classes/chat_call_kit.dart
#	lib/classes/notifications.dart

02870af3d2 Changes On iOS

68f4d21a4a Changes On iOS

02073faf9d Changes On iOS

9dcbdee156 Changes On iOS

88ac343203 Changes On iOS

8db09f20b7 Changes On iOS

aed4a9602b Changes On iOS

39bcf5c3d9 Changes On iOS

b417a158be Changes On iOS

a992c8dae9 Changes On iOS

6e85b81c73 Call Decline & Fixes

748e170e02 Changes

8daa975be2 Merge branch 'development_aamir' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into development_aamir

d7d90f620e VoIP udpates

9e437b7ee9 Call Decline & Fixes

fc2aceae0f Merge remote-tracking branch 'origin/development_aamir' into development_aamir

a8b1a001f8 Android Native

2e22bfb483 End Call

8aa92d127c End Call

5870e80255 End Call Android

3330052f47 Exclude

3a821a1744 End Call Android Native

7bc36188c4 End Call Android Native

bce79efdd2 End Call Android Native

1d7de73d28 End Call Android Native

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

7eec7e252c End Call Android Native

bceae623ed End Call Android Native

364d1292a0 OneSignal Api

23820e7e5e Ios Voip Kit

4f3437cba9 Ios Voip Kit

9f33b2e0e7 Revert "Ios Voip Kit" ...

This reverts commit 4f3437cba9.

3ec44940df Ios Voip Kit Changes

f903700639 Ios Voip Kit Changes

41e4ec0eee Ios Voip Kit Changes

e90d9eecd2 Ios Voip Kit Changes

42c3b7a8af Updates To 3.10

71fe4b6242 Updates To 3.10

73cb717bfb Merge branch 'master' into development_aamir ...

# Conflicts:
#	pubspec.yaml

3f6c5b9c30 Updates To 3.10

Haroon6138 closed this pull request 3 years ago

Please reopen this pull request to perform a merge.

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b development_aamir master

git pull origin development_aamir

Step 2:

Merge the changes and update on Gitea.

git checkout master

git merge --no-ff development_aamir

git push origin master

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Set Project

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Haroon6138/mohemm-flutter-app#11

Write Preview

Loading…

Cancel

Save

There is no content yet.