LimeSurvey: develop 3db4a91e

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar develop 2018-08-01 11:48:16 develop d86f838a
Changeset

Merge branch 'master' into develop

Conflicts:
application/config/version.php
application/controllers/admin/questions.php
application/core/LsDefaultDataSets.php
application/extensions/SettingsWidget/SettingsWidget.php
application/helpers/admin/import_helper.php
application/helpers/common_helper.php
application/helpers/expressions/em_manager_helper.php
application/views/admin/survey/Question/editQuestion_view.php
mod - .htaccess Diff File
mod - .travis.yml Diff File
mod - application/config/packages.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/LSETwigViewRenderer.php Diff File
mod - application/core/LsDefaultDataSets.php Diff File
mod - application/extensions/SettingsWidget/SettingsWidget.php Diff File
mod - application/extensions/admin/grid/MassiveActionsWidget/assets/listActions.js Diff File
add - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_select_survey_theme.php Diff File
mod - application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php Diff File
mod - application/extensions/bootstrap/assets/css/limesurvey-theme.css Diff File
mod - application/extensions/bootstrap/css/bootstrap.css Diff File
mod - application/extensions/bootstrap/css/bootstrap.min.css Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/globalsettings_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionTemplate.php Diff File
mod - application/models/SettingGlobal.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/TemplateConfig.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/models/TemplateManifest.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/views/admin/dataentry/vvimport.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/homepagesettings/index.php Diff File
mod - application/views/admin/participants/massive_actions/_selector.php Diff File
mod - application/views/admin/participants/massive_actions/_selector_attribute.php Diff File
mod - application/views/admin/participants/massive_actions/_selector_share.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/admin/responses/browsemenubar_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/import_view.php Diff File
mod - application/views/admin/survey/_activation_feedback.php Diff File
add - application/views/admin/survey/editDataSecurityLocalSettings_view.php Diff File
mod - application/views/admin/survey/editLocalSettings_main_view.php Diff File
mod - application/views/admin/survey/editLocalSettings_view.php Diff File
mod - application/views/admin/survey/queXMLSurvey_view.php Diff File
mod - application/views/admin/survey/subview/_create_survey_text.php Diff File
mod - application/views/admin/survey/subview/accordion/_presentation_panel.php Diff File
add - application/views/admin/survey/subview/tab_edit_view_datasecurity.php Diff File
mod - application/views/admin/themes/templateeditor_navigator_view.php Diff File
mod - application/views/admin/token/actions.php Diff File
mod - application/views/admin/token/csvupload.php Diff File
mod - application/views/admin/token/exportdialog.php Diff File
mod - application/views/admin/token/invite.php Diff File
mod - application/views/admin/token/managetokenattributes.php Diff File
mod - application/views/admin/token/remind.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/admin/usergroup/usergroupbar_view.php Diff File
rm - assets/fonts/font-src/Roboto-100/LICENSE.txt Diff File
rm - assets/fonts/font-src/Roboto-100/Roboto-100.eot Diff File
rm - assets/fonts/font-src/Roboto-100/Roboto-100.ttf Diff File
rm - assets/fonts/font-src/Roboto-100/Roboto-100.woff Diff File
rm - assets/fonts/font-src/Roboto-100/Roboto-100.woff2 Diff File
rm - assets/fonts/font-src/Roboto-100italic/LICENSE.txt Diff File
rm - assets/fonts/font-src/Roboto-100italic/Roboto-100italic.eot Diff File
rm - assets/fonts/font-src/Roboto-100italic/Roboto-100italic.ttf Diff File
rm - assets/fonts/font-src/Roboto-100italic/Roboto-100italic.woff Diff File
rm - assets/fonts/font-src/Roboto-100italic/Roboto-100italic.woff2 Diff File
rm - assets/fonts/font-src/Roboto-300/LICENSE.txt Diff File
rm - assets/fonts/font-src/Roboto-300/Roboto-300.eot Diff File
rm - assets/fonts/font-src/Roboto-300/Roboto-300.ttf Diff File
rm - assets/fonts/font-src/Roboto-300/Roboto-300.woff Diff File
rm - assets/fonts/font-src/Roboto-300/Roboto-300.woff2 Diff File
rm - assets/fonts/font-src/Roboto-300italic/LICENSE.txt Diff File
rm - assets/fonts/font-src/Roboto-300italic/Roboto-300italic.eot Diff File
rm - assets/fonts/font-src/Roboto-300italic/Roboto-300italic.ttf Diff File
rm - assets/fonts/font-src/Roboto-300italic/Roboto-300italic.woff Diff File
rm - assets/fonts/font-src/Roboto-300italic/Roboto-300italic.woff2 Diff File
rm - assets/fonts/font-src/Roboto-500/LICENSE.txt Diff File
rm - assets/fonts/font-src/Roboto-500/Roboto-500.eot Diff File
rm - assets/fonts/font-src/Roboto-500/Roboto-500.ttf Diff File
rm - assets/fonts/font-src/Roboto-500/Roboto-500.woff Diff File
rm - assets/fonts/font-src/Roboto-500/Roboto-500.woff2 Diff File
rm - assets/fonts/font-src/Roboto-500italic/LICENSE.txt Diff File
rm - assets/fonts/font-src/Roboto-500italic/Roboto-500italic.eot Diff File
rm - assets/fonts/font-src/Roboto-500italic/Roboto-500italic.ttf Diff File
rm - assets/fonts/font-src/Roboto-500italic/Roboto-500italic.woff Diff File
rm - assets/fonts/font-src/Roboto-500italic/Roboto-500italic.woff2 Diff File
rm - assets/fonts/font-src/Roboto-700/LICENSE.txt Diff File
rm - assets/fonts/font-src/Roboto-700/Roboto-700.eot Diff File
rm - assets/fonts/font-src/Roboto-700/Roboto-700.ttf Diff File
rm - assets/fonts/font-src/Roboto-700/Roboto-700.woff Diff File
rm - assets/fonts/font-src/Roboto-700/Roboto-700.woff2 Diff File
rm - assets/fonts/font-src/Roboto-700italic/LICENSE.txt Diff File
rm - assets/fonts/font-src/Roboto-700italic/Roboto-700italic.eot Diff File
rm - assets/fonts/font-src/Roboto-700italic/Roboto-700italic.ttf Diff File
rm - assets/fonts/font-src/Roboto-700italic/Roboto-700italic.woff Diff File
rm - assets/fonts/font-src/Roboto-700italic/Roboto-700italic.woff2 Diff File
rm - assets/fonts/font-src/Roboto-900/LICENSE.txt Diff File
rm - assets/fonts/font-src/Roboto-900/Roboto-900.eot Diff File
rm - assets/fonts/font-src/Roboto-900/Roboto-900.ttf Diff File
rm - assets/fonts/font-src/Roboto-900/Roboto-900.woff Diff File
rm - assets/fonts/font-src/Roboto-900/Roboto-900.woff2 Diff File
rm - assets/fonts/font-src/Roboto-900italic/LICENSE.txt Diff File
rm - assets/fonts/font-src/Roboto-900italic/Roboto-900italic.eot Diff File
rm - assets/fonts/font-src/Roboto-900italic/Roboto-900italic.ttf Diff File
rm - assets/fonts/font-src/Roboto-900italic/Roboto-900italic.woff Diff File
rm - assets/fonts/font-src/Roboto-900italic/Roboto-900italic.woff2 Diff File
rm - assets/fonts/font-src/Roboto-italic/LICENSE.txt Diff File
rm - assets/fonts/font-src/Roboto-italic/Roboto-italic.eot Diff File
rm - assets/fonts/font-src/Roboto-italic/Roboto-italic.ttf Diff File
rm - assets/fonts/font-src/Roboto-italic/Roboto-italic.woff Diff File
rm - assets/fonts/font-src/Roboto-italic/Roboto-italic.woff2 Diff File
rm - assets/fonts/font-src/Roboto-regular/LICENSE.txt Diff File
rm - assets/fonts/font-src/Roboto-regular/Roboto-regular.eot Diff File
rm - assets/fonts/font-src/Roboto-regular/Roboto-regular.ttf Diff File
rm - assets/fonts/font-src/Roboto-regular/Roboto-regular.woff Diff File
rm - assets/fonts/font-src/Roboto-regular/Roboto-regular.woff2 Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-100.eot Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-100.ttf Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-100.woff Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-100.woff2 Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-100italic.eot Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-100italic.ttf Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-100italic.woff Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-100italic.woff2 Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300.eot Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300.ttf Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300.woff Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300.woff2 Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300italic.eot Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300italic.ttf Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300italic.woff Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-300italic.woff2 Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-500.eot Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-500.ttf Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-500.woff Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-500.woff2 Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-500italic.eot Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-500italic.ttf Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-500italic.woff Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-500italic.woff2 Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-700.eot Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-700.ttf Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-700.woff Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-700.woff2 Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-700italic.eot Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-700italic.ttf Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-700italic.woff Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-700italic.woff2 Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-900.eot Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-900.ttf Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-900.woff Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-900.woff2 Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-900italic.eot Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-900italic.ttf Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-900italic.woff Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-900italic.woff2 Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-italic.eot Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-italic.ttf Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-italic.woff Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-italic.woff2 Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-regular.eot Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-regular.ttf Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-regular.woff Diff File
add - assets/fonts/font-src/roboto-v18-latin_latin-ext/roboto-v18-latin_latin-ext-regular.woff2 Diff File
mod - assets/fonts/roboto.css Diff File
mod - assets/packages/adminbasics/build/adminbasics.debug.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.js Diff File
mod - assets/packages/adminbasics/build/adminbasics.min.js Diff File
add - assets/packages/adminbasics/js_old/THESEFILESAREDEPRECATED Diff File
mod - assets/packages/adminbasics/js_old/confirmdeletemodal.js Diff File
mod - assets/packages/adminbasics/src/components/confirmdeletemodal.js Diff File
mod - assets/packages/adminbasics/src/components/notifications.js Diff File
mod - assets/packages/adminbasics/src/main.js Diff File
mod - assets/packages/adminbasics/src/parts/ajaxHelper.js Diff File
mod - assets/packages/adminbasics/src/parts/confirmationModal.js Diff File
mod - assets/packages/adminbasics/src/parts/globalMethods.js Diff File
mod - assets/packages/adminbasics/src/parts/save.js Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.debug.js Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.js Diff File
mod - assets/packages/adminpanel/build/lsadminpanel.min.js Diff File
mod - assets/packages/adminpanel/src/components/sidebar.vue Diff File
mod - assets/packages/adminpanel/src/components/subcomponents/_submenu.vue Diff File
mod - assets/packages/adminpanel/src/main.js Diff File
mod - assets/packages/questions/ranking/css/ranking.css Diff File
mod - assets/packages/questions/ranking/scripts/ranking.js Diff File
mod - assets/scripts/admin/questions.js Diff File
mod - assets/scripts/admin/subquestions.js Diff File
mod - assets/scripts/admin/tokens.js Diff File
mod - assets/scripts/dualscale.js Diff File
mod - assets/scripts/navigator-countdown.js Diff File
mod - assets/scripts/timer.js Diff File
mod - assets/styles-public/bootstrap-for-template-editor.css Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/hu/hu.mo Diff File
mod - locale/it-informal/it-informal.mo Diff File
mod - locale/it/it.mo Diff File
mod - locale/nb/nb.mo Diff File
mod - locale/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ro/ro.mo Diff File
mod - locale/tr/tr.mo Diff File
mod - tests/controllers/CreateSurveyTest.php Diff File
mod - themes/survey/bootswatch/options/options.twig Diff File
mod - themes/survey/fruity/options/options.twig Diff File
mod - themes/survey/vanilla/options/options.twig Diff File
mod - themes/survey/vanilla/scripts/ajaxify.js Diff File
mod - themes/survey/vanilla/scripts/theme.js Diff File
mod - themes/survey/vanilla/views/subviews/content/quotas.twig Diff File
rm - upload/surveys/index.html Diff File
rm - upload/themes/survey/generalfiles/index.html Diff File
rm - upload/themes/survey/index.html Diff File