LimeSurvey: Plugin b7890041

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa Plugin 2013-01-14 09:24 Plugin fa3a0378
Changeset

I hate windows + git
Merge branch 'Plugin' of https://github.com/LimeSurvey/LimeSurvey into HEAD

Conflicts:
application/libraries/PluginManager/ExamplePlugin.php
mod - .gitignore Diff File
mod - application/controllers/admin/statistics.php Diff File
add - application/libraries/PluginManager/ExamplePlugin.php Diff File
mod - application/libraries/PluginManager/PluginBase.php Diff File
mod - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Workbook.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/vvimport.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/vv_view.php Diff File
mod - application/views/admin/labels/editlabel_view.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/importCSV_view.php Diff File
mod - application/views/admin/quotas/editquota_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/remotecontrol/index_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/templates/importuploaded_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/exportdialog.php Diff File
mod - application/views/admin/token/tokenbar.php Diff File
mod - application/views/admin/user/deluser.php Diff File
mod - application/views/admin/user/modifyuser.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 - application/views/config/plugins.php Diff File
mod - application/views/layouts/main.php Diff File
mod - nbproject/project.properties Diff File
mod - nbproject/project.xml Diff File
mod - rpkxerqm.w3k.txt Diff File
mod - scripts/admin/statistics.js Diff File
mod - templates/default/template-rtl.css Diff File
mod - templates/default/template.css Diff File