Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Labels Milestones

WD: flutter upgrade fron 3.7 to 3.19.0 #18

Open
taha.alam wants to merge 1 commits from mohem_flutter_upgrade into master
pull from: mohem_flutter_upgrade
merge into: Haroon6138:master
Conversation 0 Commits 1 Files Changed 1
taha.alam commented 1 year ago
Collaborator
There is no content yet.
taha.alam added 1 commit 1 year ago
taha.alam added 1 commit 1 year ago
taha.alam added 6 commits 1 year ago
adc26a2435 Merge branch 'payment_worklist_CR_6939' of http://34.17.75.184/Haroon6138/mohemm-flutter-app into mohem_flutter_upgrade 
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/work_list/worklist_detail_screen.dart
khansultan1 added 1 commit 1 year ago
Haroon6138 added 2 commits 4 months ago
b2ffa0c619 Merge branch 'master' into mohem_flutter_upgrade 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/dialogs/otp_dialog.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/theme/app_theme.dart
#	lib/ui/attendance/monthly_attendance_screen.dart
#	lib/ui/chat/chat_home_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
#	lib/ui/login/verify_login_screen.dart
#	lib/ui/my_team/view_attendance.dart
#	lib/ui/profile/delete_family_member.dart
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
#	lib/ui/work_list/worklist_detail_screen.dart
#	lib/ui/work_list/worklist_fragments/info_fragments.dart
#	lib/widgets/app_bar_widget.dart
#	lib/widgets/image_picker.dart
#	lib/widgets/nfc/nfc_reader_sheet.dart
#	pubspec.yaml
taha.alam added 1 commit 3 months ago
aamir.muhammad added 1 commit 3 months ago
aamir.muhammad added 1 commit 3 months ago
aamir.muhammad added 1 commit 3 months ago
c62f3f6485 Merge branch 'master' into mohem_flutter_upgrade 
# Conflicts:
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
aamir.muhammad added 5 commits 3 months ago
d651b34381 Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade 
# Conflicts:
#	android/app/build.gradle
#	android/build.gradle
#	android/gradle.properties
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/settings.gradle
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/api/dashboard_api_client.dart
#	lib/classes/consts.dart
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
#	lib/widgets/mark_attendance_widget.dart
#	pubspec.yaml
Haroon6138 added 1 commit 3 months ago
aamir.muhammad added 1 commit 3 months ago
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
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 mohem_flutter_upgrade master
git pull origin mohem_flutter_upgrade

Step 2:

Merge the changes and update on Gitea.
git checkout master
git merge --no-ff mohem_flutter_upgrade
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
4 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/mohemm-flutter-app#18
Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'mohem_flutter_upgrade'

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

No
Yes