LimeSurvey: Yii 50a66714
Author | Committer | Branch | Timestamp | Parent |
---|---|---|---|---|
c_schmitz | c_schmitz | Yii | 2011-08-11 07:27:27 | Yii ace4e259 |
Changeset | Merging cpdb to ci branch git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@10687 b72ed6b6-b9f8-46b5-92b4-906544132732 |
|||
add - application/controllers/admin/participants.php | Diff File | |||
add - application/helpers/admin/export_data_helper.php | Diff File | |||
add - application/helpers/admin/export_structure_xml_helper.php | Diff File | |||
add - application/libraries/subquery.php | Diff File | |||
add - application/models/participant_attribute_model.php | Diff File | |||
add - application/models/participant_shares_model.php | Diff File | |||
add - application/models/participants_attributes_names_lang_model.php | Diff File | |||
add - application/models/participants_model.php | Diff File | |||
add - application/models/survey_links_model.php | Diff File | |||
add - application/models/tobemergedlater_model.php | Diff File | |||
add - application/views/admin/Participants/attributeControl_view.php | Diff File | |||
add - application/views/admin/Participants/attributeMapCSV_view.php | Diff File | |||
add - application/views/admin/Participants/attributeMapToken_view.php | Diff File | |||
add - application/views/admin/Participants/attributeMap_view.php | Diff File | |||
add - application/views/admin/Participants/displayParticipants_view.php | Diff File | |||
add - application/views/admin/Participants/importCSV_view.php | Diff File | |||
add - application/views/admin/Participants/participantsPanel_view.php | Diff File | |||
add - application/views/admin/Participants/sharePanel_view.php | Diff File | |||
add - application/views/admin/Participants/summary_view.php | Diff File | |||
add - application/views/admin/Participants/uploadSummary_view.php | Diff File | |||
add - application/views/admin/Participants/userControl_view.php | Diff File | |||
add - application/views/admin/Participants/viewAttribute_view.php | Diff File | |||
add - lime_participants_data.sql | Diff File | |||
add - scripts/admin/attributeControl.js | Diff File | |||
add - scripts/admin/attributeMap.js | Diff File | |||
add - scripts/admin/attributeMapCSV.js | Diff File | |||
add - scripts/admin/attributeMapToken.js | Diff File | |||
add - scripts/admin/displayParticipant.js | Diff File | |||
add - scripts/admin/sharePanel.js | Diff File | |||
add - scripts/admin/tokentocpdb.js | Diff File | |||
add - scripts/admin/userControl.js | Diff File | |||
add - scripts/admin/viewAttribute.js | Diff File | |||
add - scripts/jquery/css/jquery.multiselect.filter.css | Diff File | |||
add - scripts/jquery/jqGrid/css/ellipsis-xbl.xml | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-bg_diagonals-thick_20_666666_40x40.png | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-bg_flat_10_000000_40x100.png | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-bg_glass_100_f6f6f6_1x400.png | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-bg_glass_100_fdf5ce_1x400.png | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-bg_glass_65_ffffff_1x400.png | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-icons_222222_256x240.png | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-icons_228ef1_256x240.png | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-icons_ef8c08_256x240.png | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-icons_ffd27a_256x240.png | Diff File | |||
add - scripts/jquery/jqGrid/css/images/ui-icons_ffffff_256x240.png | Diff File | |||
add - scripts/jquery/jqGrid/css/jquery-ui-1.8.13.custom.css | Diff File | |||
add - scripts/jquery/jqGrid/css/jquery.ui.datepicker.css | Diff File | |||
add - scripts/jquery/jqGrid/css/ui.jqgrid.css | Diff File | |||
add - scripts/jquery/jqGrid/js/Changes.txt | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-ar.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-bg.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-bg1251.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-cat.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-cn.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-cs.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-da.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-de.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-el.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-en.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-es.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-fa.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-fi.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-fr.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-gl.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-he.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-hu.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-is.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-it.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-ja.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-lt.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-mne.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-nl.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-no.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-pl.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-pt-br.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-pt.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-ro.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-ru.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-sk.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-sr.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-sv.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-th.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-tr.js | Diff File | |||
add - scripts/jquery/jqGrid/js/i18n/grid.locale-ua.js | Diff File | |||
add - scripts/jquery/jqGrid/js/install.txt | Diff File | |||
add - scripts/jquery/jqGrid/js/jquery-1.5.2.min.js | Diff File | |||
add - scripts/jquery/jqGrid/js/jquery.jqGrid.min.js | Diff File | |||
add - scripts/jquery/jqGrid/js/jquery.jqGrid.src.js | Diff File | |||
add - scripts/jquery/jqGrid/js/jquery.ui.core.js | Diff File | |||
add - scripts/jquery/jqGrid/js/jquery.ui.datepicker.js | Diff File | |||
add - scripts/jquery/jqGrid/plugins/grid.addons.js | Diff File | |||
add - scripts/jquery/jqGrid/plugins/grid.postext.js | Diff File | |||
add - scripts/jquery/jqGrid/plugins/grid.setcolumns.js | Diff File | |||
add - scripts/jquery/jqGrid/plugins/jquery.contextmenu.js | Diff File | |||
add - scripts/jquery/jqGrid/plugins/jquery.searchFilter.js | Diff File | |||
add - scripts/jquery/jqGrid/plugins/jquery.tablednd.js | Diff File | |||
add - scripts/jquery/jqGrid/plugins/ui.multiselect.css | Diff File | |||
add - scripts/jquery/jqGrid/plugins/ui.multiselect.js | Diff File | |||
add - scripts/jquery/jqGrid/src/JsonXml.js | Diff File | |||
add - scripts/jquery/jqGrid/src/css/ellipsis-xbl.xml | Diff File | |||
add - scripts/jquery/jqGrid/src/css/ui.jqgrid.css | Diff File | |||
add - scripts/jquery/jqGrid/src/css/ui.multiselect.css | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.base.js | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.celledit.js | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.common.js | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.custom.js | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.filter.js | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.formedit.js | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.grouping.js | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.import.js | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.inlinedit.js | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.jqueryui.js | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.loader.js | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.subgrid.js | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.tbltogrid.js | Diff File | |||
add - scripts/jquery/jqGrid/src/grid.treegrid.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-ar.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-bg.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-bg1251.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-cat.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-cn.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-cs.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-da.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-de.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-dk.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-el.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-en.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-es.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-fa.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-fi.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-fr.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-gl.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-he.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-hu.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-is.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-it.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-ja.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-lt.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-mne.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-nl.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-no.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-pl.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-pt-br.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-pt.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-ro.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-ru.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-sk.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-sr.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-sv.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-th.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-tr.js | Diff File | |||
add - scripts/jquery/jqGrid/src/i18n/grid.locale-ua.js | Diff File | |||
add - scripts/jquery/jqGrid/src/jqDnR.js | Diff File | |||
add - scripts/jquery/jqGrid/src/jqModal.js | Diff File | |||
add - scripts/jquery/jqGrid/src/jquery.fmatter.js | Diff File | |||
add - scripts/jquery/jquery-qtip.js | Diff File | |||
add - scripts/jquery/jquery.jscrollpane.min.js | Diff File | |||
add - scripts/jquery/jquery.multiselect.filter.min.js | Diff File | |||
add - scripts/jquery/jquery.ui.sortable.js | Diff File | |||
add - scripts/modaldialog.js | Diff File | |||
mod - application/config/autoload.php | Diff File | |||
mod - application/config/config.php | Diff File | |||
mod - application/config/database.php | Diff File | |||
mod - application/config/lsconfig.php | Diff File | |||
mod - application/controllers/admin/browse.php | Diff File | |||
mod - application/controllers/admin/database.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/question.php | Diff File | |||
mod - application/controllers/admin/survey.php | Diff File | |||
mod - application/controllers/admin/templates.php | Diff File | |||
mod - application/controllers/admin/tokens.php | Diff File | |||
mod - application/core/AdminController.php | Diff File | |||
mod - application/core/LS_Controller.php | Diff File | |||
mod - application/core/SurveyCommonController.php | Diff File | |||
mod - application/helpers/admin/html_helper.php | Diff File | |||
mod - application/helpers/admin/htmleditor_helper.php | Diff File | |||
mod - application/helpers/common_helper.php | Diff File | |||
mod - application/helpers/database_helper.php | Diff File | |||
mod - application/helpers/export_helper.php | Diff File | |||
mod - application/helpers/surveytranslator_helper.php | Diff File | |||
mod - application/libraries/Limesurvey_lang.php | Diff File | |||
mod - application/libraries/admin/pdf.php | Diff File | |||
mod - application/libraries/admin/phpexcel/PHPExcel/IOFactory.php | Diff File | |||
mod - application/libraries/admin/queXMLPDF.php | Diff File | |||
mod - application/models/labels_model.php | Diff File | |||
mod - application/models/labelsets_model.php | Diff File | |||
mod - application/models/questions_model.php | Diff File | |||
mod - application/models/saved_control_model.php | Diff File | |||
mod - application/models/surveys_dynamic_model.php | Diff File | |||
mod - application/models/surveys_languagesettings_model.php | Diff File | |||
mod - application/models/templates_model.php | Diff File | |||
mod - application/models/tokens_dynamic_model.php | Diff File | |||
mod - application/models/user_groups_model.php | Diff File | |||
mod - application/models/users_model.php | Diff File | |||
mod - application/views/admin/Labels/labelbar_view.php | Diff File | |||
mod - application/views/admin/Labels/labelsetsbar_view.php | Diff File | |||
mod - application/views/admin/Super/adminmenu.php | Diff File | |||
mod - application/views/admin/Survey/Question/questionbar_view.php | Diff File | |||
mod - application/views/admin/Survey/deactivateSurvey_view.php | Diff File | |||
mod - application/views/admin/Survey/superview/superResourceManagement_view.php | Diff File | |||
mod - application/views/admin/Survey/surveybar.php | Diff File | |||
mod - application/views/admin/Templates/templatebar_view.php | Diff File | |||
mod - application/views/admin/Templates/templateeditorbar_view.php | Diff File | |||
mod - application/views/admin/Templates/templatesummary_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/Token/tokenbar.php | Diff File | |||
mod - application/views/admin/browse/browseidheader_view.php | Diff File | |||
mod - application/views/admin/browse/browsemenubar_view.php | Diff File | |||
mod - application/views/admin/globalsettings.php | Diff File | |||
mod - scripts/admin/answers.js | Diff File | |||
mod - scripts/admin/browse.js | Diff File | |||
mod - scripts/admin/subquestions.js | Diff File | |||
mod - scripts/admin/tokens.js | Diff File | |||
mod - scripts/jquery/css/jquery.multiselect.css | Diff File | |||
mod - scripts/jquery/jquery.multiselect.min.js | Diff File |