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

Labels Milestones

wala_plus_with_dialog_removal #22

Merged
khansultan1 merged 130 commits from wala_plus_with_dialog_removal into master_merge 19 hours ago
Conversation 0 Commits 130 Files Changed 130
khansultan1 commented 19 hours ago
Collaborator
There is no content yet.
khansultan1 added 130 commits 19 hours ago
825845b4c3 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal 
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  changhes
  toast gravity change

# Conflicts:
#	lib/ui/landing/dashboard_screen_for_dependet.dart
37303458bf Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal 
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Added filters

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen_for_dependet.dart
bd6e9577e3 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal 
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Toast fixed

# Conflicts:
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
38906e24b7 Merge branch 'master' into wala_plus_with_dialog_removal 
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Flutter/AppFrameworkInfo.plist
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner/Info.plist
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
#	lib/models/get_mobile_login_info_list_model.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
#	pubspec.yaml
548aa501a1 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal 
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Security changes
  Update dependencies and remove unused keys from localization
  changes for Latest AGP
  Update dependencies and improve code structure
  chat history maintained
  translation added.
  Chat Bot Completed
  Chat Bot Completed
  chat bot & Speech to Text
khansultan1 merged commit d7b88e2e73 into master_merge 19 hours ago
The pull request has been merged as d7b88e2e73.
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 wala_plus_with_dialog_removal master_merge
git pull origin wala_plus_with_dialog_removal

Step 2:

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

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

No
Yes