Changesets: LimeSurvey

Search Browse Back to Index

Yii 03ff2252

2012-05-01 15:20:19

user9189

Details Diff 		Merge branch 'Yii' of github.com:LimeSurvey/LimeSurvey into Yii
Attach Issues:
add - images/cut.gif Diff File
add - images/help.gif Diff File
add - images/limecursor-handle.png Diff File
add - images/placeholder.png Diff File
add - images/slider-bg-1.png Diff File
add - images/slider-bg-2.png Diff File
add - images/slider-handle.gif Diff File
add - images/slider-handle2.gif Diff File
add - images/slider.png Diff File
add - images/sliderBg.png Diff File
add - images/ui-bg_flat_0_aaaaaa_40x100.png Diff File
add - images/ui-bg_flat_75_F8F8FF_40x100.png Diff File
add - images/ui-bg_glass_100_effbdb_1x400.png Diff File
add - images/ui-bg_glass_55_fbf9ee_1x400.png Diff File
add - images/ui-bg_glass_65_ffffff_1x400.png Diff File
add - images/ui-bg_glass_75_EAF2FF_1x400.png Diff File
add - images/ui-bg_glass_75_dadada_1x400.png Diff File
add - images/ui-bg_highlight-soft_75_F8F8FF_1x100.png Diff File
add - images/ui-bg_inset-soft_95_fef1ec_1x100.png Diff File
add - images/ui-icons_222222_256x240.png Diff File
add - images/ui-icons_2e83ff_256x240.png Diff File
add - images/ui-icons_328639_256x240.png Diff File
add - images/ui-icons_454545_256x240.png Diff File
add - images/ui-icons_888888_256x240.png Diff File
add - images/ui-icons_cd0a0a_256x240.png Diff File
add - styles/blobblueish/iconsize Diff File
add - styles/blobblueish/images/cpdb.png Diff File
add - styles/blobblueish/images/separator.gif Diff File
add - styles/blobblueish/images/statistics_time.png Diff File
add - styles/gartergrey/displayParticipants.css Diff File
add - styles/gartergrey/iconsize Diff File
add - styles/gartergrey/images/DownArrow.png Diff File
add - styles/gartergrey/images/activate.png Diff File
add - styles/gartergrey/images/activate_deactivate.png Diff File
add - styles/gartergrey/images/active.png Diff File
add - styles/gartergrey/images/add.png Diff File
add - styles/gartergrey/images/add_disabled.png Diff File
add - styles/gartergrey/images/admincrnr.png Diff File
add - styles/gartergrey/images/answers.png Diff File
add - styles/gartergrey/images/arrows.png Diff File
add - styles/gartergrey/images/assessments_30.png Diff File
add - styles/gartergrey/images/backup.png Diff File
add - styles/gartergrey/images/badsecurity.png Diff File
add - styles/gartergrey/images/blank.gif Diff File
add - styles/gartergrey/images/bounce.png Diff File
add - styles/gartergrey/images/bounce_settings.png Diff File
add - styles/gartergrey/images/browse.png Diff File
add - styles/gartergrey/images/browse_30.png Diff File
add - styles/gartergrey/images/browse_disabled_30.png Diff File
add - styles/gartergrey/images/checkdb.png Diff File
add - styles/gartergrey/images/checked.png Diff File
add - styles/gartergrey/images/close.png Diff File
add - styles/gartergrey/images/conditions.png Diff File
add - styles/gartergrey/images/conditions_add.png Diff File
add - styles/gartergrey/images/conditions_copy.png Diff File
add - styles/gartergrey/images/conditions_delete.png Diff File
add - styles/gartergrey/images/conditions_deleteall.png Diff File
add - styles/gartergrey/images/conditions_edit.png Diff File
add - styles/gartergrey/images/copy.png Diff File
add - styles/gartergrey/images/copy_disabled.png Diff File
add - styles/gartergrey/images/copyconditions.png Diff File
add - styles/gartergrey/images/cpdb.png Diff File
add - styles/gartergrey/images/create_dummy_token.png Diff File
add - styles/gartergrey/images/cut.png Diff File
add - styles/gartergrey/images/databack.png Diff File
add - styles/gartergrey/images/databegin.png Diff File
add - styles/gartergrey/images/dataend.png Diff File
add - styles/gartergrey/images/dataentry.png Diff File
add - styles/gartergrey/images/dataentry_30.png Diff File
add - styles/gartergrey/images/dataentry_disabled.png Diff File
add - styles/gartergrey/images/dataentry_disabled_30.png Diff File
add - styles/gartergrey/images/dataforward.png Diff File
add - styles/gartergrey/images/deactivate.png Diff File
add - styles/gartergrey/images/defaultanswers.png Diff File
add - styles/gartergrey/images/delete.png Diff File
add - styles/gartergrey/images/delete_16.png Diff File
add - styles/gartergrey/images/delete_30.png Diff File
add - styles/gartergrey/images/delete_disabled.png Diff File
add - styles/gartergrey/images/display_export.png Diff File
add - styles/gartergrey/images/do.png Diff File
add - styles/gartergrey/images/docs.png Diff File
add - styles/gartergrey/images/document.png Diff File
add - styles/gartergrey/images/donate.png Diff File
add - styles/gartergrey/images/down.png Diff File
add - styles/gartergrey/images/down_all.png Diff File
add - styles/gartergrey/images/dumpgroup.png Diff File
add - styles/gartergrey/images/dumplabel.png Diff File
add - styles/gartergrey/images/dumplabelmulti.png Diff File
add - styles/gartergrey/images/dumpquestion.png Diff File
add - styles/gartergrey/images/edit.png Diff File
add - styles/gartergrey/images/edit_16.png Diff File
add - styles/gartergrey/images/edit_30.png Diff File
add - styles/gartergrey/images/emailsettings.png Diff File
add - styles/gartergrey/images/emailtemplates.png Diff File
add - styles/gartergrey/images/emailtemplates_30.png Diff File
add - styles/gartergrey/images/expired.png Diff File
add - styles/gartergrey/images/export.png Diff File
add - styles/gartergrey/images/export2.png Diff File
add - styles/gartergrey/images/export_30.png Diff File
add - styles/gartergrey/images/export_disabled_30.png Diff File
add - styles/gartergrey/images/exportcsv.png Diff File
add - styles/gartergrey/images/exportr.png Diff File
add - styles/gartergrey/images/exportspss.png Diff File
add - styles/gartergrey/images/exportsql.png Diff File
add - styles/gartergrey/images/exportvv.png Diff File
add - styles/gartergrey/images/expressionmanager_30.png Diff File
add - styles/gartergrey/images/global.png Diff File
add - styles/gartergrey/images/handle.png Diff File
add - styles/gartergrey/images/help-template.png Diff File
add - styles/gartergrey/images/help.png Diff File
add - styles/gartergrey/images/home.png Diff File
add - styles/gartergrey/images/import.png Diff File
add - styles/gartergrey/images/importcsv.png Diff File
add - styles/gartergrey/images/importldap.png Diff File
add - styles/gartergrey/images/importold.png Diff File
add - styles/gartergrey/images/importvv.png Diff File
add - styles/gartergrey/images/inactive.png Diff File
add - styles/gartergrey/images/inactive_old.png Diff File
add - styles/gartergrey/images/invite.png Diff File
add - styles/gartergrey/images/iterate.png Diff File
add - styles/gartergrey/images/labels.png Diff File
add - styles/gartergrey/images/logout.png Diff File
add - styles/gartergrey/images/maximize.png Diff File
add - styles/gartergrey/images/minimize.png Diff File
add - styles/gartergrey/images/next.png Diff File
add - styles/gartergrey/images/next_20.png Diff File
add - styles/gartergrey/images/next_disabled_20.png Diff File
add - styles/gartergrey/images/noedit.png Diff File
add - styles/gartergrey/images/notyetstarted.png Diff File
add - styles/gartergrey/images/organize.png Diff File
add - styles/gartergrey/images/organize_disabled.png Diff File
add - styles/gartergrey/images/pause.png Diff File
add - styles/gartergrey/images/paused.png Diff File
add - styles/gartergrey/images/phpslogo.png Diff File
add - styles/gartergrey/images/plus.png Diff File
add - styles/gartergrey/images/preview.png Diff File
add - styles/gartergrey/images/previous.png Diff File
add - styles/gartergrey/images/previous_20.png Diff File
add - styles/gartergrey/images/previous_disabled_20.png Diff File
add - styles/gartergrey/images/print.png Diff File
add - styles/gartergrey/images/print_30.png Diff File
add - styles/gartergrey/images/profile_edit.png Diff File
add - styles/gartergrey/images/quality_assurance.png Diff File
add - styles/gartergrey/images/quality_assurance_30.png Diff File
add - styles/gartergrey/images/quota.png Diff File
add - styles/gartergrey/images/quota_30.png Diff File
add - styles/gartergrey/images/remind.png Diff File
add - styles/gartergrey/images/reorder.png Diff File
add - styles/gartergrey/images/reorder_disabled.png Diff File
add - styles/gartergrey/images/resetsurveylogic.png Diff File
add - styles/gartergrey/images/resetsurveylogic_disabled.png Diff File
add - styles/gartergrey/images/responses.png Diff File
add - styles/gartergrey/images/returnhome.png Diff File
add - styles/gartergrey/images/save.png Diff File
add - styles/gartergrey/images/saved.png Diff File
add - styles/gartergrey/images/saved_30.png Diff File
add - styles/gartergrey/images/saved_disabled_30.png Diff File
add - styles/gartergrey/images/scenario_delete.png Diff File
add - styles/gartergrey/images/scenario_edit.png Diff File
add - styles/gartergrey/images/scenario_renumber.png Diff File
add - styles/gartergrey/images/security.png Diff File
add - styles/gartergrey/images/security_16.png Diff File
add - styles/gartergrey/images/separator.gif Diff File
add - styles/gartergrey/images/settings.png Diff File
add - styles/gartergrey/images/shadow.png Diff File
add - styles/gartergrey/images/share.png Diff File
add - styles/gartergrey/images/showhelp.png Diff File
add - styles/gartergrey/images/speaker.png Diff File
add - styles/gartergrey/images/statistics.png Diff File
add - styles/gartergrey/images/statistics_time.png Diff File
add - styles/gartergrey/images/subquestions.png Diff File
add - styles/gartergrey/images/subquestions2d.png Diff File
add - styles/gartergrey/images/summary.png Diff File
add - styles/gartergrey/images/survey_security.png Diff File
add - styles/gartergrey/images/survey_security_30.png Diff File
add - styles/gartergrey/images/surveylist.png Diff File
add - styles/gartergrey/images/surveysettings_30.png Diff File
add - styles/gartergrey/images/tag.png Diff File
add - styles/gartergrey/images/takeownership.png Diff File
add - styles/gartergrey/images/templatepermissions_small.png Diff File
add - styles/gartergrey/images/templates.png Diff File
add - styles/gartergrey/images/token_delete.png Diff File
add - styles/gartergrey/images/token_invite.png Diff File
add - styles/gartergrey/images/token_manage.png Diff File
add - styles/gartergrey/images/token_remind.png Diff File
add - styles/gartergrey/images/token_viewanswer.png Diff File
add - styles/gartergrey/images/tokenify.png Diff File
add - styles/gartergrey/images/tokens.png Diff File
add - styles/gartergrey/images/tools.png Diff File
add - styles/gartergrey/images/trafficgreen.png Diff File
add - styles/gartergrey/images/trafficred.png Diff File
add - styles/gartergrey/images/translate.png Diff File
add - styles/gartergrey/images/translate_disabled_30.png Diff File
add - styles/gartergrey/images/unchecked.png Diff File
add - styles/gartergrey/images/usergroup.png Diff File
add - styles/gartergrey/images/viewlast.png Diff File
add - styles/gartergrey/images/vvexport.png Diff File
add - styles/gartergrey/images/vvimport.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_flat_55_999999_40x100.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_flat_55_dbfb88_40x100.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_flat_75_aaaaaa_40x100.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_glass_60_fbf8bc_1x400.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_glass_75_d0e5f5_1x400.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_glass_85_dfeffc_1x400.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_gloss-wave_45_e14f1c_500x100.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_gloss-wave_50_6eac2c_500x100.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_gloss-wave_75_2191c0_500x100.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_gloss-wave_90_D2E0F2_500x100.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_inset-hard_100_F8F8FF_1x100.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-bg_inset-hard_100_ffffff_1x100.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_0078ae_256x240.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_056b93_256x240.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_2e83ff_256x240.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_4582b0_256x240.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_5fab2b_256x240.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_6da8d5_256x240.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_85a2c7_256x240.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_EEF6FF_256x240.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_cd0a0a_256x240.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_d8e7f3_256x240.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_e0fdff_256x240.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_f5e175_256x240.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_f7a50d_256x240.png Diff File
add - styles/gartergrey/jquery-ui/images/ui-icons_fcd113_256x240.png Diff File
add - styles/gartergrey/jquery-ui/jquery-ui.css Diff File
add - styles/gartergrey/jquery-ui/lime-progress.css Diff File
add - styles/gartergrey/printablestyle.css Diff File
add - styles/gartergrey/superfish.css Diff File
add - styles/gringegreen/iconsize Diff File
add - styles/gringegreen/images/cpdb.png Diff File
add - styles/gringegreen/images/dataentry_20.png Diff File
add - styles/gringegreen/images/quality_assurance_30.png Diff File
add - styles/gringegreen/images/separator.gif Diff File
add - styles/gringegreen/images/statistics_time.png Diff File
add - styles/gringegreen/images/subquestions2d.png.png Diff File
add - styles/gringegreen/jquery-ui/images/ui-icons_94d200_256x240.png Diff File
rm - application/views/admin/conditions/conditionsforms_view.php Diff File
rm - images/add_20.png Diff File
rm - images/backup.png Diff File
rm - styles/gringegreen/images/cut.gif Diff File
rm - styles/gringegreen/images/help.gif Diff File
rm - styles/gringegreen/images/limecursor-handle.png Diff File
rm - styles/gringegreen/images/placeholder.png Diff File
rm - styles/blobblueish/images/slider-bg-1.png Diff File
rm - styles/blobblueish/images/slider-bg-2.png Diff File
rm - styles/blobblueish/images/slider-handle.gif Diff File
rm - styles/blobblueish/images/slider-handle2.gif Diff File
rm - styles/blobblueish/images/slider.png Diff File
rm - styles/blobblueish/images/sliderBg.png Diff File
rm - images/survey_security_30.png Diff File
rm - styles/gringegreen/images/ui-bg_flat_0_aaaaaa_40x100.png Diff File
rm - styles/gringegreen/images/ui-bg_flat_75_F8F8FF_40x100.png Diff File
rm - styles/gringegreen/images/ui-bg_glass_55_fbf9ee_1x400.png Diff File
rm - styles/gringegreen/images/ui-bg_glass_65_ffffff_1x400.png Diff File
rm - styles/gringegreen/images/ui-bg_glass_75_EAF2FF_1x400.png Diff File
rm - styles/gringegreen/images/ui-bg_glass_75_dadada_1x400.png Diff File
rm - styles/gringegreen/images/ui-bg_highlight-soft_75_F8F8FF_1x100.png Diff File
rm - styles/gringegreen/images/ui-bg_inset-soft_95_fef1ec_1x100.png Diff File
rm - styles/gringegreen/images/ui-icons_222222_256x240.png Diff File
rm - styles/gringegreen/images/ui-icons_2e83ff_256x240.png Diff File
rm - styles/gringegreen/images/ui-icons_328639_256x240.png Diff File
rm - styles/gringegreen/images/ui-icons_454545_256x240.png Diff File
rm - styles/gringegreen/images/ui-icons_888888_256x240.png Diff File
rm - styles/gringegreen/images/ui-icons_cd0a0a_256x240.png Diff File
rm - styles/blobblueish/images/badsecurity.png Diff File
rm - styles/blobblueish/images/seperator.gif Diff File
rm - styles/blobblueish/images/timeStatistics.png Diff File
rm - styles/blobblueish/images/survey_settings_30.png Diff File
rm - styles/blobblueish/tab.png Diff File
rm - styles/gringegreen/jquery-ui/images/ui-icons_4582b0_256x240.png Diff File
rm - styles/gringegreen/jquery-ui/images/ui-icons_EEF6FF_256x240.png Diff File
rm - styles/gringegreen/jquery-ui/images/ui-icons_cd0a0a_256x240.png Diff File
rm - styles/gringegreen/jquery-ui/images/ui-icons_d8e7f3_256x240.png Diff File
rm - styles/gringegreen/jquery-ui/images/ui-icons_e0fdff_256x240.png Diff File
rm - styles/gringegreen/jquery-ui/images/ui-icons_f5e175_256x240.png Diff File
rm - styles/gringegreen/jquery-ui/images/ui-icons_f7a50d_256x240.png Diff File
rm - styles/gringegreen/jquery-ui/images/ui-icons_fcd113_256x240.png Diff File
rm - styles/gringegreen/activate.png Diff File
rm - styles/gringegreen/bkgmaintitle.gif Diff File
rm - styles/gringegreen/images/Thumbs.db Diff File
rm - styles/gringegreen/images/add_30.png Diff File
rm - styles/gringegreen/images/add_small.png Diff File
rm - styles/gringegreen/images/addgrouptoken.png Diff File
rm - styles/gringegreen/images/answerssmall.png Diff File
rm - styles/gringegreen/images/assessments.png Diff File
rm - styles/gringegreen/images/badsecurity.png Diff File
rm - styles/gringegreen/images/browse.png Diff File
rm - styles/gringegreen/images/chart.jpg Diff File
rm - styles/gringegreen/images/close.gif Diff File
rm - styles/gringegreen/images/deletegroup.png Diff File
rm - styles/gringegreen/images/downarrow.png Diff File
rm - styles/gringegreen/images/edit_disabled.png Diff File
rm - styles/gringegreen/images/emailsettings.png Diff File
rm - styles/gringegreen/images/exportsql.png Diff File
rm - styles/gringegreen/images/extendedconditions.png Diff File
rm - styles/gringegreen/images/minus.gif Diff File
rm - styles/gringegreen/images/next-horizontal.png Diff File
rm - styles/gringegreen/images/next.png Diff File
rm - styles/gringegreen/images/noedit.png Diff File
rm - styles/gringegreen/images/pause.png Diff File
rm - styles/gringegreen/images/paused.png Diff File
rm - styles/gringegreen/images/plus.gif Diff File
rm - styles/gringegreen/images/prev-horizontal.png Diff File
rm - styles/gringegreen/images/print.png Diff File
rm - styles/gringegreen/images/quota.png Diff File
rm - styles/gringegreen/images/reorder.png Diff File
rm - styles/gringegreen/images/reorder_30.png Diff File
rm - styles/gringegreen/images/reorder_disabled.png Diff File
rm - styles/gringegreen/images/reorder_disabled_30.png Diff File
rm - styles/gringegreen/images/returnhome.png Diff File
rm - styles/gringegreen/images/save.png Diff File
rm - styles/gringegreen/images/scanner_30.png Diff File
rm - styles/gringegreen/images/security_small.png Diff File
rm - styles/gringegreen/images/seperator.gif Diff File
rm - styles/gringegreen/images/slider-bg-1.png Diff File
rm - styles/gringegreen/images/slider-bg-2.png Diff File
rm - styles/gringegreen/images/slider-handle.gif Diff File
rm - styles/gringegreen/images/slider-handle2.gif Diff File
rm - styles/gringegreen/images/slider.png Diff File
rm - styles/gringegreen/images/sliderBg.png Diff File
rm - styles/gringegreen/images/statistics_30.png Diff File
rm - styles/gringegreen/images/timeStatistics.png Diff File
rm - styles/gringegreen/images/subquestions2d.png Diff File
rm - styles/gringegreen/images/survey_security.png Diff File
rm - styles/gringegreen/images/survey_settings_30.png Diff File
rm - styles/gringegreen/images/token_manage_30.png Diff File
rm - styles/gringegreen/images/tokenifygroup.png Diff File
rm - styles/gringegreen/images/tokens_30.png Diff File
rm - styles/gringegreen/images/trafficgreen.png Diff File
rm - styles/gringegreen/images/translate.png Diff File
rm - styles/gringegreen/images/translate_disabled.png Diff File
rm - styles/gringegreen/images/trash.png Diff File
rm - styles/gringegreen/images/up.png Diff File
rm - styles/gringegreen/images/usergroup.png Diff File
rm - styles/gringegreen/tab.png Diff File
mod - .gitignore Diff File
mod - application/config/config-defaults.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/browse.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/kcfinder.php Diff File
mod - application/controllers/admin/labels.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/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/libraries/Limesurvey_lang.php Diff File
mod - application/models/Conditions.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
mod - application/views/admin/assessments_view.php Diff File
mod - application/views/admin/browse/browseallheader_view.php Diff File
mod - application/views/admin/browse/browseallrow_view.php Diff File
mod - application/views/admin/browse/browseidheader_view.php Diff File
mod - application/views/admin/browse/browsemenubar_view.php Diff File
mod - application/views/admin/browse/browsetimeheader_view.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/conditions/conditionslist_view.php Diff File
mod - application/views/admin/conditions/includes/conditions_edit.php Diff File
mod - application/views/admin/conditions/includes/conditions_scenario.php Diff File
mod - application/views/admin/dataentry/includes/editdata/header.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/labels/labelbar_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/labels/labelview_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/admin/participants/viewAttribute_view.php Diff File
mod - application/views/admin/saved/savedlist_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/super/footer.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/templates/templateeditorbar_view.php Diff File
mod - application/views/admin/token/tokenbar.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/usergroup/usergroupbar_view.php 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/de/LC_MESSAGES/de.mo Diff File
mod - locale/de/LC_MESSAGES/de.po Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/displayParticipant.js Diff File
mod - scripts/admin/globalsettings.js Diff File
mod - scripts/admin/kcfinder/core/uploader.php Diff File
mod - scripts/admin/kcfinder/js/helper.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/admin/updateset.js Diff File
mod - scripts/jquery/css/start/jquery-ui.css Diff File
mod - styles/blobblueish/adminstyle.css Diff File
mod - styles/blobblueish/jquery-ui/jquery-ui.css Diff File
mod - styles/gartergrey/adminstyle.css Diff File
mod - styles/gringegreen/adminstyle.css Diff File
mod - styles/gringegreen/images/activate_deactivate_30.png Diff File
mod - styles/gringegreen/images/activate_disabled.png Diff File
mod - styles/gringegreen/images/active.png Diff File
mod - styles/gringegreen/images/addanswer.png Diff File
mod - styles/gringegreen/images/answers.png Diff File
mod - styles/gringegreen/images/answers_20.png Diff File
mod - styles/gringegreen/images/arrows.png Diff File
mod - styles/gringegreen/images/assessments_30.png Diff File
mod - styles/gringegreen/images/backup.png Diff File
mod - styles/gringegreen/images/backup_disabled.png Diff File
mod - styles/gringegreen/images/bounce.png Diff File
mod - styles/gringegreen/images/bounce_disabled.png Diff File
mod - styles/gringegreen/images/bounce_settings.png Diff File
mod - styles/gringegreen/images/browse_30.png Diff File
mod - styles/gringegreen/images/browse_disabled_30.png Diff File
mod - styles/gringegreen/images/chart.png Diff File
mod - styles/gringegreen/images/chart_bar.png Diff File
mod - styles/gringegreen/images/chart_disabled.png Diff File
mod - styles/gringegreen/images/close.png Diff File
mod - styles/gringegreen/images/copy.png Diff File
mod - styles/gringegreen/images/copy_disabled.png Diff File
mod - styles/gringegreen/images/create_dummy_token.png Diff File
mod - styles/gringegreen/images/databack.png Diff File
mod - styles/gringegreen/images/databegin.png Diff File
mod - styles/gringegreen/images/dataend.png Diff File
mod - styles/gringegreen/images/dataentry.png Diff File
mod - styles/gringegreen/images/dataentry_30.png Diff File
mod - styles/gringegreen/images/dataentry_disabled.png Diff File
mod - styles/gringegreen/images/dataentry_disabled_30.png Diff File
mod - styles/gringegreen/images/dataforward.png Diff File
mod - styles/gringegreen/images/deactivate.png Diff File
mod - styles/gringegreen/images/defaultanswers.png Diff File
mod - styles/gringegreen/images/delete_disabled.png Diff File
mod - styles/gringegreen/images/deleteanswer.png Diff File
mod - styles/gringegreen/images/display_export.png Diff File
mod - styles/gringegreen/images/do_16.png Diff File
mod - styles/gringegreen/images/do_30.png Diff File
mod - styles/gringegreen/images/document.png Diff File
mod - styles/gringegreen/images/down.png Diff File
mod - styles/gringegreen/images/down_all.png Diff File
mod - styles/gringegreen/images/download.png Diff File
mod - styles/gringegreen/images/dumpgroup.png Diff File
mod - styles/gringegreen/images/dumplabel.png Diff File
mod - styles/gringegreen/images/dumplabelmulti.png Diff File
mod - styles/gringegreen/images/dumpquestion.png Diff File
mod - styles/gringegreen/images/edit.png Diff File
mod - styles/gringegreen/images/edit_30.png Diff File
mod - styles/gringegreen/images/edithtmlpopup.png Diff File
mod - styles/gringegreen/images/edithtmlpopup_disabled.png Diff File
mod - styles/gringegreen/images/emailtemplates.png Diff File
mod - styles/gringegreen/images/emailtemplates_30.png Diff File
mod - styles/gringegreen/images/expired.png Diff File
mod - styles/gringegreen/images/export.png Diff File
mod - styles/gringegreen/images/export_30.png Diff File
mod - styles/gringegreen/images/export_disabled.png Diff File
mod - styles/gringegreen/images/export_disabled_30.png Diff File
mod - styles/gringegreen/images/exportcsv.png Diff File
mod - styles/gringegreen/images/exportr.png Diff File
mod - styles/gringegreen/images/exportspss.png Diff File
mod - styles/gringegreen/images/exportvv.png Diff File
mod - styles/gringegreen/images/expressionmanager_30.png Diff File
mod - styles/gringegreen/images/handle.png Diff File
mod - styles/gringegreen/images/import.png Diff File
mod - styles/gringegreen/images/import_disabled.png Diff File
mod - styles/gringegreen/images/importcsv.png Diff File
mod - styles/gringegreen/images/importldap.png Diff File
mod - styles/gringegreen/images/importold.png Diff File
mod - styles/gringegreen/images/importvv.png Diff File
mod - styles/gringegreen/images/invite.png Diff File
mod - styles/gringegreen/images/iterate.png Diff File
mod - styles/gringegreen/images/maximize.png Diff File
mod - styles/gringegreen/images/minimize.png Diff File
mod - styles/gringegreen/images/organize_disabled.png Diff File
mod - styles/gringegreen/images/plus.png Diff File
mod - styles/gringegreen/images/preview.png Diff File
mod - styles/gringegreen/images/print_30.png Diff File
mod - styles/gringegreen/images/quality_assurance.png Diff File
mod - styles/gringegreen/images/remind.png Diff File
mod - styles/gringegreen/images/responses.png Diff File
mod - styles/gringegreen/images/saved.png Diff File
mod - styles/gringegreen/images/saved_30.png Diff File
mod - styles/gringegreen/images/share.png Diff File
mod - styles/gringegreen/images/statistics.png Diff File
mod - styles/gringegreen/images/subquestions.png Diff File
mod - styles/gringegreen/images/subquestions2d_20.png Diff File
mod - styles/gringegreen/images/subquestions_20.png Diff File
mod - styles/gringegreen/images/tag.png Diff File
mod - styles/gringegreen/images/token_do.png Diff File
mod - styles/gringegreen/images/token_edit.png Diff File
mod - styles/gringegreen/images/token_invite.png Diff File
mod - styles/gringegreen/images/token_manage.png Diff File
mod - styles/gringegreen/images/token_remind.png Diff File
mod - styles/gringegreen/images/token_viewanswer.png Diff File
mod - styles/gringegreen/images/tokenify.png Diff File
mod - styles/gringegreen/images/tools.png Diff File
mod - styles/gringegreen/images/trafficred.png Diff File
mod - styles/gringegreen/images/translate_30.png Diff File
mod - styles/gringegreen/images/translate_disabled_30.png Diff File
mod - styles/gringegreen/images/viewlast.png Diff File
mod - styles/gringegreen/jquery-ui/jquery-ui.css Diff File
mod - styles/gringegreen/superfish.css 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

Yii b1d1da0d

2012-05-01 15:18:01

user9189

Details Diff 		New translation: Afrikaans
Attach Issues:
add - locale/af/LC_MESSAGES/af.mo Diff File
add - locale/af/LC_MESSAGES/af.po Diff File
mod - application/helpers/surveytranslator_helper.php Diff File

master 65203f72

2012-05-01 14:32:10

user9189

Details Diff 		New translation: Afrikaans
Attach Issues:
add - locale/af/LC_MESSAGES/af.mo Diff File
add - locale/af/LC_MESSAGES/af.po Diff File
mod - classes/core/surveytranslator.php Diff File

1.92 9258196d

2012-05-01 13:56:22

TMSWhite

Details Diff 		Merge branch 'master' into 192_dev
Attach Issues:
mod - .gitignore Diff File
mod - admin/dataentry.php Diff File
mod - admin/iterate_survey.php Diff File
mod - admin/quota.php Diff File
mod - admin/scripts/kcfinder/core/autoload.php Diff File
mod - admin/scripts/kcfinder/core/uploader.php Diff File
mod - admin/scripts/kcfinder/js/helper.js Diff File
mod - docs/release_notes.txt Diff File
mod - qanda.php Diff File
mod - scripts/jquery/css/start/jquery-ui.css Diff File

Yii a2030c75

2012-05-01 12:41:40

tpartner

Details Diff 		Fixed issue 06030: answeroption not left-aligned
Dev Cleaned up CSS		 Affected Issues
06030
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

master 92781027

2012-05-01 12:29:25

tpartner

Details Diff 		Fixed issue 06030: answeroption not left-aligned
Dev Cleaned up CSS		 Affected Issues
06030
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

Yii 72e04295

2012-05-01 09:58:23

c_schmitz

Details Diff 		Merge remote-tracking branch 'origin/Yii' into Yii
Attach Issues:
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

Yii 1dadfde7

2012-05-01 09:57:56

c_schmitz

Details Diff 		Fixed issue: Conditions editor not working
Attach Issues:
add - styles/gringegreen/images/ui-bg_glass_100_effbdb_1x400.png Diff File
rm - application/views/admin/conditions/conditionsforms_view.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/conditions/conditionslist_view.php Diff File
mod - application/views/admin/conditions/includes/conditions_edit.php Diff File
mod - application/views/admin/conditions/includes/conditions_scenario.php Diff File
mod - styles/blobblueish/adminstyle.css Diff File
mod - styles/gartergrey/adminstyle.css Diff File
mod - styles/gringegreen/adminstyle.css Diff File

Yii 94ee65b8

2012-05-01 08:00:28

tpartner

Details Diff 		Fixed issue 05987: prefix and suffix are misaligned for "total" field at miltiple numeric question
Dev Cleaned up CSS		 Affected Issues
05987
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

master cc46cc1c

2012-05-01 07:59:45

tpartner

Details Diff 		Fixed issue 05987: prefix and suffix are misaligned for "total" field at miltiple numeric question
Dev Cleaned up CSS		 Affected Issues
05987
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

master 250233bf

2012-05-01 06:44:42

tpartner

Details Diff 		Fixed issue 05975: Confirmation screen broken for iterate survey feature
Dev Cleaned up invalid HTML		 Affected Issues
05975
mod - admin/iterate_survey.php Diff File

Yii 6e4b999d

2012-05-01 06:21:26

c_schmitz

Details Diff 		Fixed issue: Conditions toolbar not visible
Dev Removed obsolete addTitleToLinks option and related code
Attach Issues:
mod - application/config/config-defaults.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/libraries/Limesurvey_lang.php Diff File
mod - application/views/admin/browse/browseallheader_view.php Diff File
mod - application/views/admin/browse/browsemenubar_view.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/conditions/conditionslist_view.php Diff File
mod - application/views/admin/conditions/includes/conditions_edit.php Diff File
mod - application/views/admin/dataentry/includes/editdata/header.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/labels/labelbar_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/templates/templateeditorbar_view.php Diff File
mod - application/views/admin/token/tokenbar.php Diff File
mod - application/views/admin/usergroup/usergroupbar_view.php Diff File
mod - styles/gringegreen/adminstyle.css Diff File
mod - styles/gringegreen/jquery-ui/jquery-ui.css Diff File

Yii b44b4b1c

2012-05-01 05:47:44

mdekker

Details Diff 		Fixed error when taking a survey with a token due to mixture of sql and querybuilder statements
Attach Issues:
mod - application/models/Tokens_dynamic.php Diff File

Yii 44d3cb83

2012-05-01 05:47:06

mdekker

Details Diff 		Fixed incorrect link in token screen to take a survey
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File

Yii f4d99cfa

2012-05-01 02:44:12

c_schmitz

Details Diff 		Merge remote-tracking branch 'origin/Yii' into Yii
Attach Issues:
mod - application/controllers/admin/browse.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File

Yii 92c209f9

2012-05-01 02:40:01

c_schmitz

Details Diff 		Dev Fixed some broken icons
Attach Issues:
mod - application/views/admin/browse/browseallrow_view.php Diff File
mod - application/views/admin/browse/browseidheader_view.php Diff File

Yii 3a6d559d

2012-05-01 02:12:53

mdekker

Details Diff 		dev: fixed $this->createUrl in action to $this->getController()->createUrl
Attach Issues:
mod - application/controllers/admin/browse.php Diff File
mod - application/controllers/admin/useraction.php Diff File

Yii f84f4dbf

2012-05-01 01:26:13

mdekker

Details Diff 		Fixed issue 06008: File upload doesn't work from data entry, not available in response edit
dev: in yii branch creation of upload directory didn't work other than that data entry file upload works fine		 Affected Issues
06008
mod - application/helpers/admin/activate_helper.php Diff File

master b29d37e3

2012-05-01 00:26:12

c_schmitz

Details Diff 		Release 1.92+ Build 120501
Attach Issues:
mod - docs/release_notes.txt Diff File

Yii 134812e9

2012-05-01 00:21:30

c_schmitz

Details Diff 		Fixed issue 06045: Firefox 12 vertical scrolling problem in admin view (and other pages)
Dev More icon changes		 Affected Issues
06045
rm - styles/gringegreen/images/edit_disabled.png Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - scripts/jquery/css/start/jquery-ui.css Diff File
mod - styles/gringegreen/images/edithtmlpopup_disabled.png Diff File

master 9d380b5e

2012-05-01 00:11:01

c_schmitz

Details Diff 		Fixed issue 06045: Firefox 12 vertical scrolling problem in admin view (and other pages) Affected Issues
06045
mod - scripts/jquery/css/start/jquery-ui.css Diff File

master 8cd04c68

2012-04-30 23:43:29

c_schmitz

Details Diff 		Merge remote-tracking branch 'origin/master'
Attach Issues:
mod - .gitignore Diff File
mod - admin/quota.php Diff File

master 1dade902

2012-04-30 23:43:14

c_schmitz

Details Diff 		Dev Fixed minor issues
Attach Issues:
mod - qanda.php Diff File
mod - scripts/jquery/css/start/jquery-ui.css Diff File

master 42ce6502

2012-04-30 19:06:38

jcleeland

Details Diff 		Fixed issue 06056 - Quota languages don't update Affected Issues
06056
mod - admin/quota.php Diff File

Yii 072b5d54

2012-04-30 16:33:44

c_schmitz

Details Diff 		Dev Fixed some non-transparency on icons
Dev Removed obsolete files
Dev Fixed some old-style gfx on gringegreen
Attach Issues:
add - images/limecursor-handle.png Diff File
rm - styles/gringegreen/images/limecursor-handle.png Diff File
rm - styles/gringegreen/images/next.png Diff File
rm - styles/gringegreen/images/noedit.png Diff File
rm - styles/gringegreen/images/pause.png Diff File
rm - styles/gringegreen/images/paused.png Diff File
rm - styles/gringegreen/images/print.png Diff File
rm - styles/gringegreen/images/security_small.png Diff File
rm - styles/gringegreen/images/statistics_30.png Diff File
mod - styles/gringegreen/images/chart.png Diff File
mod - styles/gringegreen/images/chart_bar.png Diff File
mod - styles/gringegreen/images/import_disabled.png Diff File
mod - styles/gringegreen/images/iterate.png Diff File
mod - styles/gringegreen/images/plus.png Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 900 ... 1050 ... 1116 1117 1118 1119 1120 1121 1122 ... 1200 ... 1350 ... 1449 1450 1451  Next  Last