LimeSurvey: olle_tmp 08c6cacf

Author Committer Branch Timestamp Parent
ollehar1 ollehar1 olle_tmp 2016-05-03 23:02:42 olle_tmp 5c2d45ee
Changeset

Merge branch 'master' into olle_tmp

mod - application/config/config-defaults.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
add - application/libraries/MenuObjects/Menu.php Diff File
add - application/libraries/MenuObjects/MenuInterface.php Diff File
add - application/libraries/MenuObjects/MenuItem.php Diff File
add - application/libraries/MenuObjects/MenuItemInterface.php Diff File
mod - application/models/AdminTheme.php Diff File
mod - application/models/TemplateConfiguration.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/dataentry/caption_view.php Diff File
mod - application/views/admin/dataentry/dataentry_header_view.php Diff File
mod - application/views/admin/dataentry/import.php Diff File
mod - application/views/admin/dataentry/iteratesurvey.php Diff File
mod - application/views/admin/dataentry/vvimport.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/spss_view.php Diff File
mod - application/views/admin/export/statistics_user_view.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/export/vv_view.php Diff File
mod - application/views/admin/expressions/test/survey_logic_file.php Diff File
mod - application/views/admin/quotas/editquota_view.php Diff File
mod - application/views/admin/quotas/newanswer_view.php Diff File
mod - application/views/admin/quotas/newanswertwo_view.php Diff File
mod - application/views/admin/quotas/newquota_view.php Diff File
mod - application/views/admin/quotas/viewquotas_view.php Diff File
mod - application/views/admin/responses/browseidheader_view.php Diff File
mod - application/views/admin/responses/browseindex_view.php Diff File
mod - application/views/admin/responses/browsetimeheader_view.php Diff File
mod - application/views/admin/responses/listResponses_view.php Diff File
mod - application/views/admin/saved/savedlist_view.php Diff File
mod - application/views/admin/super/sidebody.php Diff File
mod - application/views/admin/super/sidemenu.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/editdefaultvalues_view.php Diff File
mod - application/views/admin/survey/Question/importQuestion_view.php Diff File
mod - application/views/admin/survey/Question/import_view.php Diff File
mod - application/views/admin/survey/Question/listquestions.php Diff File
mod - application/views/admin/survey/Question/question_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/addGroup_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/editGroup_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/group_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/importGroup_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/import_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/listquestiongroups.php Diff File
mod - application/views/admin/survey/_activation_feedback.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/deleteSurvey_view.php Diff File
mod - application/views/admin/survey/editLocalSettings_main_view.php Diff File
mod - application/views/admin/survey/editSurvey_view.php Diff File
mod - application/views/admin/survey/importSurveyResources_view.php Diff File
mod - application/views/admin/survey/organizeGroupsAndQuestions_view.php Diff File
mod - application/views/admin/survey/queXMLSurvey_view.php Diff File
mod - application/views/admin/templates/templatesummary_view.php Diff File
mod - application/views/admin/token/addtokenpost.php Diff File
mod - application/views/admin/token/bounce.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/csvpost.php Diff File
mod - application/views/admin/token/csvupload.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/exportdialog.php Diff File
mod - application/views/admin/token/import.php Diff File
mod - application/views/admin/token/invite.php Diff File
mod - application/views/admin/token/ldapform.php Diff File
mod - application/views/admin/token/ldappost.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/token/tokensummary.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/admin/translate/translateheader_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - index.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/ca.mo Diff File
mod - locale/de/de.mo Diff File
mod - locale/el/el.mo Diff File
mod - locale/fr/fr.mo Diff File
mod - locale/id/id.mo Diff File
mod - locale/nb/nb.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 - styles/Sea_Green/css/lime-admin-common.css Diff File
mod - styles/Sea_Green/scripts/sidemenu.js Diff File
mod - templates/default/config.xml Diff File
mod - templates/news_paper/config.xml Diff File
mod - templates/ubuntu_orange/config.xml Diff File