LimeSurvey: rtl 0d95a233

Author Committer Branch Timestamp Parent
ollehar ollehar rtl 2016-01-22 13:56:56 rtl 124ade42
Changeset

Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5

mod - application/config/version.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/dataentry.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/labels.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/responses.php Diff File
mod - application/controllers/admin/statistics.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/core/LSHttpRequest.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/helpers/admin/import_helper.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/globalsettings_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/models/Answer.php Diff File
mod - application/models/DefaultValue.php Diff File
mod - application/models/Question.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/generatestats/_statisticsoutput_graphs.php Diff File
add - application/views/admin/export/generatestats/simplestats/_statisticsoutput_answer.php Diff File
add - application/views/admin/export/generatestats/simplestats/_statisticsoutput_arithmetic.php Diff File
add - application/views/admin/export/generatestats/simplestats/_statisticsoutput_graphs.php Diff File
add - application/views/admin/export/generatestats/simplestats/_statisticsoutput_header.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File
add - application/views/admin/export/statistics_user_view.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/responses/browseindex_view.php Diff File
mod - application/views/admin/responses/browsemenubar_view.php Diff File
mod - application/views/admin/super/_question_explorer.php Diff File
mod - application/views/admin/super/fullpagebar_view.php Diff File
mod - application/views/admin/super/header.php Diff File
mod - application/views/admin/super/sidemenu.php Diff File
mod - application/views/admin/super/title_bar.php Diff File
add - application/views/admin/survey/Question/_subQuestionsAndAnwsersJsVariables.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/questionbar_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/survey/organizeGroupsAndQuestions_view.php Diff File
mod - application/views/admin/survey/subview/_template_carousel.php Diff File
mod - application/views/admin/survey/surveySummary_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/usergroupbar_view.php Diff File
mod - application/views/survey/questions/5pointchoice/5pointchoice_footer.php Diff File
add - application/views/survey/questions/date/date_header.php Diff File
add - application/views/survey/questions/date/dropdown/date_header.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
add - styles/Black_Pearl/css/lime-admin.css.map Diff File