LimeSurvey: Yii 03c4b3dc

Author Committer Branch Timestamp Parent
jcleeland jcleeland Yii 2012-07-10 19:57:56 Yii 9c6f9aa2
Changeset

Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii

mod - application/config/config-defaults.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/database_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
add - application/libraries/jsonRPCClient.php Diff File
add - application/libraries/jsonRPCServer.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - scripts/ranking.js Diff File
mod - styles-public/ranking.css Diff File
mod - templates/basic/ie_fix_8.css Diff File
mod - templates/basic/template.css Diff File
mod - templates/bluengrey/ie_fix_8.css Diff File
mod - templates/bluengrey/template.css Diff File
mod - templates/citronade/template.css Diff File
mod - templates/clear_logo/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