LimeSurvey: 2.05 c9f4edff

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu 2.05 2013-03-18 21:06:50 2.05 45e7851e
Changeset

Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/checkintegrity.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/labels.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/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/saved.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSYii_Validators.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/extensions/Menu/MenuWidget.php Diff File
mod - application/helpers/admin/exportresults_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/export_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Participants.php Diff File
add - application/models/Permission.php Diff File
mod - application/models/Survey.php Diff File
rm - application/models/Survey_permissions.php Diff File
mod - application/models/Surveys_languagesettings.php Diff File
mod - application/models/User.php Diff File
mod - application/models/User_groups.php Diff File
mod - application/tests/staticCalls.php Diff File
mod - application/third_party/tcpdf/tcpdf.php Diff File
mod - application/views/admin/assessments_view.php Diff File
mod - application/views/admin/dataentry/insert.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/statistics_browse_view.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/participantsPanel_view.php Diff File
mod - application/views/admin/participants/sharePanel_view.php Diff File
mod - application/views/admin/participants/userControl_view.php Diff File
mod - application/views/admin/quotas/viewquotasfooter_view.php Diff File
mod - application/views/admin/quotas/viewquotasrow_view.php Diff File
mod - application/views/admin/responses/browseallheader_view.php Diff File
mod - application/views/admin/responses/browseallrow_view.php Diff File
mod - application/views/admin/responses/browseidheader_view.php Diff File
mod - application/views/admin/responses/browsemenubar_view.php Diff File
mod - application/views/admin/responses/browsetimeheader_view.php Diff File
mod - application/views/admin/responses/browsetimerow_view.php Diff File
mod - application/views/admin/saved/savedlist_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/addGroup_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php Diff File
mod - application/views/admin/survey/editSurvey_view.php Diff File
mod - application/views/admin/survey/subview/tabPresentation_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/tokenbar.php Diff File
mod - application/views/admin/token/tokensummary.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/admin/user/editusers.php Diff File
add - application/views/admin/user/setuserpermissions.php Diff File
rm - application/views/admin/user/setuserrights.php Diff File
mod - application/views/admin/usergroup/usergroupbar_view.php 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 - scripts/admin/surveysecurity.js Diff File
add - scripts/admin/userpermissions.js Diff File
mod - styles/blobblueish/adminstyle.css Diff File
mod - styles/gringegreen/adminstyle.css Diff File
add - styles/gringegreen/images/cpdb_30.png Diff File
add - styles/gringegreen/images/global_30.png Diff File
add - styles/gringegreen/images/labels_30.png Diff File
add - styles/gringegreen/images/security_30.png Diff File
add - styles/gringegreen/images/superadmin_30.png Diff File
add - styles/gringegreen/images/survey_30.png Diff File
add - styles/gringegreen/images/templates_30.png Diff File
add - styles/gringegreen/images/usergroup_30.png Diff File