LimeSurvey: master 7d52d015

Diff Back to Repository
Author Committer Branch Timestamp Parent
trougakoss trougakoss master 2012-12-05 13:44 master 79e1cbeb
Changeset

Merge remote-tracking branch 'upstream/master' into Yii
add - .gitattributes Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/question.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/update/update_helper.php Diff File
mod - application/models/Survey_links.php Diff File
mod - application/models/Surveys_languagesettings.php Diff File
mod - application/views/admin/authentication/forgotpassword.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/conditions/includes/conditions_scenario.php Diff File
mod - application/views/admin/dataentry/insert.php Diff File
mod - application/views/admin/dataentry/vvimport.php Diff File
mod - application/views/admin/emailtemplates/emailtemplates_view.php Diff File
mod - application/views/admin/export/r_view.php Diff File
mod - application/views/admin/export/spss_view.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/export/vv_view.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/labels/exportmulti_view.php Diff File
mod - application/views/admin/labels/labelview_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/participants/importCSV_view.php Diff File
mod - application/views/admin/quotas/editquota_view.php Diff File
mod - application/views/admin/quotas/newanswererror_view.php Diff File
mod - application/views/admin/quotas/newanswertwo_view.php Diff File
mod - application/views/admin/quotas/newquota_view.php Diff File
mod - application/views/admin/quotas/viewquotasfooter_view.php Diff File
mod - application/views/admin/quotas/viewquotasrowsub_view.php Diff File
mod - application/views/admin/responses/browsetimeheader_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/editGroup_view.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/survey/deactivateSurvey_view.php Diff File
mod - application/views/admin/survey/organizeGroupsAndQuestions_view.php Diff File
mod - application/views/admin/survey/subview/tabImport_view.php Diff File
mod - application/views/admin/survey/subview/tabResourceManagement_view.php Diff File
mod - application/views/admin/token/csvupload.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/email.php Diff File
mod - application/views/admin/token/emailwarning.php Diff File
mod - application/views/admin/token/exportdialog.php Diff File
mod - application/views/admin/token/tokenbar.php Diff File
mod - application/views/admin/update/step2.php Diff File
mod - application/views/admin/update/step3.php Diff File
mod - application/views/admin/update/update.php Diff File
mod - application/views/admin/user/deluser.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/user/modifyuser.php Diff File
mod - application/views/admin/user/setusertemplates.php Diff File
mod - application/views/admin/usergroup/addUserGroup_view.php Diff File
mod - application/views/admin/usergroup/editUserGroup_view.php Diff File
mod - application/views/admin/usergroup/mailUserGroup_view.php Diff File
mod - application/views/admin/usergroup/viewUserGroup_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/pt/LC_MESSAGES/pt.mo Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/labels.js Diff File
mod - scripts/admin/subquestions.js Diff File
rm - scripts/admin/updateset.js Diff
mod - styles/blobblueish/adminstyle.css Diff File
mod - styles/gartergrey/adminstyle.css Diff File
mod - styles/gringegreen/adminstyle.css Diff File
add - third_party/.gitattributes Diff File