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.

Sign up for GitHub

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

Jump to bottom

Staging to check forked PR's locally #232

Merged
merged 63 commits into from
Oct 9, 2023
Merged

Staging to check forked PR's locally #232

merged 63 commits into from
Oct 9, 2023

Conversation

shreya-mishra
Copy link
Collaborator

No description provided.

JAYATEJA04 and others added 30 commits August 21, 2023 18:58
@JAYATEJA04
create a dropdown for users contribution and displayed users data
6dbd4ec
@shreya-mishra
added homescreenV2
d68da18
@shreya-mishra
fix the type issues
796c572
@shreya-mishra
pused some type changes
d6925ad
@JAYATEJA04
create a dropdown for users contribution and displayed users data
c4e43ef
@JAYATEJA04
made few changes in the UI
9446796
@JAYATEJA04
added the arrows for dropdown
c75220c
@dhruv036
Added From and To buttons in OOOForm
3d341a9
@harshitadatra
close button added
a36cf3e
@JAYATEJA04
made the UI changes, displayed the dates related to deadlines
d2430a2
@JAYATEJA04
fixed conflicts
326d657
@harshitadatra
fix: form design
1a6317e
@shreya-mishra
integrated api
91dd79e
@JAYATEJA04
fixed few UI issues and changed the styling of few
9855966
@JAYATEJA04
fixed linting issues
dd9879e
@JAYATEJA04
found few issues and resolved it
8b5175d
@shreya-mishra
Merge pull request #216 from Real-Dev-Squad/homeScreenEnhance
b666138 
HomeScreen V2
@shreya-mishra
handled error
15f6ad3
@shreya-mishra
Merge pull request #231 from Real-Dev-Squad/homeScreenEnhance
ef5a7ac 
handled error
@dhruv036
Merge branch 'Real-Dev-Squad:develop' into homeScreenEnhance
122545d
@harshitadatra
fix : form design
9f4d557
@shreya-mishra
Merge pull request #228 from dhruv036/homeScreenEnhance
4fe7e8a 
Home screen enhance
@harshitadatra
merge conflicts
5021374
@shreya-mishra
resolved date picker ui and handled validation in case of currentDate…
44b36d3 
… is smaller than FromDate and vice-versa
added encrypted storage methods
ad9ed65
removing unused import
de0f6da
@harshitadatra
fix: merge conflicts
bb7dbfe
@dhruv036
Fixed scanner 'Something Went Wrong' toast on signup screen
c9d7f23
@shreya-mishra
Merge pull request #204 from JAYATEJA04/188/profileEnhancement
af76584 
Enhancement of profile page in mobile app.
@shreya-mishra
Merge branch 'staging' into formDesign
95cf3e2
shreya-mishra and others added 28 commits September 7, 2023 17:41
@shreya-mishra
changes
b773783
@shreya-mishra
made some ui fixes at homescreen
532bd13
@harshitadatra
fix : infinite loading
8bc7bbd
@dhruv036
Styling in OOOForm and GoalScreen
e7e72f2
@dhruv036
linting
cce3b7b
added local feautre flag
8814e00
importing from updated api url from main store
190d7b4
moving prod and stag url in contants
eccc139
removing urls and maintaining boolean
deda4bd
hiding goal tab accordingly with feature flag
3b6cdf9
@shreya-mishra
Merge pull request #254 from mohammadkhizerkhan/feature/local-feature…
2bd346b 
…-flag

Feature/local feature flag
@shreya-mishra
Merge pull request #251 from harshitadatra/fix/infinite-loading
a152a11 
Fix/infinite loading
@shreya-mishra
Merge pull request #252 from dhruv036/staging
962fc4c 
Styling OOOForm, Goals and Profile screen
@shreya-mishra
fix between dev and prod features
f804a47
@shreya-mishra
Merge branch 'develop' into staging
0c08027
@shreya-mishra
updated the tokenFix api-updated
ac387aa
@shreya-mishra
remove log
779f5c7
@shreya-mishra
fixed scanner
5f79ef8
@shreya-mishra
remove log
a24f36b
@shreya-mishra
Merge pull request #275 from Real-Dev-Squad/tokenFixAiUpdated
6911b3b 
updated the tokenFix api-updated
@shreya-mishra
fix api token issue
b8729ff
@shreya-mishra
fix api token issue
5eca315
@shreya-mishra
lint fix
ba72b5c
@shreya-mishra
Merge pull request #276 from Real-Dev-Squad/tokenFixAiUpdated
385ba86 
fix api token issue
@shreya-mishra
lint fix
62e4f96
@shreya-mishra
Merge pull request #278 from Real-Dev-Squad/tokenFixAiUpdated
a426e9f 
lint fix
@ShivangiTiwari10
build: add androidx.appcompat
b96e5f9
@shreya-mishra
Merge pull request #281 from ShivangiTiwari10/fix/OOOcrash
0810f40 
Fix/oooCrash
@shreya-mishra shreya-mishra merged commit 3a39f6a into develop Oct 9, 2023
1 check passed
@shreya-mishra shreya-mishra deleted the staging branch October 9, 2023 00:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@shreya-mishra @JAYATEJA04 @dhruv036 @harshitadatra @ShivangiTiwari10