Changesets: LimeSurvey
Yii 72e04295 2012-05-01 09:58:23 Details Diff |
Merge remote-tracking branch 'origin/Yii' into Yii | ||
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 Details Diff |
Fixed issue: Conditions editor not working | ||
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 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 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 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 Details Diff |
Fixed issue: Conditions toolbar not visible Dev Removed obsolete addTitleToLinks option and related code |
||
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 Details Diff |
Fixed error when taking a survey with a token due to mixture of sql and querybuilder statements | ||
mod - application/models/Tokens_dynamic.php | Diff File | ||
Yii 44d3cb83 2012-05-01 05:47:06 Details Diff |
Fixed incorrect link in token screen to take a survey | ||
mod - application/controllers/admin/tokens.php | Diff File | ||
Yii f4d99cfa 2012-05-01 02:44:12 Details Diff |
Merge remote-tracking branch 'origin/Yii' into Yii | ||
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 Details Diff |
Dev Fixed some broken icons | ||
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 Details Diff |
dev: fixed $this->createUrl in action to $this->getController()->createUrl | ||
mod - application/controllers/admin/browse.php | Diff File | ||
mod - application/controllers/admin/useraction.php | Diff File | ||
Yii f84f4dbf 2012-05-01 01:26:13 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 Details Diff |
Release 1.92+ Build 120501 | ||
mod - docs/release_notes.txt | Diff File | ||
Yii 134812e9 2012-05-01 00:21:30 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 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 Details Diff |
Merge remote-tracking branch 'origin/master' | ||
mod - .gitignore | Diff File | ||
mod - admin/quota.php | Diff File | ||
master 1dade902 2012-04-30 23:43:14 Details Diff |
Dev Fixed minor issues | ||
mod - qanda.php | Diff File | ||
mod - scripts/jquery/css/start/jquery-ui.css | Diff File | ||
master 42ce6502 2012-04-30 19:06:38 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 Details Diff |
Dev Fixed some non-transparency on icons Dev Removed obsolete files Dev Fixed some old-style gfx on gringegreen |
||
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 | ||
Yii 81ef6254 2012-04-30 11:56:02 Details Diff |
Dev Fixed some non-transparency on icons Dev Removed obsolete files Dev Fixed some old-style gfx on gringegreen |
||
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/images/statistics_time.png | Diff File | ||
add - styles/gartergrey/images/statistics_time.png | Diff File | ||
add - styles/gringegreen/images/statistics_time.png | Diff File | ||
add - styles/gringegreen/images/subquestions2d.png.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 - 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_100_effbdb_1x400.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/timeStatistics.png | Diff File | ||
rm - styles/gringegreen/images/browse.png | Diff File | ||
rm - styles/gringegreen/images/chart.jpg | Diff File | ||
rm - styles/gringegreen/images/deletegroup.png | Diff File | ||
rm - styles/gringegreen/images/downarrow.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/plus.gif | Diff File | ||
rm - styles/gringegreen/images/quota.png | Diff File | ||
rm - styles/gringegreen/images/save.png | Diff File | ||
rm - styles/gringegreen/images/scanner_30.png | 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/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/tokens_30.png | Diff File | ||
rm - styles/gringegreen/images/trafficgreen.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/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 | ||
mod - application/views/admin/browse/browsemenubar_view.php | 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/browse_disabled_30.png | Diff File | ||
mod - styles/gringegreen/images/chart_disabled.png | Diff File | ||
mod - styles/gringegreen/images/close.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/defaultanswers.png | Diff File | ||
mod - styles/gringegreen/images/delete_disabled.png | Diff File | ||
mod - styles/gringegreen/images/do_30.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/export_disabled.png | Diff File | ||
mod - styles/gringegreen/images/handle.png | Diff File | ||
mod - styles/gringegreen/images/maximize.png | Diff File | ||
mod - styles/gringegreen/images/minimize.png | Diff File | ||
mod - styles/gringegreen/images/quality_assurance.png | Diff File | ||
mod - styles/gringegreen/images/remind.png | Diff File | ||
mod - styles/gringegreen/images/subquestions2d_20.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_remind.png | Diff File | ||
mod - styles/gringegreen/images/token_viewanswer.png | Diff File | ||
Yii 1375c8f8 2012-04-30 09:57:03 Details Diff |
Dev New icon for central participant database | ||
add - styles/blobblueish/images/cpdb.png | Diff File | ||
add - styles/gartergrey/images/cpdb.png | Diff File | ||
add - styles/gringegreen/images/cpdb.png | Diff File | ||
mod - application/views/admin/super/adminmenu.php | Diff File | ||
Yii 7adf53c4 2012-04-30 09:30:15 Details Diff |
Dev: fixed issue if refurl is not set Dev : fix the fix: $defaultlanguage/$defaultlang |
||
mod - application/controllers/admin/globalsettings.php | Diff File | ||
Yii cf785f91 2012-04-30 09:24:49 Details Diff |
Dev : Fixed some issue with languagechanger Dev : force defaultlang in restrictToLanguages |
||
mod - application/controllers/admin/globalsettings.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - scripts/admin/globalsettings.js | Diff File | ||
master e8043316 2012-04-30 08:39:29 Marcel Minke Details Diff |
Dev: Here comes the original .gitignore file. Sorry for overwriting it accidentally. |
||
mod - .gitignore | Diff File | ||
master ddfa831c 2012-04-30 07:42:14 Marcel Minke Details Diff |
Merge branch 'master' of https://maziminke@github.com/LimeSurvey/LimeSurvey.git | ||
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 |