LimeSurvey: globaltemplateobjectfix e75f070a

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar globaltemplateobjectfix 2016-03-08 16:47:01 globaltemplateobjectfix bfa71e24
Changeset

Merge branch 'master' into globaltemplateobjectfix

Conflicts:
application/controllers/admin/templates.php
application/helpers/replacements_helper.php
mod - application/config/third_party.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSHttpRequest.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
rm - application/extensions/Menu/MenuWidget.php Diff File
rm - application/extensions/Menu/assets/nav.css Diff File
rm - application/extensions/Menu/assets/nav.js Diff File
rm - application/extensions/Menu/views/adminmenu.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
add - application/helpers/userstatistics_helper.php Diff File
mod - application/libraries/Load_answers.php Diff File
mod - application/libraries/Save.php Diff File
add - application/models/AdminTheme.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Template.php Diff File
add - application/models/TemplateConfiguration.php Diff File
mod - application/models/UserGroup.php Diff File
mod - application/views/admin/emailtemplates/emailtemplates_view.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File
mod - application/views/admin/homepagesettings/_form.php Diff File
mod - application/views/admin/homepagesettings/index.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/participants/attributeMapToken_view.php Diff File
mod - application/views/admin/participants/attributeMap_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/super/_configuration_menu.php Diff File
mod - application/views/admin/super/fullpagebar_view.php Diff File
mod - application/views/admin/super/messagebox.php Diff File
mod - application/views/admin/super/title_bar.php Diff File
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/survey/deactivateSurvey_view.php Diff File
mod - application/views/admin/survey/prepareEditorScript_view.php Diff File
mod - application/views/admin/survey/subview/tabImport_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/templates/templateeditorbar_view.php Diff File
mod - application/views/admin/token/token_bar.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/admin/usergroup/usergroups_view.php Diff File
mod - application/views/register/display.php Diff File
mod - application/views/statistics_user_view.php Diff File
mod - application/views/survey/questions/5pointchoice/item_noanswer_row.php Diff File
mod - application/views/survey/questions/5pointchoice/item_row.php Diff File
mod - application/views/survey/questions/gender/buttons/item.php Diff File
mod - application/views/survey/questions/list_dropdown/select.php Diff File
mod - application/views/survey/questions/list_with_comment/list/item.php Diff File
mod - application/views/survey/questions/listradio/item_noanswer_row.php Diff File
mod - application/views/survey/questions/listradio/item_row.php Diff File
mod - application/views/survey/questions/multipleshorttext/item_inputtext.php Diff File
mod - application/views/survey/questions/multipleshorttext/item_textarea.php Diff File
mod - application/views/survey/questions/ranking/second_list.php Diff File
mod - application/views/survey/questions/yesno/buttons/item.php Diff File
mod - application/views/surveys/publicSurveyList.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de-informal/de-informal.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/el/el.mo Diff File
mod - locale/et/et.mo Diff File
mod - locale/fr/fr.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/nn/nn.mo Diff File
mod - locale/pl/pl.mo Diff File
mod - locale/ru/ru.mo Diff File
mod - locale/th/th.mo Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/ckeditor-config.js Diff File
mod - scripts/admin/homepagesettings.js Diff File
mod - scripts/admin/listresponse.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/ranking.js Diff File
mod - styles/Sea_Green/css/lime-admin-misc.css Diff File
mod - styles/Sea_Green/scripts/save.js Diff File
mod - templates/default/css/template.css Diff File
mod - templates/default/scripts/template.js Diff File
mod - templates/default/views/register.pstpl Diff File
mod - templates/default/views/startpage.pstpl Diff File
mod - templates/default/views/surveylist.pstpl Diff File
mod - templates/news_paper/css/template.css Diff File
mod - templates/news_paper/scripts/template.js Diff File
mod - templates/news_paper/views/register.pstpl Diff File
mod - templates/news_paper/views/startpage.pstpl Diff File
mod - templates/news_paper/views/surveylist.pstpl Diff File
mod - templates/ubuntu_orange/css/template.css Diff File
mod - templates/ubuntu_orange/css/ubuntu_orange.css Diff File
mod - templates/ubuntu_orange/scripts/template.js Diff File
mod - templates/ubuntu_orange/views/register.pstpl Diff File
mod - templates/ubuntu_orange/views/startpage.pstpl Diff File
mod - templates/ubuntu_orange/views/surveylist.pstpl Diff File
rm - third_party/jquery/jquery-1.11.1.min.js Diff File
add - third_party/jquery/jquery-1.12.1.min.js Diff File
add - tmp/runtime/CSS/4.6.0,24166bfe16a0cc6bd18d813b83121ef2eaf16545,1.ser Diff File