Haroon6138
/
HMG_Patient_App_New
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Labels Milestones

Main_App_Replacement #391

Merged
Haroon6138 merged 44 commits from Main_App_Replacement into master 3 weeks ago
Conversation 0 Commits 44 Files Changed 91
Haroon6138 commented 3 weeks ago
Owner
There is no content yet.
Haroon6138 added 44 commits 3 weeks ago
6d19baf50f Merge remote-tracking branch 'origin/Main_App_Replacement' into Main_App_Replacement 
# Conflicts:
#	android/app/src/main/kotlin/com/cloudsolutions/HMGPatientApp/MainActivity.kt
833fee141f Merge branch 'master' into Main_App_Replacement 
# Conflicts:
#	lib/core/api_consts.dart
#	pubspec.yaml
77b2011fcd * localization of string is performed. 
* date time handling converting it to locale time before consuming it.
* loader issue handled that was not hiding after call to hide loader
1d3ea2817c Merge branch 'master' into Main_App_Replacement 
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner/Info.plist
#	lib/core/api_consts.dart
#	pubspec.yaml
b2e8f5909c Merge branch 'haroon_dev' into Main_App_Replacement 
# Conflicts:
#	lib/core/api_consts.dart
#	lib/features/habib_wallet/habib_wallet_view_model.dart
#	pubspec.yaml
5c33097635 Merge branch 'master' into Main_App_Replacement 
# Conflicts:
#	lib/core/api_consts.dart
53306fe306 Merge branch 'master' into Main_App_Replacement 
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	pubspec.yaml
2239887676 Merge branch 'master' into Main_App_Replacement 
# Conflicts:
#	lib/core/app_state.dart
9575fccc52 Merge branch 'master' into Main_App_Replacement 
# Conflicts:
#	lib/core/api_consts.dart
a532d3ab53 Merge branch 'haroon_dev' into Main_App_Replacement 
# Conflicts:
#	lib/core/api/api_client.dart
#	lib/core/api_consts.dart
#	lib/splashPage.dart
Haroon6138 merged commit 33a7ed34b0 into master 3 weeks ago
The pull request has been merged as 33a7ed34b0.
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 Main_App_Replacement master
git pull origin Main_App_Replacement

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff Main_App_Replacement
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
1 Participants
Notifications
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/HMG_Patient_App_New#391
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'Main_App_Replacement'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes