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

Sync production with mampf-next #464

Merged
merged 44 commits into from
Apr 18, 2023
Merged

Sync production with mampf-next #464

merged 44 commits into from
Apr 18, 2023

Conversation

Splines
Copy link
Member

@Splines Splines commented Apr 17, 2023

No description provided.

zebleck and others added 30 commits January 12, 2022 16:24
@zebleck
added watchlist authorization
4ae25af
@zebleck
Merge branch 'production' of github.com:fosterfarrell9/mampf into pro…
28aff37 
…duction
@zebleck
Revert "Merge remote-tracking branch 'origin/imap-server' into mampf-…
4311633 
…next"

This reverts commit c45a6f2, reversing
changes made to 775ecbf.
@zebleck
Revert "Merge branch 'updates' into mampf-next"
7fb05e4 
This reverts commit 11009ac, reversing
changes made to 78a7a0b.
@fosterfarrell9
Revert "Revert "Merge branch 'updates' into mampf-next""
953dc68 
This reverts commit 7fb05e4.
@fosterfarrell9
Revert "Revert "Merge remote-tracking branch 'origin/imap-server' int…
e3de1ba 
…o mampf-next""

This reverts commit 4311633.
@fosterfarrell9
Merge branch 'main' into production
2fa14bb
@zebleck
Merge branch 'main' into production
626c5b4
@zebleck
Merge branch 'main' into production
2ab899a
@zebleck
Merge branch 'main' into production
2cddb00
@fosterfarrell9
Merge branch 'main' into production
5d947a2
@fosterfarrell9
Merge branch 'main' into production
8c8ba71
@zebleck
Merge branch 'main' into production
198bb66
@zebleck
Merge branch 'main' into production
7526084
@fosterfarrell9
Merge branch 'main' into production
c815a7a
@fosterfarrell9
Merge branch 'main' into production
db27bb9
@zebleck
Merge branch 'main' into production
fe5e6af
@fosterfarrell9
Merge branch 'main' into production
23e8077
@fosterfarrell9
Merge branch 'main' into production
67aaa53
@zebleck
Merge branch 'main' into production
6b05489
@zebleck
Merge branch 'main' into production
cfea0df
@fosterfarrell9
Merge branch 'main' into production
bf89e81
@zebleck
Merge branch 'main' into production
1129420
@zebleck
Merge branch 'main' into production
8c48e5c
@zebleck
Merge branch 'main' into production
86c9cea
@zebleck
Merge branch 'main' into production
a46c98a
@fosterfarrell9
Merge branch 'main' into production
b12f95a
@zebleck
Merge branch 'main' into production
aadc11e
@zebleck
Merge branch 'main' into production
06cd59a
@fosterfarrell9
Merge branch 'main' into production
931ae50
fosterfarrell9 and others added 14 commits February 14, 2023 01:23
@fosterfarrell9
Merge branch 'main' into production
efad411
@zebleck
Merge branch 'main' into production
e33ada4
@zebleck
Merge branch 'main' into production
7706a5c
@fosterfarrell9
fix missing media in user edit view
40fbdb8
@fosterfarrell9
Merge pull request #449 from MaMpf-HD/fix_missing_media_in_user_view
03493db 
fix missing media in user edit view
@fosterfarrell9
Merge branch 'main' into production
e57ad60
@Splines
Merge pull request #457 from MaMpf-HD/mampf-next
16ad954 
Release of version 1.4.4
@fosterfarrell9
Merge pull request #458 from MaMpf-HD/main
4ce8d94 
Production release of v1.4.4
@Splines
Check if lecture variable is present
f82919d 
and pass it into lecture_path(...)
@Splines
Merge pull request #459 from MaMpf-HD/fix/searchbar-not-working
7203a2d 
Hotfix for searchbar
@fosterfarrell9
add authentification to main routes and remove old home
4712c63
@fosterfarrell9
Merge pull request #461 from MaMpf-HD/hotfix_auth_issues
cbb9d59 
add authentification to main routes and remove old home
@fosterfarrell9
render sidebar only if lecture is present
05cbf32
@fosterfarrell9
Merge pull request #462 from MaMpf-HD/hotfix_missing_lecture_in_sidebar
88c69f2 
hotfix: render sidebar only if lecture is present
@Splines
Copy link
Member Author

Splines commented Apr 17, 2023 •
edited
Loading

@fosterfarrell9 Why is the production branch 41 commits ahead of main? Just wanted to bring back the latest hotfixes in production back to main and then to mampf-next, but apparently there's a lot more to bring back 😅

@Splines Splines marked this pull request as draft April 17, 2023 07:11
@fosterfarrell9
Copy link
Collaborator

I was wondering the same thing yesterday😅 . I don't get it.

@henrixapp
Copy link
Collaborator

Maybe you should first merge with mampf-next and afterwards into main. This way you don't have to care for syncing it separately.

@Splines Splines changed the base branch from main to mampf-next April 17, 2023 18:30
@Splines Splines changed the title Bring 1.4.4 hotfixes back to main Sync production with mampf-next Apr 17, 2023
@Splines
Copy link
Member Author

Splines commented Apr 17, 2023

@henrixapp Ok, will sync with mampf-next first, then with main later on.

@Splines Splines marked this pull request as ready for review April 17, 2023 18:34
@fosterfarrell9 fosterfarrell9 self-requested a review April 18, 2023 13:18
@Splines Splines merged commit 1ed5b4e into mampf-next Apr 18, 2023
@Splines Splines mentioned this pull request Apr 21, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fosterfarrell9 fosterfarrell9 fosterfarrell9 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Splines @fosterfarrell9 @henrixapp @zebleck