LimeSurvey: Yii 826d1fd3

Diff Back to Repository
Author Committer Branch Timestamp Parent
jcleeland jcleeland Yii 2012-06-03 23:36:55 Yii eed87f3a
Changeset

Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii
add - application/helpers/update/updatedb_helper.php Diff File
add - application/models/LSActiveRecord.php Diff File
add - images/error_notice.png Diff File
add - images/success_notice.png Diff File
add - styles-public/images/ui-bg_flat_0_aaaaaa_40x100.png Diff File
add - styles-public/images/ui-bg_flat_55_999999_40x100.png Diff File
add - styles-public/images/ui-bg_flat_55_dbfb88_40x100.png Diff File
add - styles-public/images/ui-bg_flat_75_aaaaaa_40x100.png Diff File
add - styles-public/images/ui-bg_glass_60_fbf8bc_1x400.png Diff File
add - styles-public/images/ui-bg_glass_75_d0e5f5_1x400.png Diff File
add - styles-public/images/ui-bg_glass_85_dfeffc_1x400.png Diff File
add - styles-public/images/ui-bg_glass_95_fef1ec_1x400.png Diff File
add - styles-public/images/ui-bg_gloss-wave_45_e14f1c_500x100.png Diff File
add - styles-public/images/ui-bg_gloss-wave_50_6eac2c_500x100.png Diff File
add - styles-public/images/ui-bg_gloss-wave_75_2191c0_500x100.png Diff File
add - styles-public/images/ui-bg_gloss-wave_90_D2E0F2_500x100.png Diff File
add - styles-public/images/ui-bg_inset-hard_100_F8F8FF_1x100.png Diff File
add - styles-public/images/ui-bg_inset-hard_100_ffffff_1x100.png Diff File
add - styles-public/images/ui-icons_0078ae_256x240.png Diff File
add - styles-public/images/ui-icons_056b93_256x240.png Diff File
add - styles-public/images/ui-icons_2e83ff_256x240.png Diff File
add - styles-public/images/ui-icons_4582b0_256x240.png Diff File
add - styles-public/images/ui-icons_5fab2b_256x240.png Diff File
add - styles-public/images/ui-icons_6da8d5_256x240.png Diff File
add - styles-public/images/ui-icons_85a2c7_256x240.png Diff File
add - styles-public/images/ui-icons_EEF6FF_256x240.png Diff File
add - styles-public/images/ui-icons_cd0a0a_256x240.png Diff File
add - styles-public/images/ui-icons_d8e7f3_256x240.png Diff File
add - styles-public/images/ui-icons_e0fdff_256x240.png Diff File
add - styles-public/images/ui-icons_f5e175_256x240.png Diff File
add - styles-public/images/ui-icons_f7a50d_256x240.png Diff File
add - styles-public/images/ui-icons_fcd113_256x240.png Diff File
add - styles-public/jquery-ui.css Diff File
add - styles-public/jquery.keypad.alt.css Diff File
add - styles-public/jquery.keypad.css Diff File
add - styles-public/jquery.multiselect.css Diff File
add - styles-public/jquery.multiselect.filter.css Diff File
add - styles-public/lime-progress.css Diff File
add - styles-public/uploader.css Diff File
add - styles/blobblueish/images/arrows_rtl.png Diff File
add - styles/gartergrey/images/arrows_rtl.png Diff File
add - styles/gringegreen/images/arrows_rtl.png Diff File
add - templates/clear_logo/images/ui-bg_flat_75_ffffff_40x100.png Diff File
add - templates/clear_logo/images/ui-bg_glass_55_fbf9ee_1x400.png Diff File
add - templates/clear_logo/images/ui-bg_glass_65_ffffff_1x400.png Diff File
add - templates/clear_logo/images/ui-bg_glass_75_dadada_1x400.png Diff File
add - templates/clear_logo/images/ui-bg_glass_75_e6e6e6_1x400.png Diff File
add - templates/clear_logo/images/ui-bg_glass_95_fef1ec_1x400.png Diff File
add - templates/clear_logo/images/ui-bg_highlight-soft_75_8fe0dd_1x100.png Diff File
add - templates/clear_logo/images/ui-icons_222222_256x240.png Diff File
add - templates/clear_logo/images/ui-icons_2e83ff_256x240.png Diff File
add - templates/clear_logo/images/ui-icons_888888_256x240.png Diff File
add - templates/clear_logo/images/ui-icons_cd0a0a_256x240.png Diff File
add - templates/limespired/images/ui-bg_diagonals-thick_50_ff3853_40x40.png Diff File
add - templates/limespired/images/ui-bg_flat_80_ffff38_40x100.png Diff File
add - templates/limespired/images/ui-bg_highlight-hard_75_ccd232_1x100.png Diff File
add - templates/limespired/images/ui-bg_highlight-soft_40_db4865_1x100.png Diff File
add - templates/limespired/images/ui-bg_inset-hard_50_93c3cd_1x100.png Diff File
add - templates/mint_idea/images/ui-bg_highlight-soft_75_192d40_1x100.png Diff File
add - templates/mint_idea/images/ui-icons_e8eaeb_256x240.png Diff File
add - templates/sherpa/images/ui-bg_flat_100_aabbcc_40x100.png Diff File
add - templates/sherpa/images/ui-bg_flat_50_3baae3_40x100.png Diff File
add - templates/sherpa/images/ui-bg_flat_80_aaccee_40x100.png Diff File
add - templates/sherpa/images/ui-bg_inset-hard_100_eeeeee_1x100.png Diff File
add - templates/sherpa/images/ui-icons_222222_256x240.png Diff File
add - templates/vallendar/images/ui-icons_17479e_256x240.png Diff File
rm - application/helpers/update/upgrade-all_helper.php Diff File
rm - application/helpers/update/upgrade-mssql_helper.php Diff File
rm - application/helpers/update/upgrade-mysql_helper.php Diff File
rm - application/helpers/update/upgrade-pgsql_helper.php Diff File
rm - scripts/jquery/css/start/images/ui-bg_flat_0_aaaaaa_40x100.png Diff File
rm - scripts/jquery/css/start/images/ui-bg_flat_55_999999_40x100.png Diff File
rm - scripts/jquery/css/start/images/ui-bg_flat_55_dbfb88_40x100.png Diff File
rm - scripts/jquery/css/start/images/ui-bg_flat_75_aaaaaa_40x100.png Diff File
rm - scripts/jquery/css/start/images/ui-bg_glass_60_fbf8bc_1x400.png Diff File
rm - scripts/jquery/css/start/images/ui-bg_glass_75_d0e5f5_1x400.png Diff File
rm - scripts/jquery/css/start/images/ui-bg_glass_85_dfeffc_1x400.png Diff File
rm - scripts/jquery/css/start/images/ui-bg_glass_95_fef1ec_1x400.png Diff File
rm - scripts/jquery/css/start/images/ui-bg_gloss-wave_45_e14f1c_500x100.png Diff File
rm - scripts/jquery/css/start/images/ui-bg_gloss-wave_50_6eac2c_500x100.png Diff File
rm - scripts/jquery/css/start/images/ui-bg_gloss-wave_75_2191c0_500x100.png Diff File
rm - scripts/jquery/css/start/images/ui-bg_gloss-wave_90_D2E0F2_500x100.png Diff File
rm - scripts/jquery/css/start/images/ui-bg_inset-hard_100_F8F8FF_1x100.png Diff File
rm - scripts/jquery/css/start/images/ui-bg_inset-hard_100_ffffff_1x100.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_0078ae_256x240.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_056b93_256x240.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_2e83ff_256x240.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_4582b0_256x240.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_5fab2b_256x240.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_6da8d5_256x240.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_85a2c7_256x240.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_EEF6FF_256x240.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_cd0a0a_256x240.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_d8e7f3_256x240.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_e0fdff_256x240.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_f5e175_256x240.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_f7a50d_256x240.png Diff File
rm - scripts/jquery/css/start/images/ui-icons_fcd113_256x240.png Diff File
rm - scripts/jquery/css/start/jquery-ui.css Diff File
rm - scripts/jquery/css/jquery.keypad.alt.css Diff File
rm - scripts/jquery/css/jquery.keypad.css Diff File
rm - scripts/jquery/css/jquery.multiselect.css Diff File
rm - scripts/jquery/css/jquery.multiselect.filter.css Diff File
rm - scripts/jquery/css/start/lime-progress.css Diff File
rm - scripts/uploader.css Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/database_helper.php Diff File
mod - application/helpers/expressions/em_core_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/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/update/update_helper.php Diff File
mod - application/libraries/Load_answers.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/models/Answers.php Diff File
mod - application/models/Questions.php Diff File
mod - application/models/Survey_dynamic.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
mod - application/views/admin/survey/importSurvey_view.php Diff File
mod - application/views/admin/token/tokensummary.php Diff File
mod - framework/db/schema/pgsql/CPgsqlSchema.php Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de-informal/LC_MESSAGES/de-informal.mo Diff File
mod - locale/de-informal/LC_MESSAGES/de-informal.po Diff File
mod - locale/nl-informal/LC_MESSAGES/nl-informal.mo Diff File
mod - locale/nl-informal/LC_MESSAGES/nl-informal.po Diff File
mod - locale/nl/LC_MESSAGES/nl.mo Diff File
mod - locale/nl/LC_MESSAGES/nl.po Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.po Diff File
mod - locale/pt/LC_MESSAGES/pt.mo Diff File
mod - locale/pt/LC_MESSAGES/pt.po Diff File
mod - locale/sl/LC_MESSAGES/sl.mo Diff File
mod - locale/sl/LC_MESSAGES/sl.po Diff File
mod - scripts/admin/ckeditor.36/limesurvey-config.js Diff File
mod - scripts/expressions/em_javascript.js Diff File
mod - scripts/modaldialog.js Diff File
mod - styles/blobblueish/adminstyle-rtl.css Diff File
mod - styles/gartergrey/adminstyle-rtl.css Diff File
mod - styles/gringegreen/adminstyle-rtl.css Diff File
mod - styles/gringegreen/adminstyle.css Diff File
mod - templates/basic/images/ui-icons_2e83ff_256x240.png Diff File
mod - templates/basic/jquery-ui-custom.css Diff File
mod - templates/bluengrey/jquery-ui-custom.css Diff File
mod - templates/clear_logo/jquery-ui-custom.css Diff File
mod - templates/default/images/ui-bg_glass_100_e4f1fb_1x400.png Diff File
mod - templates/default/images/ui-bg_highlight-soft_25_ffef8f_1x100.png Diff File
mod - templates/default/jquery-ui-custom.css Diff File
mod - templates/eirenicon/jquery-ui-custom.css Diff File
mod - templates/limespired/images/ui-bg_dots-small_35_35414f_2x2.png Diff File
mod - templates/limespired/images/ui-bg_flat_75_ba9217_40x100.png Diff File
mod - templates/limespired/images/ui-bg_white-lines_85_f7f7ba_40x100.png Diff File
mod - templates/limespired/images/ui-icons_88a206_256x240.png Diff File
mod - templates/limespired/images/ui-icons_c02669_256x240.png Diff File
mod - templates/limespired/jquery-ui-custom.css Diff File
mod - templates/mint_idea/jquery-ui-custom.css Diff File
mod - templates/sherpa/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png Diff File
mod - templates/sherpa/images/ui-bg_highlight-soft_25_ffef8f_1x100.png Diff File
mod - templates/sherpa/images/ui-icons_3d80b3_256x240.png Diff File
mod - templates/sherpa/jquery-ui-custom.css Diff File
mod - templates/vallendar/jquery-ui-custom.css Diff File
mod - templates/vallendar/template.css Diff File