LimeSurvey: develop 6f5e9691

Author Committer Branch Timestamp Parent
ollehar1 GitHub develop 2017-11-15 12:01:23 develop c67c5bb0
Changeset

Merge branch 'develop' into tests-views5

mod - application/controllers/admin/templateoptions.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/participants/blacklist_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/participants/importCSV_view.php Diff File
mod - application/views/admin/participants/sharePanel_view.php Diff File
mod - application/views/admin/participants/summary_view.php Diff File
mod - application/views/admin/templateoptions/update.php Diff File
mod - templates/default/options/options.twig Diff File
mod - templates/material/options/options.twig Diff File
mod - templates/monochrome/options/options.twig Diff File
mod - tests/TestBaseClass.php Diff File
mod - tests/controllers/AdminViewsTest.php Diff File
add - tests/data/views/adminParticipantsViews.php Diff File
mod - tests/data/views/adminUsersViews.php Diff File