LimeSurvey: 2.05 4a2d74dd

Diff Back to Repository
Author Committer Branch Timestamp Parent
sammousa sammousa 2.05 2013-07-12 11:16 2.05 f26db5ac
Changeset

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

Conflicts:
application/helpers/qanda_helper.php
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/export/SurveyDao.php Diff File
mod - application/helpers/admin/export/Writer.php Diff File
mod - application/helpers/admin/exportresults_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
add - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/models/ExpressionError.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Label.php Diff File
mod - application/models/Question.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/SurveyDynamic.php Diff File
add - scripts/map.js Diff File
mod - scripts/survey_runtime.js Diff File
mod - templates/basic/template.css Diff File
mod - templates/bluengrey/template.css Diff File
mod - templates/clear_logo/template.css Diff File
mod - templates/default/template.css Diff File
mod - templates/eirenicon/template.css Diff File
mod - templates/limespired/template.css Diff File
mod - templates/mint_idea/template.css Diff File
mod - templates/sherpa/template.css Diff File
mod - templates/vallendar/template.css Diff File