Get FOSSASIA development merged to Engelsystem Master

[mariobehling]

we make a single branch in our repository name 'Engelsystem-features' we can push features one by one to this branch and get it merge to the engelsystem/engelsystem. After it gets merged we can update the file which contains features list so that we can keep a track what features are merged to the engelsystem/engelsystem. Once the PR merged, we can commit the next feature to the same branch and make another PR to get reviewed. This will save us from creating many branches again in our system. And it'll be effective too as we are not merging more than one feature at a time.

The steps would include:

• Creating a new branch and naming it as engelsystem-features
• Bringing that branch to same level as engelsystem/engelsystem
• Pushing the code to that branch and make a PR to the main repo.
• Once the PR is reviewed and merged we should update the file in the branch for the feature that got merged, to keep a track of all the features.
• Push new feature to the same branch and follow the same process for the next feature.

[DishantK1807]

Branch created: engelsystem-features

[sreejakshetty]

Made engelsystem-features even with engelsystem:master and created a PR to engelsystem/engelsystem and pushed Admin settings feature.

[DishantK1807]

engelsystem#264

[sreejakshetty]

@mariobehling Can we send a mail to msquare requesting to review our PR. Now it has been 15 days since we made a PR to engelsystem/engelsystem and it is not yet reviewed.

[mariobehling]

@kamishettysreeja25 I have telephoned with him a few days ago. He is on holiday and is aware of the changes and our timeline. If it does not work out, he can pull the changes himself. Though, it would be better to get them in earlier, so we can get back to him, if there are requests for changes.

[sreejakshetty]

@kamishettysreeja25 I have telephone with him a few days ago. He is on holiday and is aware of the changes and our timeline. If it does not work out, he can pull the changes himself.

@mariobehling okay, we will wait.

Though, it would be better to get them in earlier, so we can get back to him, if there are requests for changes.

Even if msquare did not find time to review all the features before the final evaluation. I would still contribute if he has any requests for changes.
Thank you

[DishantK1807]

Even if msquare did not find time to review all the features before the final evaluation. I would still contribute if he has any requests for changes.

@mariobehling: Yes! Me too.

[msquare]

I merged the feature. Here is my feedback:

1. Please ensure that variables are initialized correctly:

Notice: Undefined variable: ok in engelsystem/includes/pages/admin_settings.php on line 58
Notice: Undefined variable: msg in engelsystem/includes/pages/admin_settings.php on line 68
Notice: Undefined variable: event_name in engelsystem/includes/pages/admin_settings.php on line 74
Notice: Undefined variable: buildup_start_date in engelsystem/includes/pages/admin_settings.php on line 75
Notice: Undefined variable: event_start_date in engelsystem/includes/pages/admin_settings.php on line 76
Notice: Undefined variable: event_end_date in engelsystem/includes/pages/admin_settings.php on line 77
Notice: Undefined variable: teardown_end_date in engelsystem/includes/pages/admin_settings.php on line 78
Notice: Undefined variable: event_welcome_msg in engelsystem/includes/pages/admin_settings.php on line 80
Notice: Undefined variable: ok in engelsystem/includes/pages/admin_settings.php on line 58
Notice: Undefined variable: msg in engelsystem/includes/pages/admin_settings.php on line 68

1. Please validate buildup_start_date <= event_start_date <= event_end_date <= teardown_end_date
2. Display the entered data: Event-name and the dates on login and news (start and home screen) and the welcome message on registration (or whatever your idea was). I think of a 3 column layout for the login page (1. column is event data, 2. column is login, 3. column is the miscellaneous links and infos)

Very good so far, thank you!

[msquare]

Please create more pull request containing single features - this works very good for me.

[sreejakshetty]

@msquare
Thank you for your feedback. Initially I don't have idea on how to use the created variables and their constraints, now I will working on implementing them.

Please validate buildup_start_date <= event_start_date <= event_end_date <= teardown_end_date
Display the entered data: Event-name and the dates on login and news (start and home screen) and the welcome message on registration (or whatever your idea was). I think of a 3 column layout for the login page (1. column is event data, 2. column is login, 3. column is the miscellaneous links and infos)

Please ensure that variables are initialized correctly:

I will fix the initialisation error.

Please create more pull request containing single features - this works very good for me.

Sure we will create a PR with single feature from now on.