Closed aloosen closed 2 years ago
Wow, that isn't a fix, that's a pretty big enhancement! Great work @aloosen !
Did some frontend-tests. Works great as far as I can see.
Looks good to me too :) Just wondering if we can rebase this branch on master and merge it directly into master so we don't need to wait for the changes in develop.
~I don't know if there's an option on github's web interface. From the command line, I'd follow the instructions on this page, but replace merge with rebase:~
git checkout -b aloosen-fix_calendar develop
git pull git@github.com:aloosen/JWManagement.git fix_calendar
git checkout master
git rebase aloosen-fix_calendar
git push origin develop
~You can test it if you omit the last command, and if you're not happy you can always undo the last 4 commits with git reset --hard HEAD~4
~
~If you do it, though, your histories of master
and develop
get out of sync...
I'd probably not do it without testing it thoroughly. Perhaps you might want to do a revert commit on the latest changes on develop
?~
Sorry, what I wrote is entirely not true. The new branch was built on top of the current develop branch, of course. What we would have to do is:
calendar view now has a subscription that updates on: