LimeSurvey: 2.06 27698b0b

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz 2.06 2014-07-01 10:35:48 2.06 cda51fc0
Changeset

Merge branch 'master' into 2.06
mod - application/commands/InstallCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/routes.php Diff File
mod - application/config/third_party.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/questions.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/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/survey/index.php Diff File
add - application/core/LSYii_EmailIDNAValidator.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/core/UserIdentity.php Diff File
mod - application/core/plugins/Authdb/Authdb.php Diff File
mod - application/core/plugins/ExportR/RDataWriter.php Diff File
mod - application/core/plugins/ExportSTATAxml/ExportSTATAxml.php Diff File
mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/htmleditor_helper.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/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/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/sanitize_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/models/Dynamic.php Diff File
rm - application/models/Dynamic_old.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/TokenDynamic.php Diff File
mod - application/tests/staticCalls.php Diff File
add - application/third_party/idna-convert/LICENCE Diff File
add - application/third_party/idna-convert/ReadMe.txt Diff File
add - application/third_party/idna-convert/idna_convert.class.php Diff File
add - application/third_party/idna-convert/transcode_wrapper.php Diff File
add - application/third_party/idna-convert/uctc.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/expressions/test/navigation_test.php Diff File
mod - application/views/admin/expressions/test/survey_logic_file.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/participants/blacklist_view.php Diff File
mod - application/views/admin/participants/importCSV_view.php Diff File
mod - application/views/admin/survey/subview/tabCopy_view.php Diff File
mod - application/views/admin/templates/templateeditorbar_view.php Diff File
mod - application/views/admin/templates/templatesummary_view.php Diff File
mod - application/views/surveys/publicSurveyList.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/ar/LC_MESSAGES/ar.mo Diff File
mod - locale/ca/LC_MESSAGES/ca.mo Diff File
mod - locale/cs-informal/LC_MESSAGES/cs-informal.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.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-MX/LC_MESSAGES/es-MX.mo Diff File
mod - locale/es/LC_MESSAGES/es.mo Diff File
mod - locale/et/LC_MESSAGES/et.mo Diff File
mod - locale/fi/LC_MESSAGES/fi.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/hr/LC_MESSAGES/hr.mo Diff File
mod - locale/hu/LC_MESSAGES/hu.mo Diff File
mod - locale/id/LC_MESSAGES/id.mo Diff File
mod - locale/it-informal/LC_MESSAGES/it-informal.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/ka/LC_MESSAGES/ka.mo Diff File
mod - locale/lt/LC_MESSAGES/lt.mo Diff File
mod - locale/ms/LC_MESSAGES/ms.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/nl-informal/LC_MESSAGES/nl-informal.mo Diff File
mod - locale/nl/LC_MESSAGES/nl.mo Diff File
mod - locale/nn/LC_MESSAGES/nn.mo Diff File
mod - locale/pap-CW/LC_MESSAGES/pap-CW.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/pt-BR/LC_MESSAGES/pt-BR.mo Diff File
mod - locale/pt/LC_MESSAGES/pt.mo Diff File
mod - locale/ro/LC_MESSAGES/ro.mo Diff File
mod - locale/ru/LC_MESSAGES/ru.mo Diff File
mod - locale/sk/LC_MESSAGES/sk.mo Diff File
mod - locale/sq/LC_MESSAGES/sq.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File
mod - locale/sv/LC_MESSAGES/sv.mo Diff File
mod - locale/th/LC_MESSAGES/th.mo Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File
mod - locale/uk/LC_MESSAGES/uk.mo Diff File
mod - locale/vi/LC_MESSAGES/vi.mo Diff File
mod - locale/zh-Hans/LC_MESSAGES/zh-Hans.mo Diff File
mod - scripts/admin/ckeditor-config.js Diff File
mod - scripts/admin/participantdisplay.js Diff File
mod - scripts/modaldialog.js Diff File
mod - scripts/survey_runtime.js Diff File
mod - templates/basic/template.css Diff File
mod - templates/bluengrey/template.css Diff File
mod - templates/clear_logo/template.css Diff File
mod - templates/eirenicon/template.css Diff File
mod - templates/limespired/template.css Diff File
mod - templates/mint_idea/template.css Diff File
mod - templates/sherpa/template.css Diff File
mod - templates/vallendar/template.css Diff File
rm - third_party/jquery-bindWithDelay/demo/jquery-1.6.1.js Diff File
rm - third_party/jquery-tablesorter/jquery-latest.js Diff File
rm - third_party/jquery/jquery-1.10.2.min.js Diff File
add - third_party/jquery/jquery-1.11.1.min.js Diff File
mod - third_party/kcfinder/js/browser/init.js Diff File
mod - third_party/kcfinder/js/jquery.js Diff File