LimeSurvey: master 561cfebc

Diff Back to Repository
Author Committer Branch Timestamp Parent
pstelling pstelling master 2023-06-12 14:03 master 42d67626
Changeset

Merge branch 'task/LS-CR-1025_activateSurvey' into develop

Conflicts:

application/views/admin/token/tokensummary.php

application/views/admin/token/tokenwarning.php

application/views/surveyAdministration/surveyActivation/_activation_feedback.php
mod - application/controllers/SurveyAdministrationController.php Diff File
mod - application/controllers/admin/Tokens.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/models/SurveyActivator.php Diff File
mod - application/views/admin/super/footer.php Diff File
add - application/views/surveyAdministration/activateSurvey.php Diff File
rm - application/views/surveyAdministration/activateSurvey_view.php Diff
add - application/views/surveyAdministration/javascript/fix-solvable-errors.js Diff File
add - application/views/surveyAdministration/partial/_modalActivateSuccess.php Diff File
add - application/views/surveyAdministration/partial/topbar/_modalSurveyActivation.php Diff File
mod - application/views/surveyAdministration/partial/topbar/surveyTopbarLeft_view.php Diff File
add - application/views/surveyAdministration/surveyActivation/_activateSurveyCheckFailed.php Diff File
add - application/views/surveyAdministration/surveyActivation/_activateSurveyOptions.php Diff File
add - application/views/surveyAdministration/surveyActivation/_activated_closedAccess.php Diff File
add - application/views/surveyAdministration/surveyActivation/_failedFooterBtn.php Diff File
add - application/views/surveyAdministration/surveyActivation/_feedbackOpenAccess.php Diff File
mod - application/views/surveyAdministration/surveySummary_view.php Diff File
add - assets/scripts/admin/activatesurvey.js Diff File
mod - tests/functional/acceptance/15997-ip-anonymize/IpAddressAnonymizeTest.php Diff File