LimeSurvey: master 80af8f72

Diff Back to Repository
Author Committer Branch Timestamp Parent
apmuthu apmuthu master 2014-01-15 02:53:18 master a41f8de8
Changeset

Merge pull request #11 from LimeSurvey/master

Merge with Upstream
mod - application/config/config-sample-dblib.php Diff File
mod - application/config/config-sample-mysql.php Diff File
mod - application/config/config-sample-pgsql.php Diff File
mod - application/config/config-sample-sqlsrv.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/RegisterController.php Diff File
add - application/controllers/SurveysController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/extensions/LimeScript/LimeScript.php 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/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/sanitize_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
rm - application/libraries/ExpressionManager/js/em_javascript.js Diff File
mod - application/models/Participant.php Diff File
mod - application/models/Survey.php Diff File
mod - application/views/admin/dataentry/caption_view.php Diff File
mod - application/views/admin/endScripts_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/installer/precheck_view.php Diff File
add - application/views/layouts/bare.php Diff File
add - application/views/surveys/publicSurveyList.php Diff File
add - application/views/system/error404.php Diff File
mod - docs/release_notes.txt Diff File
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/LC_MESSAGES/ca.mo Diff File
mod - locale/de-informal/LC_MESSAGES/de-informal.mo Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/el/LC_MESSAGES/el.mo Diff File
mod - locale/es/LC_MESSAGES/es.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/lt/LC_MESSAGES/lt.mo Diff File
mod - locale/lv/LC_MESSAGES/lv.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/sv/LC_MESSAGES/sv.mo Diff File
mod - locale/ta/LC_MESSAGES/ta.mo Diff File
mod - locale/zh-Hans/LC_MESSAGES/zh-Hans.mo Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/browse.js Diff File
mod - scripts/admin/participantPanel.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/admin/surveysettings.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/navigator-countdown.js Diff File
mod - scripts/numeric-slider.js Diff File
mod - scripts/survey_runtime.js Diff File