LimeSurvey: develop f71d9aa9

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa develop 2015-04-10 08:51:26 develop 2dfd2b03
Changeset

Merge branch 'feature-response-series' into develop
add - application/components/SurveySession.php Diff File
add - application/components/SurveySessionManager.php Diff File
mod - application/components/WebUser.php Diff File
mod - application/config/internal.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/Controller.php Diff File
mod - application/controllers/PluginsController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
add - application/controllers/ResponsesController.php Diff File
mod - application/controllers/SurveysController.php Diff File
add - application/controllers/TokensController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/assessments.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/printablesurvey.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/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/templates.php Diff File
rm - application/controllers/admin/update.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/WebApplication.php Diff File
mod - application/core/db/MysqlSchema.php Diff File
mod - application/entry.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/common_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/qanda_helper.php Diff File
mod - application/migrations/m150213_153506_initial_migration.php Diff File
add - application/migrations/m150322_132458_add_series_to_survey.php Diff File
mod - application/models/Dynamic.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionAttribute.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/SurveyDynamic.php Diff File
mod - application/models/Timing.php Diff File
mod - application/models/Token.php Diff File
rm - application/themes/default/views/global/groupMenu.php Diff File
rm - application/themes/default/views/global/surveyMenu.php Diff File
rm - application/themes/default/views/groups/view.php Diff File
rm - application/themes/default/views/layouts/main.php Diff File
rm - application/themes/default/views/layouts/survey.php Diff File
rm - application/themes/default/views/questions/view.php Diff File
rm - application/themes/default/views/surveys/publicSurveyList.php Diff File
rm - application/themes/default/views/system/error404.php Diff File
rm - application/themes/default/views/users/index.php Diff File
rm - application/themes/default/views/users/login.php Diff File
rm - application/themes/default/views/users/profile.php Diff File
rm - application/themes/default/views/users/update.php Diff File
rm - application/themes/default/views/users/userList.php Diff File
rm - application/third_party/http/LICENSE.txt Diff File
rm - application/third_party/http/http.php Diff File
rm - application/third_party/idna-convert/LICENCE Diff File
rm - application/third_party/idna-convert/ReadMe.txt Diff File
rm - application/third_party/idna-convert/idna_convert.class.php Diff File
rm - application/third_party/idna-convert/transcode_wrapper.php Diff File
rm - application/third_party/idna-convert/uctc.php Diff File
rm - application/third_party/phpmailer/PHPMailerAutoload.php Diff File
rm - application/third_party/phpmailer/README.md Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-be.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-el.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-eo.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-fa.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-gl.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-he.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-hr.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-ka.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-lt.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-lv.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-pt.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-sk.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-sr.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-uk.php Diff File
rm - application/third_party/phpmailer/language/phpmailer.lang-vi.php Diff File
rm - application/third_party/tcpdf/composer.json Diff File
rm - application/third_party/tcpdf/fonts/ae_fonts_2.0/COPYING Diff File
rm - application/third_party/tcpdf/fonts/ae_fonts_2.0/ChangeLog Diff File
rm - application/third_party/tcpdf/fonts/ae_fonts_2.0/README Diff File
rm - application/third_party/tcpdf/fonts/freefont-20120503/ChangeLog Diff File
rm - application/third_party/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING Diff File
rm - application/third_party/tcpdf/fonts/freefont-20120503/USAGE Diff File
rm - application/third_party/tcpdf/include/tcpdf_colors.php Diff File
rm - application/third_party/tcpdf/include/tcpdf_fonts.php Diff File
rm - application/third_party/tcpdf/include/tcpdf_images.php Diff File
rm - application/third_party/tcpdf/include/tcpdf_static.php Diff File
rm - application/third_party/tcpdf/tcpdf_autoconfig.php Diff File
rm - application/third_party/tcpdf/tcpdf_import.php Diff File
rm - application/third_party/tcpdf/tools/.htaccess Diff File
rm - application/third_party/tcpdf/tools/convert_fonts_examples.txt Diff File
rm - application/third_party/tcpdf/tools/tcpdf_addfont.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/htmleditor/pop_nofields_view.php Diff File
mod - application/views/admin/super/header.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
add - application/views/global/groupMenu.php Diff File
add - application/views/global/surveyMenu.php Diff File
mod - application/views/groups/view.php Diff File
mod - application/views/layouts/main.php Diff File
mod - application/views/layouts/popup.php Diff File
mod - application/views/layouts/survey.php Diff File
mod - application/views/plugins/index.php Diff File
mod - application/views/questions/view.php Diff File
add - application/views/responses/index.php Diff File
add - application/views/responses/view.php Diff File
add - application/views/surveys/activate.php Diff File
add - application/views/surveys/deactivate.php Diff File
add - application/views/surveys/expire.php Diff File
mod - application/views/surveys/index.php Diff File
mod - application/views/surveys/publicSurveyList.php Diff File
add - application/views/surveys/start.php Diff File
add - application/views/surveys/unexpire.php Diff File
add - application/views/surveys/update.php Diff File
rm - application/views/surveys/view.php Diff File
add - application/views/surveys/view/access.php Diff File
add - application/views/surveys/view/data.php Diff File
add - application/views/surveys/view/features.php Diff File
add - application/views/surveys/view/properties.php Diff File
add - application/views/surveys/view/tokens.php Diff File
add - application/views/surveys/welcome.php Diff File
add - application/views/tokens/create.php Diff File
add - application/views/tokens/index.php Diff File
add - application/views/tokens/register.php Diff File
mod - application/views/users/profile.php Diff File
mod - composer.lock Diff File
mod - plugins/befound/ls/ModulePlugin/controllers/DashboardController.php Diff File
mod - scripts/admin/admin_core.js Diff File