LimeSurvey: 2.05 937a10e1

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa 2.05 2013-04-05 13:42:08 2.05 a7e49fc3
Changeset

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

Conflicts:
styles/adminstyle.css
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.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/saved.php Diff File
mod - application/controllers/admin/statistics.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/core/LSUserIdentity.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/extensions/Menu/MenuWidget.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/exportresults_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/label_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/globalsettings_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/PluginManager/LimesurveyApi.php Diff File
mod - application/libraries/PluginManager/Question/QuestionBase.php Diff File
mod - application/libraries/PluginManager/Storage/DbStorage.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/Quota.php Diff File
mod - application/models/Survey.php Diff File
mod - application/tests/staticCalls.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/limeReplacementFields_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/import_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php Diff File
mod - application/views/admin/survey/copySurvey_view.php Diff File
mod - application/views/admin/survey/importSurvey_view.php Diff File
mod - application/views/plugins/index.php Diff File
mod - scripts/admin/conditions.js Diff File
add - scripts/slider-rating.js Diff File
add - scripts/star-rating.js Diff File
add - styles-public/emotes/faces.png Diff File
add - styles-public/img/slider-background.png Diff File
add - styles-public/img/slider.png Diff File
add - styles-public/img/stars.png Diff File
rm - styles-public/rating-img/star.gif Diff File
rm - styles-public/rating-img/star1.gif Diff File
rm - styles-public/rating-img/star2.gif Diff File
rm - styles-public/rating-img/star3.gif Diff File
rm - styles-public/rating-img/star4.gif Diff File
rm - styles-public/rating-img/star5.gif Diff File
add - styles-public/slider-rating.css Diff File
add - styles-public/star-rating.css Diff File
mod - styles/adminstyle.css Diff File
mod - styles/blobblueish/adminstyle.css Diff File