LimeSurvey: 2.05 0a9dc4b1

Diff Back to Repository
Author Committer Branch Timestamp Parent
mdekker mdekker 2.05 2013-04-01 12:34 2.05 f3ffba6b
Changeset

Merge branch '2.05' of git://github.com/LimeSurvey/LimeSurvey into 2.05

Conflicts:
application/libraries/LSjsonRPCServer.php
mod - .gitignore Diff File
mod - application/config/third_party.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/RegisterController.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/export.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/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/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/core/LSWebUser.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/SurveyRuntimeHelper.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/token_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/BigData.php Diff File
mod - application/libraries/LSjsonRPCServer.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/Permission.php Diff File
rm - application/models/Templates_rights.php Diff
mod - application/tests/staticCalls.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/super/adminmenu.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/survey/subview/tabPresentation_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/user/editusers.php Diff File
mod - application/views/admin/user/setuserpermissions.php Diff File
mod - application/views/admin/user/setusertemplates.php Diff File
mod - application/views/admin/usergroup/usergroupbar_view.php Diff File
mod - plugins/AuditLog/AuditLog.php Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/displayParticipant.js Diff File
mod - scripts/admin/userpermissions.js Diff File
mod - styles/blobblueish/displayParticipants.css Diff File
mod - styles/gringegreen/displayParticipants.css Diff File
mod - styles/gringegreen/jquery-ui/jquery-ui.css Diff File
rm - third_party/jqgrid/src/JsonXml.js Diff
rm - third_party/jqgrid/src/css/ellipsis-xbl.xml Diff
rm - third_party/jqgrid/src/css/ui.jqgrid.css Diff
rm - third_party/jqgrid/src/css/ui.multiselect.css Diff
rm - third_party/jqgrid/src/grid.base.js Diff
rm - third_party/jqgrid/src/grid.celledit.js Diff
rm - third_party/jqgrid/src/grid.common.js Diff
rm - third_party/jqgrid/src/grid.custom.js Diff
rm - third_party/jqgrid/src/grid.filter.js Diff
rm - third_party/jqgrid/src/grid.formedit.js Diff
rm - third_party/jqgrid/src/grid.grouping.js Diff
rm - third_party/jqgrid/src/grid.import.js Diff
rm - third_party/jqgrid/src/grid.inlinedit.js Diff
rm - third_party/jqgrid/src/grid.jqueryui.js Diff
rm - third_party/jqgrid/src/grid.loader.js Diff
rm - third_party/jqgrid/src/grid.subgrid.js Diff
rm - third_party/jqgrid/src/grid.tbltogrid.js Diff
rm - third_party/jqgrid/src/grid.treegrid.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ar.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-bg.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-bg1251.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-cat.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-cn.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-cs.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-da.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-de.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-dk.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-el.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-en.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-es.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-fa.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-fi.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-fr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-gl.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-he.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-hr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-hr1250.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-hu.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-id.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-is.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-it.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ja.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-kr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-lt.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-mne.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-nl.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-no.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-pl.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-pt-br.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-pt.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ro.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ru.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-sk.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-sr-latin.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-sr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-sv.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-th.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-tr.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-tw.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-ua.js Diff
rm - third_party/jqgrid/src/i18n/grid.locale-vi.js Diff
rm - third_party/jqgrid/src/jqDnR.js Diff
rm - third_party/jqgrid/src/jqModal.js Diff
rm - third_party/jqgrid/src/jquery.fmatter.js Diff