LimeSurvey: 2.1 10747ba1

Diff Back to Repository
Author Committer Branch Timestamp Parent
jcleeland jcleeland 2.1 2012-11-22 10:38:20 2.1 141fab9a
Changeset

Merge branch '2.1' of https://github.com/LimeSurvey/LimeSurvey into 2.1
mod - application/config/config-defaults.php Diff File
add - application/config/config-sample-pgsql.php Diff File
add - application/config/config-sample-sqlsrv.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/VerificationController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dumpdb.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/questiongroup.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/translate.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
mod - application/core/LSYii_Application.php Diff File
mod - application/core/UserIdentity.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/htmleditor_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/globalsettings_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/libraries/admin/pear/OLE/OLE.php Diff File
mod - application/libraries/admin/pear/OLE/PPS.php Diff File
mod - application/libraries/admin/pear/OLE/PPS/File.php Diff File
mod - application/libraries/admin/pear/OLE/PPS/Root.php Diff File
mod - application/libraries/admin/pear/Spreadsheet/Excel/Writer/BIFFwriter.php Diff File
mod - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Format.php Diff File
mod - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Parser.php Diff File
mod - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Workbook.php Diff File
mod - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Worksheet.php Diff File
mod - application/libraries/jsonRPCClient.php Diff File
mod - application/models/Failed_login_attempts.php Diff File
mod - application/models/Participants.php Diff File
mod - application/models/User.php Diff File
mod - application/modules/CheckQuestion.php Diff File
mod - application/modules/CommentCheckQuestion.php Diff File
mod - application/modules/CommentListQuestion.php Diff File
mod - application/modules/ListQuestion.php Diff File
mod - application/modules/NumericalQuestion.php Diff File
mod - application/modules/QuestionModule.php Diff File
mod - application/modules/SelectQuestion.php Diff File
mod - application/modules/ShortTextQuestion.php Diff File
mod - application/modules/TextQuestion.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/displayParticipants_view.php Diff File
mod - application/views/admin/super/adminmenu.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/token/ldapform.php Diff File
mod - application/views/admin/token/ldappost.php Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/globalsettings.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/admin/updateset.js Diff File
mod - styles/gringegreen/adminstyle.css Diff File
mod - templates/citronade/startpage.pstpl Diff File
mod - templates/citronade/template.css Diff File