LimeSurvey: Plugin f4a16a2a

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa Plugin 2013-03-05 11:11:58 Plugin 8a92df87
Changeset

Dev: Merge branch '2.1' into Plugin

Conflicts:
application/controllers/admin/tokens.php
application/controllers/survey/index.php
application/helpers/frontend_helper.php
application/helpers/update/updatedb_helper.php
application/views/admin/survey/Question/subQuestion_view.php
application/views/admin/usergroup/viewUserGroup_view.php
rm - application/commands/UpdatedbCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/routes.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/admin/authentication.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/export.php Diff File
mod - application/controllers/admin/expressions.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/questiongroup.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/responses.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/update.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/UserIdentity.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/exportresults_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/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/Participants.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Survey_permissions.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
mod - application/models/User.php Diff File
mod - application/modules/CheckQuestion.php Diff File
mod - application/modules/ColumnRadioArrayQuestion.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/MultitextQuestion.php Diff File
mod - application/modules/TextArrayQuestion.php Diff File
mod - application/modules/TextQuestion.php Diff File
mod - application/views/admin/dataentry/insert.php Diff File
mod - application/views/admin/dataentry/warning_header.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/statistics_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/globalSettings_view.php Diff File
mod - application/views/admin/htmleditor/pop_editor_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/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/QuestionGroups/questiongroupbar_view.php Diff File
mod - application/views/admin/survey/prepareEditorScript_view.php Diff File
mod - application/views/admin/survey/subview/tabCopy_view.php Diff File
mod - application/views/admin/survey/subview/tabGeneralNewSurvey_view.php Diff File
mod - application/views/admin/survey/subview/tab_view.php Diff File
mod - application/views/admin/survey/surveySummary_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/managetokenattributes.php Diff File
mod - application/views/admin/update/step2.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/user/setuserrights.php Diff File
mod - application/views/admin/usergroup/usergroupbar_view.php Diff File
mod - application/views/installer/precheck_view.php Diff File
rm - images/flags/af.png Diff File
rm - images/flags/ar.png Diff File
rm - images/flags/be.png Diff File
rm - images/flags/bg.png Diff File
rm - images/flags/bs.png Diff File
rm - images/flags/ca.png Diff File
rm - images/flags/cs.png Diff File
rm - images/flags/cy.png Diff File
rm - images/flags/da.png Diff File
rm - images/flags/de-informal.png Diff File
rm - images/flags/de.png Diff File
rm - images/flags/el.png Diff File
rm - images/flags/en.png Diff File
rm - images/flags/es-MX.png Diff File
rm - images/flags/es.png Diff File
rm - images/flags/et.png Diff File
rm - images/flags/eu.png Diff File
rm - images/flags/fa.png Diff File
rm - images/flags/fi.png Diff File
rm - images/flags/fr.png Diff File
rm - images/flags/gl.png Diff File
rm - images/flags/he.png Diff File
rm - images/flags/hi.png Diff File
rm - images/flags/hr.png Diff File
rm - images/flags/hu.png Diff File
rm - images/flags/id.png Diff File
rm - images/flags/ie.png Diff File
rm - images/flags/is.png Diff File
rm - images/flags/it-formal.png Diff File
rm - images/flags/it.png Diff File
rm - images/flags/ja.png Diff File
rm - images/flags/ko.png Diff File
rm - images/flags/lt.png Diff File
rm - images/flags/lv.png Diff File
rm - images/flags/mk.png Diff File
rm - images/flags/ms.png Diff File
rm - images/flags/mt.png Diff File
rm - images/flags/nb.png Diff File
rm - images/flags/nl-informal.png Diff File
rm - images/flags/nl.png Diff File
rm - images/flags/nn.png Diff File
rm - images/flags/pa.png Diff File
rm - images/flags/pl.png Diff File
rm - images/flags/pt-BR.png Diff File
rm - images/flags/pt.png Diff File
rm - images/flags/ro.png Diff File
rm - images/flags/ru.png Diff File
rm - images/flags/si.png Diff File
rm - images/flags/sk.png Diff File
rm - images/flags/sl.png Diff File
rm - images/flags/sq.png Diff File
rm - images/flags/sr.png Diff File
rm - images/flags/sv.png Diff File
rm - images/flags/th.png Diff File
rm - images/flags/tr.png Diff File
rm - images/flags/vi.png Diff File
rm - images/flags/zh-Hans.png Diff File
rm - images/flags/zh-Hant-HK.png Diff File
rm - images/flags/zh-Hant-TW.png Diff File
rm - images/flags/zh-Hant.png 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
add - locale/mn/LC_MESSAGES/index.html Diff File
add - locale/mn/LC_MESSAGES/mn.mo Diff File
add - locale/mn/index.html Diff File
mod - scripts/admin/listsurvey.js Diff File
mod - scripts/admin/surveysettings.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/admin/users.js Diff File
add - scripts/jquery/locale/jquery.ui.datepicker-it-informal.js Diff File
mod - styles/blobblueish/adminstyle.css Diff File
mod - styles/blobblueish/images/security_16.png Diff File
mod - styles/gringegreen/adminstyle.css Diff File