LimeSurvey: 2.05 d5981dd9

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa 2.05 2013-03-19 10:30:20 2.05 bfb53b85
Changeset

Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05
mod - application/config/third_party.php Diff File
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/super/header.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/admin_core.js 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
rm - third_party/jquery-qtip/dist/basic/jquery.qtip.css Diff File
rm - third_party/jquery-qtip/dist/basic/jquery.qtip.js Diff File
rm - third_party/jquery-qtip/dist/basic/jquery.qtip.min.css Diff File
rm - third_party/jquery-qtip/dist/basic/jquery.qtip.min.js Diff File
rm - third_party/jquery-qtip/dist/jquery.qtip.min.css Diff File
rm - third_party/jquery-qtip/dist/jquery.qtip.min.js Diff File
rm - third_party/jquery-qtip/src/modal/modal.js Diff File
rm - third_party/jquery-tablesorter/addons/pager/.svn/all-wcprops Diff File
rm - third_party/jquery-tablesorter/addons/pager/.svn/entries Diff File
rm - third_party/jquery-tablesorter/addons/pager/.svn/prop-base/jquery.tablesorter.pager.css.svn-base Diff File
rm - third_party/jquery-tablesorter/addons/pager/.svn/prop-base/jquery.tablesorter.pager.js.svn-base Diff File
rm - third_party/jquery-tablesorter/addons/pager/.svn/text-base/jquery.tablesorter.pager.css.svn-base Diff File
rm - third_party/jquery-tablesorter/addons/pager/.svn/text-base/jquery.tablesorter.pager.js.svn-base Diff File
rm - third_party/jquery-tablesorter/docs/assets/.svn/all-wcprops Diff File
rm - third_party/jquery-tablesorter/docs/assets/.svn/entries Diff File
rm - third_party/jquery-tablesorter/docs/assets/.svn/prop-base/ajax-content.html.svn-base Diff File
rm - third_party/jquery-tablesorter/docs/assets/.svn/text-base/ajax-content.html.svn-base Diff File
rm - third_party/jquery-tablesorter/docs/css/.svn/all-wcprops Diff File
rm - third_party/jquery-tablesorter/docs/css/.svn/entries Diff File
rm - third_party/jquery-tablesorter/docs/css/.svn/prop-base/jq.css.svn-base Diff File
rm - third_party/jquery-tablesorter/docs/css/.svn/text-base/jq.css.svn-base Diff File
rm - third_party/jquery-tablesorter/docs/img/.svn/all-wcprops Diff File
rm - third_party/jquery-tablesorter/docs/img/.svn/entries Diff File
rm - third_party/jquery-tablesorter/docs/img/.svn/prop-base/external.png.svn-base Diff File
rm - third_party/jquery-tablesorter/docs/img/.svn/text-base/external.png.svn-base Diff File
rm - third_party/jquery-tablesorter/docs/js/.svn/all-wcprops Diff File
rm - third_party/jquery-tablesorter/docs/js/.svn/entries Diff File
rm - third_party/jquery-tablesorter/docs/js/.svn/prop-base/docs.js.svn-base Diff File
rm - third_party/jquery-tablesorter/docs/js/.svn/prop-base/examples.js.svn-base Diff File
rm - third_party/jquery-tablesorter/docs/js/.svn/text-base/docs.js.svn-base Diff File
rm - third_party/jquery-tablesorter/docs/js/.svn/text-base/examples.js.svn-base Diff File
rm - third_party/jquery-tablesorter/tests/assets/.svn/all-wcprops Diff File
rm - third_party/jquery-tablesorter/tests/assets/.svn/entries Diff File
rm - third_party/jquery-tablesorter/tests/assets/.svn/prop-base/ajax-content.html.svn-base Diff File
rm - third_party/jquery-tablesorter/tests/assets/.svn/text-base/ajax-content.html.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/blue/.svn/all-wcprops Diff File
rm - third_party/jquery-tablesorter/themes/blue/.svn/entries Diff File
rm - third_party/jquery-tablesorter/themes/blue/.svn/prop-base/asc.gif.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/blue/.svn/prop-base/bg.gif.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/blue/.svn/prop-base/blue.zip.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/blue/.svn/prop-base/desc.gif.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/blue/.svn/prop-base/style.css.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/blue/.svn/text-base/asc.gif.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/blue/.svn/text-base/bg.gif.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/blue/.svn/text-base/blue.zip.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/blue/.svn/text-base/desc.gif.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/blue/.svn/text-base/style.css.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/green/.svn/all-wcprops Diff File
rm - third_party/jquery-tablesorter/themes/green/.svn/entries Diff File
rm - third_party/jquery-tablesorter/themes/green/.svn/prop-base/asc.png.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/green/.svn/prop-base/bg.png.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/green/.svn/prop-base/desc.png.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/green/.svn/prop-base/green.zip.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/green/.svn/prop-base/style.css.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/green/.svn/text-base/asc.png.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/green/.svn/text-base/bg.png.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/green/.svn/text-base/desc.png.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/green/.svn/text-base/green.zip.svn-base Diff File
rm - third_party/jquery-tablesorter/themes/green/.svn/text-base/style.css.svn-base Diff File
add - third_party/qTip2/.gitignore Diff File
add - third_party/qTip2/LICENSE-GPL Diff File
add - third_party/qTip2/LICENSE-MIT Diff File
add - third_party/qTip2/README.md Diff File
add - third_party/qTip2/dist/jquery.qtip.min.css Diff File
add - third_party/qTip2/dist/jquery.qtip.min.js Diff File
add - third_party/qTip2/grunt.js Diff File
add - third_party/qTip2/libs/jquery-loader.js Diff File
add - third_party/qTip2/libs/jquery/jquery.js Diff File
add - third_party/qTip2/package.json Diff File
add - third_party/qTip2/src/basic.css Diff File
add - third_party/qTip2/src/ie6/ie6.css Diff File
add - third_party/qTip2/src/imagemap/imagemap.js Diff File
add - third_party/qTip2/src/modal/modal.css Diff File
add - third_party/qTip2/src/modal/modal.js Diff File
add - third_party/qTip2/src/outro.js Diff File
add - third_party/qTip2/src/svg/svg.js Diff File
add - third_party/qTip2/src/viewport/viewport.js Diff File