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

Merge develop with main (S1 release) #79

Merged
merged 148 commits into from
Mar 4, 2024
Merged

Merge develop with main (S1 release) #79

merged 148 commits into from
Mar 4, 2024

Conversation

claugp06
Copy link
Collaborator

@claugp06 claugp06 commented Mar 3, 2024

This pull request intents to include all the changes from develop to main in order to be able to deploy the web app.

MartaInes and others added 30 commits February 22, 2024 11:24
@MartaInes
feat: style sheet (#16)
b77c338 
* feat: style sheet

* fix: header transparency

* update: menu bar
@marnunrey2
Update README.md (#22)
a7b79df 
* Update README.md

* Update README.md
@marnunrey2 @pabpercab1
Fix/repo to develop (#24)
1d0ef6e 
* Update README.md

* Initial errors from repository fixed

* Update README.md

* Update README.md

* Update issue templates

* Repo fixed

* Updated readme

---------

Co-authored-by: Pablo Periañez <72883992+pabpercab1@users.noreply.github.com>
@fracalrod3
feat: Admin screen-Account configuration
c9e1f18
@claugp06 @MartaInes
Home page (#27)
054d2b3 
* Feat:HomePage

* fix: styles

* Feature:Creación HomePage

---------

Co-authored-by: MartaInes <73229109+MartaInes@users.noreply.github.com>
@FranciscoRossoR
Add Activities to App routes
52adbe3
@FranciscoRossoR
Fix App.js import for Activities
c47b852
@FranciscoRossoR
Create Activities screen
f2cd9b5
@claugp06
Fix:Components Footer and Header
682c752
@FranciscoRossoR
Fix Activities header and footer
d2f175a
@FranciscoRossoR
fix camps header and footer
4cb0da9
@FranciscoRossoR
Fix screens' capitalization
2505b25
@FranciscoRossoR
Finish activities screen
123f3b1
@FranciscoRossoR
Create style for activities screens
50e1fe5
@FranciscoRossoR
Finish Camps screen
639b97e
@FranciscoRossoR
Finish CoexistanceRoom screen
073102b
@FranciscoRossoR
Finish FamilyWorkshops screen
d903fb4
@FranciscoRossoR
Finish OpenRoom screen
e6f8d34
@FranciscoRossoR
Finish SummerClub screen
a649a97
@FranciscoRossoR
Fix Coexistence typo
b86ca60
@FranciscoRossoR
Fix typo in FamilyWorkshops
c71d0fa
@FranciscoRossoR
Fix hover in main screen of Activities
38f2a03
@fracalrod3
Merge branch 'develop' into feature/AdminScreen-AccountConfiguration
0e7602b
@FranciscoRossoR
Fix incomplete link in Activities table
7b047ed
@fracalrod3
update
0621f9a
@fracalrod3
Format change
4b7b747
@fracalrod3
update
98d0864
@fracalrod3
requested changes
4313034
@samrodman
Feature/register and volunteer form (#34)
2d058b2 
* should work

* minorfix

* everything looks okay

* codacy fixes
@FranciscoRossoR
Merge branch 'develop' into feature/navbar-activities
07dd50f
@claugp06 claugp06 self-assigned this Mar 3, 2024
@FranciscoRossoR FranciscoRossoR self-requested a review March 4, 2024 10:51
FranciscoRossoR
FranciscoRossoR approved these changes Mar 4, 2024
View reviewed changes
Copy link
Contributor

@FranciscoRossoR FranciscoRossoR left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No conflicts detected, go ahead.

@claugp06 claugp06 removed the request for review from manbarjim2 March 4, 2024 11:27
@claugp06 claugp06 added pre-release and removed enhancement New feature or request labels Mar 4, 2024
samrodman
samrodman approved these changes Mar 4, 2024
View reviewed changes
Copy link
Contributor

@samrodman samrodman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks ready and working

@claugp06 claugp06 changed the title Merge develop with main Merge develop with main (S1 release) Mar 4, 2024
@claugp06 claugp06 merged commit f4c14eb into main Mar 4, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FranciscoRossoR FranciscoRossoR FranciscoRossoR approved these changes

@samrodman samrodman samrodman approved these changes

@MartaInes MartaInes MartaInes approved these changes

Assignees

@claugp06 claugp06

Labels
pre-release
Projects
Sprint 1
Status: Done
Milestone
Sprint 1
Development

Successfully merging this pull request may close these issues.
9 participants
@claugp06 @MartaInes @samrodman @FranciscoRossoR @marnunrey2 @fracalrod3 @pabpercab1 @manbarjim2 @ivaramlar