LimeSurvey: 2.05 a61d702e

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa 2.05 2013-03-18 14:06 2.05 6d75a0fe
Changeset

Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05
mod - application/config/ldap.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/SurveyController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/VerificationController.php Diff File
mod - application/controllers/admin/assessments.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/dataentry.php Diff File
mod - application/controllers/admin/dumpdb.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/globalsettings.php Diff File
mod - application/controllers/admin/htmleditor_pop.php Diff File
mod - application/controllers/admin/index.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/question.php Diff File
mod - application/controllers/admin/questiongroup.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/saved.php Diff File
mod - application/controllers/admin/statistics.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/controllers/admin/usergroups.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/UserIdentity.php Diff File
mod - application/helpers/SurveyRuntimeHelper.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/label_helper.php Diff File
mod - application/helpers/admin/survey_helper.php Diff File
mod - application/helpers/admin/template_helper.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/helpers/database_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_core_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/ldap_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/sanitize_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/update_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/helpers/viewHelper.php Diff File
mod - application/libraries/Limesurvey_lang.php Diff File
mod - application/libraries/Load_answers.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/libraries/admin/progressbar.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/libraries/admin/settingsstorage.php Diff File
mod - application/libraries/simpletester.php Diff File
rm - application/libraries/subquery.php Diff
mod - application/models/Answers.php Diff File
mod - application/models/Assessment.php Diff File
mod - application/models/Conditions.php Diff File
mod - application/models/Defaultvalues.php Diff File
mod - application/models/Expression_errors.php Diff File
mod - application/models/Failed_login_attempts.php Diff File
mod - application/models/Groups.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/ParticipantAttributeNames.php Diff File
mod - application/models/ParticipantAttributeNamesLang.php Diff File
mod - application/models/ParticipantShares.php Diff File
mod - application/models/Participants.php Diff File
mod - application/models/Plugin.php Diff File
mod - application/models/PluginSetting.php Diff File
mod - application/models/Question_attributes.php Diff File
mod - application/models/Questions.php Diff File
mod - application/models/Quota.php Diff File
mod - application/models/Quota_languagesettings.php Diff File
mod - application/models/Quota_members.php Diff File
mod - application/models/Saved_control.php Diff File
mod - application/models/Sessions.php Diff File
mod - application/models/Settings_global.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Survey_dynamic.php Diff File
mod - application/models/Survey_links.php Diff File
mod - application/models/Survey_timings.php Diff File
mod - application/models/Survey_url_parameters.php Diff File
mod - application/models/Surveys_languagesettings.php Diff File
mod - application/models/Template.php Diff File
mod - application/models/Templates_rights.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
mod - application/models/User.php Diff File
mod - application/models/User_groups.php Diff File
mod - application/models/User_in_groups.php Diff File