Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev into Master #129

Merged
merged 124 commits into from
Jun 17, 2023
Merged

Merge dev into Master #129

merged 124 commits into from
Jun 17, 2023

Conversation

JordyHers
Copy link
Contributor

🚀 Pull requests and issues:

#11 Issue fixed and merged
#16 Issue fixed and merged
#54 Issue fixed and merged
#62 Issue fixed and merged
#98 Issue fixed and merged
#99 Issue fixed and merged
#100 Issue fixed and merged
#108 Issue fixed and merged
#110 Issue fixed and merged
#115 Issue fixed and merged
#117 Issue fixed and merged
#123 Issue fixed and merged

SamantaTarun and others added 30 commits June 6, 2023 06:41
…hat-were-not-completed

Chore/110 add more tests that were not completed
…effect-on-scroll-in-childs-page

fix(#98) : removed the glow effect on scroll behavior
…logs-has-some-opacity

fix(#108) : Changed the color of Default action button of all alert dialog box
JordyHers and others added 28 commits June 14, 2023 21:15
…the-orange-info-icon-to-show-dialog

feat(#16) : start showcase onTap of icon icon button
enhancement: implement logger the project
…verall-app-appearance

# Conflicts:
#	lib/app/config/geo_full.dart
#	lib/app/config/geo_location.dart
#	lib/app/pages/child_details_page.dart
#	lib/app/pages/edit_child_page.dart
#	lib/app/pages/notification_page.dart
#	lib/app/pages/parent_page.dart
#	lib/app/pages/set_child_page.dart
#	lib/services/database.dart
#	lib/sign_in/phone_sign_bloc_based.dart
#	lib/sign_in/sign_in_page.dart
…-appearance' into feature/117-refactor-overall-app-appearance
…ll-app-appearance

Feature/117 refactor overall app appearance
…ll-app-appearance

Feature/117 refactor overall app appearance
…text-widgets-in-the-app-with-jhdisplaytext

# Conflicts:
#	lib/app/pages/child_details_page.dart
#	lib/common_widgets/jh_info_row_widget.dart
…-widgets-in-the-app-with-jhdisplaytext

chore/123-replace-all-text-widgets-in-the-app-with-jhdisplaytext
@JordyHers JordyHers merged commit ca6c7e2 into master Jun 17, 2023
4 checks passed
JordyHers added a commit that referenced this pull request Jun 18, 2023
Merge pull request #129 from JordyHers-org/dev
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants