Changesets: LimeSurvey

master b9de986a

2012-01-30 16:32:32

c_schmitz

Details Diff
Fixed issue 05589: Error messages when user deletes himself

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@12260 b72ed6b6-b9f8-46b5-92b4-906544132732
Attach Issues:
mod - admin/usercontrol.php Diff File

master fe4de122

2012-01-30 16:32:12

c_schmitz

Details Diff
Fixed issue 05589: Error messages when user deletes himself

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@12259 b72ed6b6-b9f8-46b5-92b4-906544132732
Attach Issues:
mod - admin/usercontrol.php Diff File

master 479cf20c

2012-01-30 14:02:15

c_schmitz

Details Diff
Fixed issue 05658: Notices when importing survey

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@12258 b72ed6b6-b9f8-46b5-92b4-906544132732
Attach Issues:
mod - common_functions.php Diff File

Yii a7707dcc

2012-01-30 14:00:14

c_schmitz

Details Diff
Fixed issue 05658: Notices when importing survey

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12257 b72ed6b6-b9f8-46b5-92b4-906544132732
Affected Issues
05658
mod - application/helpers/common_helper.php Diff File

Yii 9941c6d3

2012-01-30 13:12:08

c_schmitz

Details Diff
Fixed casing for showxquestions field

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12256 b72ed6b6-b9f8-46b5-92b4-906544132732
Attach Issues:
mod - application/helpers/update/upgrade-mssql_helper.php Diff File
mod - application/helpers/update/upgrade-mssqlnative_helper.php Diff File
mod - application/helpers/update/upgrade-mysql_helper.php Diff File
mod - application/helpers/update/upgrade-postgres_helper.php Diff File

master 75e85445

2012-01-30 13:11:58

c_schmitz

Details Diff
Fixed casing for showxquestions field


git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@12255 b72ed6b6-b9f8-46b5-92b4-906544132732
Attach Issues:
mod - admin/update/upgrade-mssql.php Diff File
mod - admin/update/upgrade-mssqlnative.php Diff File
mod - admin/update/upgrade-mysql.php Diff File
mod - admin/update/upgrade-postgres.php Diff File

Yii c8a64391

2012-01-30 12:21:37

c_schmitz

Details Diff
Fixed issue 05723: Mysterious killSession(); function

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12254 b72ed6b6-b9f8-46b5-92b4-906544132732
Affected Issues
05723
mod - application/helpers/SurveyRuntimeHelper.php Diff File

Yii a32018ea

2012-01-30 09:05:00

c_schmitz

Details Diff
Fixed issue 05720: Automatic token generation not working
Fixed issue: Not being able to login in Postgres

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12253 b72ed6b6-b9f8-46b5-92b4-906544132732
Affected Issues
05720
mod - application/controllers/InstallerController.php Diff File
mod - application/core/UserIdentity.php Diff File
mod - application/models/Tokens_dynamic.php Diff File

Yii 0f33b759

2012-01-30 08:19:15

c_schmitz

Details Diff
Fixed issue 05715: insertParticipant raises error

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12252 b72ed6b6-b9f8-46b5-92b4-906544132732
Affected Issues
05715
mod - application/models/Participants.php Diff File

master e40f60e1

2012-01-30 06:09:02

Shitiz Garg

Details Diff
Merge branch 'refs/heads/limesurvey_dev' into dev
Attach Issues:
mod - classes/eval/LimeExpressionManager.php Diff File
mod - classes/eval/em_javascript.js Diff File
mod - common_functions.php Diff File

master 2b1aea78

2012-01-30 05:48:05

Shitiz Garg

Details Diff
Merge branch 'refs/heads/limesurvey101'
Attach Issues:
add - stable/admin/activate.php Diff File
add - stable/admin/admin.php Diff File
add - stable/admin/adminstyle.css Diff File
add - stable/admin/assessments.php Diff File
add - stable/admin/browse.php Diff File
add - stable/admin/checkfields.php Diff File
add - stable/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer.php Diff File
add - stable/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/BIFFwriter.php Diff File
add - stable/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Format.php Diff File
add - stable/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Parser.php Diff File
add - stable/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Validator.php Diff File
add - stable/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Workbook.php Diff File
add - stable/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Worksheet.php Diff File
add - stable/admin/classes/TreeMenu/TMimages/activefolder.gif Diff File
add - stable/admin/classes/TreeMenu/TMimages/branch.gif Diff File
add - stable/admin/classes/TreeMenu/TMimages/branchbottom.gif Diff File
add - stable/admin/classes/TreeMenu/TMimages/branchtop.gif Diff File
add - stable/admin/classes/TreeMenu/TMimages/document.gif Diff File
add - stable/admin/classes/TreeMenu/TMimages/folder.gif Diff File
add - stable/admin/classes/TreeMenu/TMimages/line.gif Diff File
add - stable/admin/classes/TreeMenu/TMimages/linebottom.gif Diff File
add - stable/admin/classes/TreeMenu/TMimages/minus.gif Diff File
add - stable/admin/classes/TreeMenu/TMimages/minusbottom.gif Diff File
add - stable/admin/classes/TreeMenu/TMimages/minustop.gif Diff File
add - stable/admin/classes/TreeMenu/TMimages/plus.gif Diff File
add - stable/admin/classes/TreeMenu/TMimages/plusbottom.gif Diff File
add - stable/admin/classes/TreeMenu/TMimages/plustop.gif Diff File
add - stable/admin/classes/TreeMenu/TreeMenu.css Diff File
add - stable/admin/classes/TreeMenu/TreeMenu.js Diff File
add - stable/admin/classes/TreeMenu/TreeMenu.php Diff File
add - stable/admin/classes/TreeMenu/TreeMenuXL.php Diff File
add - stable/admin/classes/TreeMenu/ccBrowserInfo.php Diff File
add - stable/admin/classes/TreeMenu/ccSiteStyle.css.php Diff File
add - stable/admin/classes/TreeMenu/xMenu1.js Diff File
add - stable/admin/classes/phpzip/phpzip.inc.php Diff File
add - stable/admin/conditions.php Diff File
add - stable/admin/createdb.php Diff File
add - stable/admin/database.php Diff File
add - stable/admin/dataentry.php Diff File
add - stable/admin/dbchecker.php Diff File
add - stable/admin/dbedit.php Diff File
add - stable/admin/deactivate.php Diff File
add - stable/admin/deletesurvey.php Diff File
add - stable/admin/dumpdb.php Diff File
add - stable/admin/dumpgroup.php Diff File
add - stable/admin/dumplabel.php Diff File
add - stable/admin/dumpquestion.php Diff File
add - stable/admin/dumpsurvey.php Diff File
add - stable/admin/export.php Diff File
add - stable/admin/favicon.ico Diff File
add - stable/admin/html.php Diff File
add - stable/admin/images/DownArrow.gif Diff File
add - stable/admin/images/activate.gif Diff File
add - stable/admin/images/active.gif Diff File
add - stable/admin/images/add.gif Diff File
add - stable/admin/images/admincrnr.png Diff File
add - stable/admin/images/answers.gif Diff File
add - stable/admin/images/assessments.gif Diff File
add - stable/admin/images/badsecurity.gif Diff File
add - stable/admin/images/blank.gif Diff File
add - stable/admin/images/browse.gif Diff File
add - stable/admin/images/checkdb.gif Diff File
add - stable/admin/images/close.gif Diff File
add - stable/admin/images/conditions.gif Diff File
add - stable/admin/images/copy.gif Diff File
add - stable/admin/images/copyright.txt Diff File
add - stable/admin/images/cut.gif Diff File
add - stable/admin/images/databack.gif Diff File
add - stable/admin/images/databegin.gif Diff File
add - stable/admin/images/dataend.gif Diff File
add - stable/admin/images/dataentry.gif Diff File
add - stable/admin/images/dataforward.gif Diff File
add - stable/admin/images/deactivate.gif Diff File
add - stable/admin/images/delete.gif Diff File
add - stable/admin/images/do.gif Diff File
add - stable/admin/images/document.gif Diff File
add - stable/admin/images/donate.gif Diff File
add - stable/admin/images/down.gif Diff File
add - stable/admin/images/edit.gif Diff File
add - stable/admin/images/export.gif Diff File
add - stable/admin/images/export2.gif Diff File
add - stable/admin/images/help.gif Diff File
add - stable/admin/images/home.gif Diff File
add - stable/admin/images/import.gif Diff File
add - stable/admin/images/inactive.gif Diff File
add - stable/admin/images/inactive_old.gif Diff File
add - stable/admin/images/invite.gif Diff File
add - stable/admin/images/labels.gif Diff File
add - stable/admin/images/minus.gif Diff File
add - stable/admin/images/phpslogo.png Diff File
add - stable/admin/images/phpsurveyor_logo.jpg Diff File
add - stable/admin/images/plus.gif Diff File
add - stable/admin/images/print.gif Diff File
add - stable/admin/images/remind.gif Diff File
add - stable/admin/images/save.gif Diff File
add - stable/admin/images/saved.gif Diff File
add - stable/admin/images/security.gif Diff File
add - stable/admin/images/seperator.gif Diff File
add - stable/admin/images/showhelp.gif Diff File
add - stable/admin/images/speaker.jpg Diff File
add - stable/admin/images/statistics.gif Diff File
add - stable/admin/images/summary.gif Diff File
add - stable/admin/images/templates.gif Diff File
add - stable/admin/images/tokenify.gif Diff File
add - stable/admin/images/tokens.gif Diff File
add - stable/admin/images/trafficgreen.gif Diff File
add - stable/admin/images/trafficred.gif Diff File
add - stable/admin/images/viewlast.gif Diff File
add - stable/admin/images/vvexport.gif Diff File
add - stable/admin/images/vvimport.gif Diff File
add - stable/admin/importgroup.php Diff File
add - stable/admin/importlabel.php Diff File
add - stable/admin/importoldresponses.php Diff File
add - stable/admin/importquestion.php Diff File
add - stable/admin/importsurvey.php Diff File
add - stable/admin/index.php Diff File
add - stable/admin/labels.php Diff File
add - stable/admin/lang/chinese/admin.html Diff File
add - stable/admin/lang/chinese/answer.html Diff File
add - stable/admin/lang/chinese/group.html Diff File
add - stable/admin/lang/chinese/instructions.html Diff File
add - stable/admin/lang/chinese/labels.html Diff File
add - stable/admin/lang/chinese/labelsets.html Diff File
add - stable/admin/lang/chinese/messages.php Diff File
add - stable/admin/lang/chinese/question.html Diff File
add - stable/admin/lang/chinese/survey.html Diff File
add - stable/admin/lang/chinese/tokens.html Diff File
add - stable/admin/lang/chinese/users.html Diff File
add - stable/admin/lang/dutch/admin.html Diff File
add - stable/admin/lang/dutch/answer.html Diff File
add - stable/admin/lang/dutch/group.html Diff File
add - stable/admin/lang/dutch/instructions.html Diff File
add - stable/admin/lang/dutch/labels.html Diff File
add - stable/admin/lang/dutch/labelsets.html Diff File
add - stable/admin/lang/dutch/messages.php Diff File
add - stable/admin/lang/dutch/question.html Diff File
add - stable/admin/lang/dutch/survey.html Diff File
add - stable/admin/lang/dutch/tokens.html Diff File
add - stable/admin/lang/dutch/users.html Diff File
add - stable/admin/lang/english/admin.html Diff File
add - stable/admin/lang/english/answer.html Diff File
add - stable/admin/lang/english/group.html Diff File
add - stable/admin/lang/english/installation_on_os2warp.html Diff File
add - stable/admin/lang/english/instructions.html Diff File
add - stable/admin/lang/english/labels.html Diff File
add - stable/admin/lang/english/labelsets.html Diff File
add - stable/admin/lang/english/messages.php Diff File
add - stable/admin/lang/english/question.html Diff File
add - stable/admin/lang/english/survey.html Diff File
add - stable/admin/lang/english/templates.html Diff File
add - stable/admin/lang/english/tokens.html Diff File
add - stable/admin/lang/english/users.html Diff File
add - stable/admin/lang/french/admin.html Diff File
add - stable/admin/lang/french/answer.html Diff File
add - stable/admin/lang/french/group.html Diff File
add - stable/admin/lang/french/instructions.html Diff File
add - stable/admin/lang/french/labels.html Diff File
add - stable/admin/lang/french/labelsets.html Diff File
add - stable/admin/lang/french/messages.php Diff File
add - stable/admin/lang/french/question.html Diff File
add - stable/admin/lang/french/survey.html Diff File
add - stable/admin/lang/french/tokens.html Diff File
add - stable/admin/lang/french/users.html Diff File
add - stable/admin/lang/german/admin.html Diff File
add - stable/admin/lang/german/answer.html Diff File
add - stable/admin/lang/german/group.html Diff File
add - stable/admin/lang/german/instructions.html Diff File
add - stable/admin/lang/german/labels.html Diff File
add - stable/admin/lang/german/labelsets.html Diff File
add - stable/admin/lang/german/messages.php Diff File
add - stable/admin/lang/german/question.html Diff File
add - stable/admin/lang/german/survey.html Diff File
add - stable/admin/lang/german/tokens.html Diff File
add - stable/admin/lang/german/users.html Diff File
add - stable/admin/lang/italian/admin.html Diff File
add - stable/admin/lang/italian/answer.html Diff File
add - stable/admin/lang/italian/group.html Diff File
add - stable/admin/lang/italian/instructions.html Diff File
add - stable/admin/lang/italian/labels.html Diff File
add - stable/admin/lang/italian/labelsets.html Diff File
add - stable/admin/lang/italian/messages.php Diff File
add - stable/admin/lang/italian/question.html Diff File
add - stable/admin/lang/italian/survey.html Diff File
add - stable/admin/lang/italian/tokens.html Diff File
add - stable/admin/lang/italian/users.html Diff File
add - stable/admin/lang/portuguese/admin.html Diff File
add - stable/admin/lang/portuguese/answer.html Diff File
add - stable/admin/lang/portuguese/group.html Diff File
add - stable/admin/lang/portuguese/instructions.html Diff File
add - stable/admin/lang/portuguese/labels.html Diff File
add - stable/admin/lang/portuguese/labelsets.html Diff File
add - stable/admin/lang/portuguese/messages.php Diff File
add - stable/admin/lang/portuguese/question.html Diff File
add - stable/admin/lang/portuguese/survey.html Diff File
add - stable/admin/lang/portuguese/tokens.html Diff File
add - stable/admin/lang/portuguese/users.html Diff File
add - stable/admin/lang/russian/admin.html Diff File
add - stable/admin/lang/russian/answer.html Diff File
add - stable/admin/lang/russian/group.html Diff File
add - stable/admin/lang/russian/instructions.html Diff File
add - stable/admin/lang/russian/labels.html Diff File
add - stable/admin/lang/russian/labelsets.html Diff File
add - stable/admin/lang/russian/messages.php Diff File
add - stable/admin/lang/russian/question.html Diff File
add - stable/admin/lang/russian/survey.html Diff File
add - stable/admin/lang/russian/tokens.html Diff File
add - stable/admin/lang/russian/users.html Diff File
add - stable/admin/lang/spanish/admin.html Diff File
add - stable/admin/lang/spanish/answer.html Diff File
add - stable/admin/lang/spanish/group.html Diff File
add - stable/admin/lang/spanish/instructions.html Diff File
add - stable/admin/lang/spanish/labels.html Diff File
add - stable/admin/lang/spanish/labelsets.html Diff File
add - stable/admin/lang/spanish/messages.php Diff File
add - stable/admin/lang/spanish/question.html Diff File
add - stable/admin/lang/spanish/survey.html Diff File
add - stable/admin/lang/spanish/tokens.html Diff File
add - stable/admin/lang/spanish/users.html Diff File
add - stable/admin/lang/swedish/admin.html Diff File
add - stable/admin/lang/swedish/answer.html Diff File
add - stable/admin/lang/swedish/group.html Diff File
add - stable/admin/lang/swedish/installation_on_os2warp.html Diff File
add - stable/admin/lang/swedish/instructions.html Diff File
add - stable/admin/lang/swedish/labels.html Diff File
add - stable/admin/lang/swedish/labelsets.html Diff File
add - stable/admin/lang/swedish/messages.php Diff File
add - stable/admin/lang/swedish/question.html Diff File
add - stable/admin/lang/swedish/survey.html Diff File
add - stable/admin/lang/swedish/templates.html Diff File
add - stable/admin/lang/swedish/tokens.html Diff File
add - stable/admin/lang/swedish/users.html Diff File
add - stable/admin/listcolumn.php Diff File
add - stable/admin/manual.html Diff File
add - stable/admin/navigator.php Diff File
add - stable/admin/phpsurveyor.css Diff File
add - stable/admin/printablesurvey.php Diff File
add - stable/admin/results.php Diff File
add - stable/admin/resultsdump.php Diff File
add - stable/admin/saved.php Diff File
add - stable/admin/sessioncontrol.php Diff File
add - stable/admin/spss.php Diff File
add - stable/admin/statistics.php Diff File
add - stable/admin/templates.php Diff File
add - stable/admin/tokens.php Diff File
add - stable/admin/usercontrol.php Diff File
add - stable/admin/vvexport.php Diff File
add - stable/admin/vvimport.php Diff File
add - stable/chart.jpg Diff File
add - stable/classes/phpmailer/LICENSE Diff File
add - stable/classes/phpmailer/README Diff File
add - stable/classes/phpmailer/class.phpmailer.php Diff File
add - stable/classes/phpmailer/class.smtp.php Diff File
add - stable/classes/slider/handle.horizontal.png Diff File
add - stable/classes/slider/handle.vertical.png Diff File
add - stable/classes/slider/range.js Diff File
add - stable/classes/slider/slider.js Diff File
add - stable/classes/slider/slider/handle.horizontal.png Diff File
add - stable/classes/slider/slider/handle.vertical.png Diff File
add - stable/classes/slider/slider/range.js Diff File
add - stable/classes/slider/slider/slider.js Diff File
add - stable/classes/slider/slider/swing.css Diff File
add - stable/classes/slider/slider/timer.js Diff File
add - stable/classes/slider/swing.css Diff File
add - stable/classes/slider/timer.js Diff File
add - stable/common.php Diff File
add - stable/config.php Diff File
add - stable/cut.gif Diff File
add - stable/docs/license.txt Diff File
add - stable/docs/maketables.sql Diff File
add - stable/docs/manual.html Diff File
add - stable/docs/release_notes_and_upgrade_instructions.txt Diff File
add - stable/docs/sample_survey.sql Diff File
add - stable/docs/summary.txt Diff File
add - stable/group.php Diff File
add - stable/help.gif Diff File
add - stable/index.php Diff File
add - stable/lang/bulgarian.lang.php Diff File
add - stable/lang/chinese-simplified.lang.php Diff File
add - stable/lang/chinese-traditional.lang.php Diff File
add - stable/lang/croatian.lang.php Diff File
add - stable/lang/danish.lang.php Diff File
add - stable/lang/dutch.lang.php Diff File
add - stable/lang/english.lang.php Diff File
add - stable/lang/finnish.lang.php Diff File
add - stable/lang/french.lang.php Diff File
add - stable/lang/german-informal.lang.php Diff File
add - stable/lang/german.lang.php Diff File
add - stable/lang/greek.lang.php Diff File
add - stable/lang/hungarian.lang.php Diff File
add - stable/lang/italian.lang.php Diff File
add - stable/lang/japanese.lang.php Diff File
add - stable/lang/lithuanian.lang.php Diff File
add - stable/lang/norwegian.lang.php Diff File
add - stable/lang/portuguese.lang.php Diff File
add - stable/lang/romanian.lang.php Diff File
add - stable/lang/russian.lang.php Diff File
add - stable/lang/slovenian.lang.php Diff File
add - stable/lang/spanish.lang.php Diff File
add - stable/lang/swedish.lang.php Diff File
add - stable/load.php Diff File
add - stable/qanda.php Diff File
add - stable/question.php Diff File
add - stable/register.php Diff File
add - stable/save.php Diff File
add - stable/survey.php Diff File
add - stable/templates/basic/assessment.pstpl Diff File
add - stable/templates/basic/chart.jpg Diff File
add - stable/templates/basic/clearall.pstpl Diff File
add - stable/templates/basic/completed.pstpl Diff File
add - stable/templates/basic/endgroup.pstpl Diff File
add - stable/templates/basic/endpage.pstpl Diff File
add - stable/templates/basic/groupdescription.pstpl Diff File
add - stable/templates/basic/load.pstpl Diff File
add - stable/templates/basic/logo.gif Diff File
add - stable/templates/basic/navigator.pstpl Diff File
add - stable/templates/basic/privacy.pstpl Diff File
add - stable/templates/basic/question.pstpl Diff File
add - stable/templates/basic/readme.txt Diff File
add - stable/templates/basic/register.pstpl Diff File
add - stable/templates/basic/save.pstpl Diff File
add - stable/templates/basic/startgroup.pstpl Diff File
add - stable/templates/basic/startpage.pstpl Diff File
add - stable/templates/basic/submit.pstpl Diff File
add - stable/templates/basic/survey.pstpl Diff File
add - stable/templates/basic/welcome.pstpl Diff File
add - stable/templates/blue_heaven/assessment.pstpl Diff File
add - stable/templates/blue_heaven/chart.jpg Diff File
add - stable/templates/blue_heaven/clearall.pstpl Diff File
add - stable/templates/blue_heaven/completed.pstpl Diff File
add - stable/templates/blue_heaven/endgroup.pstpl Diff File
add - stable/templates/blue_heaven/endpage.pstpl Diff File
add - stable/templates/blue_heaven/groupdescription.pstpl Diff File
add - stable/templates/blue_heaven/load.pstpl Diff File
add - stable/templates/blue_heaven/navigator.pstpl Diff File
add - stable/templates/blue_heaven/privacy.pstpl Diff File
add - stable/templates/blue_heaven/question.pstpl Diff File
add - stable/templates/blue_heaven/register.pstpl Diff File
add - stable/templates/blue_heaven/save.pstpl Diff File
add - stable/templates/blue_heaven/startgroup.pstpl Diff File
add - stable/templates/blue_heaven/startpage.pstpl Diff File
add - stable/templates/blue_heaven/submit.pstpl Diff File
add - stable/templates/blue_heaven/survey.pstpl Diff File
add - stable/templates/blue_heaven/welcome.pstpl Diff File
add - stable/templates/bluengrey/assessment.pstpl Diff File
add - stable/templates/bluengrey/chart.jpg Diff File
add - stable/templates/bluengrey/clearall.pstpl Diff File
add - stable/templates/bluengrey/completed.pstpl Diff File
add - stable/templates/bluengrey/endgroup.pstpl Diff File
add - stable/templates/bluengrey/endpage.pstpl Diff File
add - stable/templates/bluengrey/groupdescription.pstpl Diff File
add - stable/templates/bluengrey/load.pstpl Diff File
add - stable/templates/bluengrey/navigator.pstpl Diff File
add - stable/templates/bluengrey/privacy.pstpl Diff File
add - stable/templates/bluengrey/question.pstpl Diff File
add - stable/templates/bluengrey/register.pstpl Diff File
add - stable/templates/bluengrey/save.pstpl Diff File
add - stable/templates/bluengrey/startgroup.pstpl Diff File
add - stable/templates/bluengrey/startpage.pstpl Diff File
add - stable/templates/bluengrey/submit.pstpl Diff File
add - stable/templates/bluengrey/survey.pstpl Diff File
add - stable/templates/bluengrey/welcome.pstpl Diff File
add - stable/templates/bubblegum/assessment.pstpl Diff File
add - stable/templates/bubblegum/chart.jpg Diff File
add - stable/templates/bubblegum/clearall.pstpl Diff File
add - stable/templates/bubblegum/completed.pstpl Diff File
add - stable/templates/bubblegum/endgroup.pstpl Diff File
add - stable/templates/bubblegum/endpage.pstpl Diff File
add - stable/templates/bubblegum/groupdescription.pstpl Diff File
add - stable/templates/bubblegum/load.pstpl Diff File
add - stable/templates/bubblegum/navigator.pstpl Diff File
add - stable/templates/bubblegum/privacy.pstpl Diff File
add - stable/templates/bubblegum/question.pstpl Diff File
add - stable/templates/bubblegum/register.pstpl Diff File
add - stable/templates/bubblegum/save.pstpl Diff File
add - stable/templates/bubblegum/startgroup.pstpl Diff File
add - stable/templates/bubblegum/startpage.pstpl Diff File
add - stable/templates/bubblegum/submit.pstpl Diff File
add - stable/templates/bubblegum/survey.pstpl Diff File
add - stable/templates/bubblegum/welcome.pstpl Diff File
add - stable/templates/business_grey/assessment.pstpl Diff File
add - stable/templates/business_grey/chart.jpg Diff File
add - stable/templates/business_grey/clearall.pstpl Diff File
add - stable/templates/business_grey/completed.pstpl Diff File
add - stable/templates/business_grey/endgroup.pstpl Diff File
add - stable/templates/business_grey/endpage.pstpl Diff File
add - stable/templates/business_grey/groupdescription.pstpl Diff File
add - stable/templates/business_grey/load.pstpl Diff File
add - stable/templates/business_grey/navigator.pstpl Diff File
add - stable/templates/business_grey/privacy.pstpl Diff File
add - stable/templates/business_grey/question.pstpl Diff File
add - stable/templates/business_grey/register.pstpl Diff File
add - stable/templates/business_grey/save.pstpl Diff File
add - stable/templates/business_grey/startgroup.pstpl Diff File
add - stable/templates/business_grey/startpage.pstpl Diff File
add - stable/templates/business_grey/submit.pstpl Diff File
add - stable/templates/business_grey/survey.pstpl Diff File
add - stable/templates/business_grey/welcome.pstpl Diff File
add - stable/templates/default/assessment.pstpl Diff File
add - stable/templates/default/chart.jpg Diff File
add - stable/templates/default/clearall.pstpl Diff File
add - stable/templates/default/completed.pstpl Diff File
add - stable/templates/default/endgroup.pstpl Diff File
add - stable/templates/default/endpage.pstpl Diff File
add - stable/templates/default/groupdescription.pstpl Diff File
add - stable/templates/default/load.pstpl Diff File
add - stable/templates/default/navigator.pstpl Diff File
add - stable/templates/default/privacy.pstpl Diff File
add - stable/templates/default/question.pstpl Diff File
add - stable/templates/default/register.pstpl Diff File
add - stable/templates/default/save.pstpl Diff File
add - stable/templates/default/startgroup.pstpl Diff File
add - stable/templates/default/startpage.pstpl Diff File
add - stable/templates/default/submit.pstpl Diff File
add - stable/templates/default/survey.pstpl Diff File
add - stable/templates/default/welcome.pstpl Diff File
add - stable/templates/edgyblue/assessment.pstpl Diff File
add - stable/templates/edgyblue/bot_bord.gif Diff File
add - stable/templates/edgyblue/botleft_bord.gif Diff File
add - stable/templates/edgyblue/botright_bord.gif Diff File
add - stable/templates/edgyblue/chart.jpg Diff File
add - stable/templates/edgyblue/clearall.pstpl Diff File
add - stable/templates/edgyblue/completed.pstpl Diff File
add - stable/templates/edgyblue/endgroup.pstpl Diff File
add - stable/templates/edgyblue/endpage.pstpl Diff File
add - stable/templates/edgyblue/groupdescription.pstpl Diff File
add - stable/templates/edgyblue/head_bot.gif Diff File
add - stable/templates/edgyblue/head_botleft.gif Diff File
add - stable/templates/edgyblue/head_botright.gif Diff File
add - stable/templates/edgyblue/head_top.gif Diff File
add - stable/templates/edgyblue/head_topleft.gif Diff File
add - stable/templates/edgyblue/head_topright.gif Diff File
add - stable/templates/edgyblue/left_bord.gif Diff File
add - stable/templates/edgyblue/load.pstpl Diff File
add - stable/templates/edgyblue/navigator.pstpl Diff File
add - stable/templates/edgyblue/orange2_bot.gif Diff File
add - stable/templates/edgyblue/orange2_botleft.gif Diff File
add - stable/templates/edgyblue/orange2_botright.gif Diff File
add - stable/templates/edgyblue/orange2_left.gif Diff File
add - stable/templates/edgyblue/orange2_right.gif Diff File
add - stable/templates/edgyblue/orange2_top.gif Diff File
add - stable/templates/edgyblue/orange2_topleft.gif Diff File
add - stable/templates/edgyblue/orange2_topright.gif Diff File
add - stable/templates/edgyblue/orange_bot.gif Diff File
add - stable/templates/edgyblue/orange_botleft.gif Diff File
add - stable/templates/edgyblue/orange_botright.gif Diff File
add - stable/templates/edgyblue/orange_left.gif Diff File
add - stable/templates/edgyblue/orange_right.gif Diff File
add - stable/templates/edgyblue/orange_top.gif Diff File
add - stable/templates/edgyblue/orange_topleft.gif Diff File
add - stable/templates/edgyblue/orange_topright.gif Diff File
add - stable/templates/edgyblue/privacy.pstpl Diff File
add - stable/templates/edgyblue/question.pstpl Diff File
add - stable/templates/edgyblue/register.pstpl Diff File
add - stable/templates/edgyblue/right_bord.gif Diff File
add - stable/templates/edgyblue/save.pstpl Diff File
add - stable/templates/edgyblue/single_bot.gif Diff File
add - stable/templates/edgyblue/single_botleft.gif Diff File
add - stable/templates/edgyblue/single_botright.gif Diff File
add - stable/templates/edgyblue/single_left.gif Diff File
add - stable/templates/edgyblue/single_right.gif Diff File
add - stable/templates/edgyblue/single_top.gif Diff File
add - stable/templates/edgyblue/single_topleft.gif Diff File
add - stable/templates/edgyblue/single_topright.gif Diff File
add - stable/templates/edgyblue/startgroup.pstpl Diff File
add - stable/templates/edgyblue/startpage.pstpl Diff File
add - stable/templates/edgyblue/submit.pstpl Diff File
add - stable/templates/edgyblue/survey.pstpl Diff File
add - stable/templates/edgyblue/top_bord.gif Diff File
add - stable/templates/edgyblue/topleft_bord.gif Diff File
add - stable/templates/edgyblue/topright_bord.gif Diff File
add - stable/templates/edgyblue/welcome.pstpl Diff File
add - stable/templates/eirenicon/assessment.pstpl Diff File
add - stable/templates/eirenicon/chart.jpg Diff File
add - stable/templates/eirenicon/clearall.pstpl Diff File
add - stable/templates/eirenicon/completed.pstpl Diff File
add - stable/templates/eirenicon/endgroup.pstpl Diff File
add - stable/templates/eirenicon/endpage.pstpl Diff File
add - stable/templates/eirenicon/groupdescription.pstpl Diff File
add - stable/templates/eirenicon/load.pstpl Diff File
add - stable/templates/eirenicon/navigator.pstpl Diff File
add - stable/templates/eirenicon/privacy.pstpl Diff File
add - stable/templates/eirenicon/question.pstpl Diff File
add - stable/templates/eirenicon/readme.txt Diff File
add - stable/templates/eirenicon/register.pstpl Diff File
add - stable/templates/eirenicon/save.pstpl Diff File
add - stable/templates/eirenicon/startgroup.pstpl Diff File
add - stable/templates/eirenicon/startpage.pstpl Diff File
add - stable/templates/eirenicon/submit.pstpl Diff File
add - stable/templates/eirenicon/survey.pstpl Diff File
add - stable/templates/eirenicon/welcome.pstpl Diff File
add - stable/templates/softgreencurves/assessment.pstpl Diff File
add - stable/templates/softgreencurves/botcurve.gif Diff File
add - stable/templates/softgreencurves/botcurve2.gif Diff File
add - stable/templates/softgreencurves/chart.jpg Diff File
add - stable/templates/softgreencurves/clearall.pstpl Diff File
add - stable/templates/softgreencurves/completed.pstpl Diff File
add - stable/templates/softgreencurves/contgrid.gif Diff File
add - stable/templates/softgreencurves/endgroup.pstpl Diff File
add - stable/templates/softgreencurves/endpage.pstpl Diff File
add - stable/templates/softgreencurves/groupdescription.pstpl Diff File
add - stable/templates/softgreencurves/headleft.gif Diff File
add - stable/templates/softgreencurves/headright.gif Diff File
add - stable/templates/softgreencurves/load.pstpl Diff File
add - stable/templates/softgreencurves/navigator.pstpl Diff File
add - stable/templates/softgreencurves/privacy.pstpl Diff File
add - stable/templates/softgreencurves/question.pstpl Diff File
add - stable/templates/softgreencurves/register.pstpl Diff File
add - stable/templates/softgreencurves/save.pstpl Diff File
add - stable/templates/softgreencurves/smallgrid.gif Diff File
add - stable/templates/softgreencurves/smallgrid2.gif Diff File
add - stable/templates/softgreencurves/startgroup.pstpl Diff File
add - stable/templates/softgreencurves/startpage.pstpl Diff File
add - stable/templates/softgreencurves/submit.pstpl Diff File
add - stable/templates/softgreencurves/survey.pstpl Diff File
add - stable/templates/softgreencurves/topcurve.gif Diff File
add - stable/templates/softgreencurves/topcurve2.gif Diff File
add - stable/templates/softgreencurves/welcome.pstpl Diff File
add - stable/templates/vallendar/assessment.pstpl Diff File
add - stable/templates/vallendar/chart.jpg Diff File
add - stable/templates/vallendar/clearall.pstpl Diff File
add - stable/templates/vallendar/completed.pstpl Diff File
add - stable/templates/vallendar/endgroup.pstpl Diff File
add - stable/templates/vallendar/endpage.pstpl Diff File
add - stable/templates/vallendar/groupdescription.pstpl Diff File
add - stable/templates/vallendar/load.pstpl Diff File
add - stable/templates/vallendar/logo.jpg Diff File
add - stable/templates/vallendar/navigator.pstpl Diff File
add - stable/templates/vallendar/privacy.pstpl Diff File
add - stable/templates/vallendar/question.pstpl Diff File
add - stable/templates/vallendar/readme.txt Diff File
add - stable/templates/vallendar/register.pstpl Diff File
add - stable/templates/vallendar/save.pstpl Diff File
add - stable/templates/vallendar/startgroup.pstpl Diff File
add - stable/templates/vallendar/startpage.pstpl Diff File
add - stable/templates/vallendar/submit.pstpl Diff File
add - stable/templates/vallendar/survey.pstpl Diff File
add - stable/templates/vallendar/welcome.pstpl Diff File
add - stable/tmp/readme.txt Diff File

master aef089b3

2012-01-30 05:47:56

Shitiz Garg

Details Diff
Merge branch 'refs/heads/limesurvey16'

Conflicts:
admin/admin.php
admin/browse.php
admin/conditions.php
admin/dataentry.php
admin/html.php
admin/login_check.php
admin/questionhandling.php
admin/scripts/tabpane/css/tab.webfx.css
admin/styles/default/adminstyle.css
admin/styles/limesurvey/adminstyle.css
admin/userrighthandling.php
admin/vvexport.php
common.php
group.php
index.php
locale/es/LC_MESSAGES/es.mo
locale/es/LC_MESSAGES/es.po
qanda.php
question.php
survey.php
Attach Issues:
add - admin/scripts/tabpane/css/tab.webfx.css Diff File
add - admin/styles/classic/adminstyle.css Diff File
add - admin/styles/limesurvey/adminstyle.css Diff File
mod - admin/admin.php Diff File
mod - admin/browse.php Diff File
mod - admin/conditions.php Diff File
mod - admin/dataentry.php Diff File
mod - admin/html.php Diff File
mod - admin/login_check.php Diff File
mod - admin/questionhandling.php Diff File
mod - admin/styles/default/adminstyle.css Diff File
mod - admin/userrighthandling.php Diff File
mod - admin/vvexport.php Diff File
mod - common.php Diff File
mod - group.php Diff File
mod - index.php Diff File
mod - locale/es/LC_MESSAGES/es.po Diff File
mod - qanda.php Diff File
mod - question.php Diff File
mod - survey.php Diff File

Yii 0fccc5a0

2012-01-29 20:58:18

TMSWhite

Details Diff
Fixed issue 05690: Logic File does not show sub-question level default values

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12251 b72ed6b6-b9f8-46b5-92b4-906544132732
Affected Issues
05690
mod - application/helpers/expressions/em_manager_helper.php Diff File

master 154fdef2

2012-01-29 20:54:34

tmswhite

Details Diff
Fixed issue 05690: Logic File does not show sub-question level default values


git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@12250 b72ed6b6-b9f8-46b5-92b4-906544132732
Attach Issues:
mod - classes/eval/LimeExpressionManager.php Diff File

Yii 22eaecba

2012-01-28 15:26:44

TMSWhite

Details Diff
Fixed issue #05679: Questions conditional upon previous questions do not appear until "Next" button is pressed
Dev core problem was uncaught javascript errors when processing relevance of hidden questions

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12249 b72ed6b6-b9f8-46b5-92b4-906544132732
Affected Issues
05679
mod - scripts/admin/expressions/em_javascript.js Diff File

master 831b712a

2012-01-28 15:22:57

tmswhite

Details Diff
Fixed issue #05679: Questions conditional upon previous questions do not appear until "Next" button is pressed
Dev core problem was uncaught javascript errors when processing relevance of hidden questions

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@12248 b72ed6b6-b9f8-46b5-92b4-906544132732
Attach Issues:
mod - classes/eval/em_javascript.js Diff File

master 9cc77259

2012-01-28 10:28:06

Shitiz Garg

Details Diff
Merge branch 'refs/heads/dev_tms' into dev

Conflicts:
admin/admin.php
admin/browse.php
admin/classes/quexml/quexmlpdf.php
admin/database.php
admin/editsurveysettings.php
admin/html.php
admin/install/create-mssql.sql
admin/install/create-mssqlnative.sql
admin/install/create-mysql.sql
admin/install/create-postgres.sql
admin/labels.php
admin/preview.php
admin/printablesurvey.php
admin/questionhandling.php
admin/scripts/admin_core.js
admin/scripts/templates.js
admin/statistics_function.php
admin/templates.php
admin/tokens.php
admin/translate_functions.php
admin/update/upgrade-all.php
admin/update/upgrade-mssql.php
admin/update/upgrade-mssqlnative.php
admin/update/upgrade-mysql.php
admin/update/upgrade-postgres.php
admin/usercontrol.php
classes/eval/ExpressionManager.php
classes/eval/LimeExpressionManager.php
classes/eval/em_javascript.js
classes/eval/test/conditions2relevance.php
classes/eval/test/data.php
classes/eval/test/functions.php
classes/eval/test/navigation_test.php
classes/eval/test/relevance.php
classes/eval/test/reset_syntax_error_log.php
classes/eval/test/strings_with_expressions.php
classes/eval/test/stringsplit.php
classes/eval/test/survey_logic_file.php
classes/eval/test/syntax_errors.php
classes/eval/test/test.php
classes/eval/test/tokenizer.php
classes/eval/test/unit.php
classes/eval/test/upgrade_conditions2relevance.php
classes/eval/test/usage.php
common_functions.php
config-defaults.php
config.php
delete.php
docs/demosurveys/limesurvey2_sample_survey_english.lss
docs/release_notes.txt
group.php
index.php
locale/ar/LC_MESSAGES/ar.mo
locale/ar/LC_MESSAGES/ar.po
locale/be/LC_MESSAGES/be.mo
locale/be/LC_MESSAGES/be.po
locale/bg/LC_MESSAGES/bg.mo
locale/bg/LC_MESSAGES/bg.po
locale/bs/LC_MESSAGES/bs.mo
locale/bs/LC_MESSAGES/bs.po
locale/ca/LC_MESSAGES/ca.mo
locale/ca/LC_MESSAGES/ca.po
locale/cs/LC_MESSAGES/cs.mo
locale/cs/LC_MESSAGES/cs.po
locale/cy/LC_MESSAGES/cy.mo
locale/cy/LC_MESSAGES/cy.po
locale/da/LC_MESSAGES/da.mo
locale/da/LC_MESSAGES/da.po
locale/de-informal/LC_MESSAGES/de-informal.mo
locale/de-informal/LC_MESSAGES/de-informal.po
locale/de/LC_MESSAGES/de.mo
locale/de/LC_MESSAGES/de.po
locale/el/LC_MESSAGES/el.mo
locale/el/LC_MESSAGES/el.po
locale/en/LC_MESSAGES/en.mo
locale/en/LC_MESSAGES/en.po
locale/es-MX/LC_MESSAGES/es-MX.mo
locale/es-MX/LC_MESSAGES/es-MX.po
locale/es/LC_MESSAGES/es.mo
locale/es/LC_MESSAGES/es.po
locale/et/LC_MESSAGES/et.mo
locale/et/LC_MESSAGES/et.po
locale/eu/LC_MESSAGES/eu.mo
locale/eu/LC_MESSAGES/eu.po
locale/fa/LC_MESSAGES/fa.mo
locale/fa/LC_MESSAGES/fa.po
locale/fi/LC_MESSAGES/fi.mo
locale/fi/LC_MESSAGES/fi.po
locale/fr/LC_MESSAGES/fr.mo
locale/fr/LC_MESSAGES/fr.po
locale/ga/LC_MESSAGES/ga.mo
locale/ga/LC_MESSAGES/ga.po
locale/gl/LC_MESSAGES/gl.mo
locale/gl/LC_MESSAGES/gl.po
locale/he/LC_MESSAGES/he.mo
locale/he/LC_MESSAGES/he.po
locale/hi/LC_MESSAGES/hi.mo
locale/hi/LC_MESSAGES/hi.po
locale/hr/LC_MESSAGES/hr.mo
locale/hr/LC_MESSAGES/hr.po
locale/hu/LC_MESSAGES/hu.mo
locale/hu/LC_MESSAGES/hu.po
locale/id/LC_MESSAGES/id.mo
locale/id/LC_MESSAGES/id.po
locale/is/LC_MESSAGES/is.mo
locale/is/LC_MESSAGES/is.po
locale/it-formal/LC_MESSAGES/it-formal.mo
locale/it-formal/LC_MESSAGES/it-formal.po
locale/it/LC_MESSAGES/it.mo
locale/it/LC_MESSAGES/it.po
locale/ja/LC_MESSAGES/ja.mo
locale/ja/LC_MESSAGES/ja.po
locale/ko/LC_MESSAGES/ko.mo
locale/ko/LC_MESSAGES/ko.po
locale/lt/LC_MESSAGES/lt.mo
locale/lt/LC_MESSAGES/lt.po
locale/lv/LC_MESSAGES/lv.mo
locale/lv/LC_MESSAGES/lv.po
locale/mk/LC_MESSAGES/mk.mo
locale/mk/LC_MESSAGES/mk.po
locale/ms/LC_MESSAGES/ms.mo
locale/ms/LC_MESSAGES/ms.po
locale/mt/LC_MESSAGES/mt.mo
locale/mt/LC_MESSAGES/mt.po
locale/nb/LC_MESSAGES/nb.mo
locale/nb/LC_MESSAGES/nb.po
locale/nl-informal/LC_MESSAGES/nl-informal.mo
locale/nl-informal/LC_MESSAGES/nl-informal.po
locale/nl/LC_MESSAGES/nl.mo
locale/nl/LC_MESSAGES/nl.po
locale/nn/LC_MESSAGES/nn.mo
locale/nn/LC_MESSAGES/nn.po
locale/pa/LC_MESSAGES/pa.mo
locale/pa/LC_MESSAGES/pa.po
locale/pl/LC_MESSAGES/pl.mo
locale/pl/LC_MESSAGES/pl.po
locale/pt-BR/LC_MESSAGES/pt-BR.mo
locale/pt-BR/LC_MESSAGES/pt-BR.po
locale/pt/LC_MESSAGES/pt.mo
locale/pt/LC_MESSAGES/pt.po
locale/ro/LC_MESSAGES/ro.mo
locale/ro/LC_MESSAGES/ro.po
locale/ru/LC_MESSAGES/ru.mo
locale/ru/LC_MESSAGES/ru.po
locale/si/LC_MESSAGES/si.mo
locale/si/LC_MESSAGES/si.po
locale/sk/LC_MESSAGES/sk.mo
locale/sk/LC_MESSAGES/sk.po
locale/sl/LC_MESSAGES/sl.mo
locale/sl/LC_MESSAGES/sl.po
locale/sq/LC_MESSAGES/sq.mo
locale/sq/LC_MESSAGES/sq.po
locale/sr/LC_MESSAGES/sr.mo
locale/sr/LC_MESSAGES/sr.po
locale/sv/LC_MESSAGES/sv.mo
locale/sv/LC_MESSAGES/sv.po
locale/th/LC_MESSAGES/th.mo
locale/th/LC_MESSAGES/th.po
locale/tr/LC_MESSAGES/tr.mo
locale/tr/LC_MESSAGES/tr.po
locale/ur/LC_MESSAGES/ur.mo
locale/ur/LC_MESSAGES/ur.po
locale/vi/LC_MESSAGES/vi.mo
locale/vi/LC_MESSAGES/vi.po
locale/zh-Hans/LC_MESSAGES/zh-Hans.mo
locale/zh-Hans/LC_MESSAGES/zh-Hans.po
locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.mo
locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.po
locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.mo
locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.po
qanda.php
replacements.php
save.php
scripts/modaldialog.js
scripts/survey_runtime.js
scripts/uploader.js
templates/citronade/ie_fix_6.css
templates/citronade/ie_fix_7.css
templates/citronade/ie_fix_8.css
templates/citronade/startpage.pstpl
templates/citronade/template.css
uploader.php
version.php
Attach Issues:
rm - admin/scripts/updateset.js Diff File
mod - admin/admin.php Diff File
mod - admin/browse.php Diff File
mod - admin/classes/quexml/quexmlpdf.php Diff File
mod - admin/database.php Diff File
mod - admin/editsurveysettings.php Diff File
mod - admin/html.php Diff File
mod - admin/install/create-mssql.sql Diff File
mod - admin/install/create-mssqlnative.sql Diff File
mod - admin/install/create-mysql.sql Diff File
mod - admin/install/create-postgres.sql Diff File
mod - admin/labels.php Diff File
mod - admin/login_check.php Diff File
mod - admin/preview.php Diff File
mod - admin/printablesurvey.php Diff File
mod - admin/questionhandling.php Diff File
mod - admin/scripts/admin_core.js Diff File
mod - admin/scripts/templates.js Diff File
mod - admin/sessioncontrol.php Diff File
mod - admin/statistics_function.php Diff File
mod - admin/templates.php Diff File
mod - admin/tokens.php Diff File
mod - admin/translate_functions.php Diff File
mod - admin/update/upgrade-all.php Diff File
mod - admin/update/upgrade-mssql.php Diff File
mod - admin/update/upgrade-mssqlnative.php Diff File
mod - admin/update/upgrade-mysql.php Diff File
mod - admin/update/upgrade-postgres.php Diff File
mod - admin/usercontrol.php Diff File
mod - classes/eval/ExpressionManager.php Diff File
mod - classes/eval/LimeExpressionManager.php Diff File
mod - classes/eval/em_javascript.js Diff File
mod - classes/eval/test/conditions2relevance.php Diff File
mod - classes/eval/test/data.php Diff File
mod - classes/eval/test/functions.php Diff File
mod - classes/eval/test/navigation_test.php Diff File
mod - classes/eval/test/relevance.php Diff File
mod - classes/eval/test/reset_syntax_error_log.php Diff File
mod - classes/eval/test/strings_with_expressions.php Diff File
mod - classes/eval/test/stringsplit.php Diff File
mod - classes/eval/test/survey_logic_file.php Diff File
mod - classes/eval/test/syntax_errors.php Diff File
mod - classes/eval/test/test.php Diff File
mod - classes/eval/test/tokenizer.php Diff File
mod - classes/eval/test/unit.php Diff File
mod - classes/eval/test/upgrade_conditions2relevance.php Diff File
mod - classes/eval/test/usage.php Diff File
mod - common_functions.php Diff File
mod - config-defaults.php Diff File
mod - config.php Diff File
mod - delete.php Diff File
mod - docs/demosurveys/limesurvey2_sample_survey_english.lss Diff File
mod - docs/release_notes.txt Diff File
mod - group.php Diff File
mod - index.php Diff File
mod - locale/ar/LC_MESSAGES/ar.po Diff File
mod - locale/be/LC_MESSAGES/be.po Diff File
mod - locale/bg/LC_MESSAGES/bg.po Diff File
mod - locale/bs/LC_MESSAGES/bs.po Diff File
mod - locale/ca/LC_MESSAGES/ca.po Diff File
mod - locale/cs/LC_MESSAGES/cs.po Diff File
mod - locale/cy/LC_MESSAGES/cy.po Diff File
mod - locale/da/LC_MESSAGES/da.po Diff File
mod - locale/de-informal/LC_MESSAGES/de-informal.po Diff File
mod - locale/de/LC_MESSAGES/de.po Diff File
mod - locale/el/LC_MESSAGES/el.po Diff File
mod - locale/en/LC_MESSAGES/en.po Diff File
mod - locale/es-MX/LC_MESSAGES/es-MX.po Diff File
mod - locale/es/LC_MESSAGES/es.po Diff File
mod - locale/et/LC_MESSAGES/et.po Diff File
mod - locale/eu/LC_MESSAGES/eu.po Diff File
mod - locale/fa/LC_MESSAGES/fa.po Diff File
mod - locale/fi/LC_MESSAGES/fi.po Diff File
mod - locale/fr/LC_MESSAGES/fr.po Diff File
mod - locale/ga/LC_MESSAGES/ga.po Diff File
mod - locale/gl/LC_MESSAGES/gl.po Diff File
mod - locale/he/LC_MESSAGES/he.po Diff File
mod - locale/hi/LC_MESSAGES/hi.po Diff File
mod - locale/hr/LC_MESSAGES/hr.po Diff File
mod - locale/hu/LC_MESSAGES/hu.po Diff File
mod - locale/id/LC_MESSAGES/id.po Diff File
mod - locale/is/LC_MESSAGES/is.po Diff File
mod - locale/it-formal/LC_MESSAGES/it-formal.po Diff File
mod - locale/it/LC_MESSAGES/it.po Diff File
mod - locale/ja/LC_MESSAGES/ja.po Diff File
mod - locale/ko/LC_MESSAGES/ko.po Diff File
mod - locale/lt/LC_MESSAGES/lt.po Diff File
mod - locale/lv/LC_MESSAGES/lv.po Diff File
mod - locale/mk/LC_MESSAGES/mk.po Diff File
mod - locale/ms/LC_MESSAGES/ms.po Diff File
mod - locale/mt/LC_MESSAGES/mt.po Diff File
mod - locale/nb/LC_MESSAGES/nb.po Diff File
mod - locale/nl-informal/LC_MESSAGES/nl-informal.po Diff File
mod - locale/nl/LC_MESSAGES/nl.po Diff File
mod - locale/nn/LC_MESSAGES/nn.po Diff File
mod - locale/pa/LC_MESSAGES/pa.po Diff File
mod - locale/pl/LC_MESSAGES/pl.po Diff File
mod - locale/pt-BR/LC_MESSAGES/pt-BR.po Diff File
mod - locale/pt/LC_MESSAGES/pt.po Diff File
mod - locale/ro/LC_MESSAGES/ro.po Diff File
mod - locale/ru/LC_MESSAGES/ru.po Diff File
mod - locale/si/LC_MESSAGES/si.po Diff File
mod - locale/sk/LC_MESSAGES/sk.po Diff File
mod - locale/sl/LC_MESSAGES/sl.po Diff File
mod - locale/sq/LC_MESSAGES/sq.po Diff File
mod - locale/sr/LC_MESSAGES/sr.po Diff File
mod - locale/sv/LC_MESSAGES/sv.po Diff File
mod - locale/th/LC_MESSAGES/th.po Diff File
mod - locale/tr/LC_MESSAGES/tr.po Diff File
mod - locale/ur/LC_MESSAGES/ur.po Diff File
mod - locale/vi/LC_MESSAGES/vi.po Diff File
mod - locale/zh-Hans/LC_MESSAGES/zh-Hans.po Diff File
mod - locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.po Diff File
mod - locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.po Diff File
mod - qanda.php Diff File
mod - replacements.php Diff File
mod - save.php Diff File
mod - scripts/modaldialog.js Diff File
mod - scripts/survey_runtime.js Diff File
mod - scripts/uploader.js Diff File
mod - templates/citronade/startpage.pstpl Diff File
mod - templates/citronade/template.css Diff File
mod - uploader.php Diff File
mod - version.php Diff File

master 7262e16b

2012-01-28 10:26:04

Shitiz Garg

Details Diff
Merge branch 'refs/heads/stable_plus'

Conflicts:
COPYRIGHT.php
admin/access_denied.php
admin/activate.php
admin/admin.php
admin/assessments.php
admin/browse.php
admin/cmdline_importsurvey.php
admin/conditions.php
admin/database.php
admin/dataentry.php
admin/dbedit.php
admin/deactivate.php
admin/deletesurvey.php
admin/dumpdb.php
admin/dumpgroup.php
admin/dumplabel.php
admin/dumpquestion.php
admin/dumpsurvey.php
admin/exportresults.php
admin/grouphandling.php
admin/html.php
admin/http_importsurvey.php
admin/importgroup.php
admin/importlabel.php
admin/importoldresponses.php
admin/importquestion.php
admin/importsurvey.php
admin/install/create-mysql.sql
admin/install/create-odbc_mssql.sql
admin/install/createdb.php
admin/install/index.php
admin/install/phpinfo.php
admin/install/upgrade-mysql.php
admin/install/upgrade-odbc_mssql.php
admin/integritycheck.php
admin/labels.php
admin/listcolumn.php
admin/login_check.php
admin/preview.php
admin/printablesurvey.php
admin/questionhandling.php
admin/results.php
admin/saved.php
admin/sessioncontrol.php
admin/spss.php
admin/statistics.php
admin/stats.php
admin/templates.php
admin/tokens.php
admin/usercontrol.php
admin/userrighthandling.php
admin/vvexport.php
admin/vvimport.php
classes/core/language.php
classes/core/sanitize.php
classes/core/surveytranslator.php
classes/php-gettext/gettext.php
classes/php-gettext/gettextinc.php
common.php
config-ldap.php
config.php
docs/demosurveys/sample_survey_v100.sql
docs/release_notes_and_upgrade_instructions.txt
group.php
images/flags/bs.png
images/flags/ca.png
images/flags/cs.png
images/flags/es-MX.png
images/flags/et.png
images/flags/eu.png
images/flags/mk.png
images/flags/sl.png
images/flags/sq.png
images/flags/sv.png
images/flags/th.png
images/flags/zh-Hant-TW.png
index.php
ldap-functions.php
load.php
locale/bs/LC_MESSAGES/bs.mo
locale/bs/LC_MESSAGES/bs.po
locale/ca/LC_MESSAGES/ca.mo
locale/ca/LC_MESSAGES/ca.po
locale/cs/LC_MESSAGES/cs.mo
locale/cs/LC_MESSAGES/cs.po
locale/da/LC_MESSAGES/da.mo
locale/da/LC_MESSAGES/da.po
locale/de-informal/LC_MESSAGES/de-informal.mo
locale/de-informal/LC_MESSAGES/de-informal.po
locale/de/LC_MESSAGES/de.mo
locale/de/LC_MESSAGES/de.po
locale/el/LC_MESSAGES/el.mo
locale/el/LC_MESSAGES/el.po
locale/en/LC_MESSAGES/en.mo
locale/en/LC_MESSAGES/en.po
locale/es-MX/LC_MESSAGES/es-MX.mo
locale/es-MX/LC_MESSAGES/es-MX.po
locale/es/LC_MESSAGES/es.mo
locale/es/LC_MESSAGES/es.po
locale/et/LC_MESSAGES/et.mo
locale/et/LC_MESSAGES/et.po
locale/eu/LC_MESSAGES/eu.mo
locale/eu/LC_MESSAGES/eu.po
locale/fi/LC_MESSAGES/fi.mo
locale/fi/LC_MESSAGES/fi.po
locale/fr/LC_MESSAGES/fr.mo
locale/fr/LC_MESSAGES/fr.po
locale/gl/LC_MESSAGES/gl.mo
locale/gl/LC_MESSAGES/gl.po
locale/hr/LC_MESSAGES/hr.mo
locale/hr/LC_MESSAGES/hr.po
locale/hu/LC_MESSAGES/hu.mo
locale/hu/LC_MESSAGES/hu.po
locale/it/LC_MESSAGES/it.mo
locale/it/LC_MESSAGES/it.po
locale/ja/LC_MESSAGES/ja.mo
locale/ja/LC_MESSAGES/ja.po
locale/no/LC_MESSAGES/no.mo
locale/no/LC_MESSAGES/no.po
locale/pt-BR/LC_MESSAGES/pt-BR.mo
locale/pt-BR/LC_MESSAGES/pt-BR.po
locale/ru/LC_MESSAGES/ru.mo
locale/ru/LC_MESSAGES/ru.po
locale/sl/LC_MESSAGES/sl.mo
locale/sl/LC_MESSAGES/sl.po
locale/sq/LC_MESSAGES/sq.mo
locale/sq/LC_MESSAGES/sq.po
locale/sr/LC_MESSAGES/sr.mo
locale/sr/LC_MESSAGES/sr.po
locale/sv/LC_MESSAGES/sv.mo
locale/sv/LC_MESSAGES/sv.po
locale/th/LC_MESSAGES/th.mo
locale/th/LC_MESSAGES/th.po
locale/tr/LC_MESSAGES/tr.mo
locale/tr/LC_MESSAGES/tr.po
locale/zh-Hans/LC_MESSAGES/zh-Hans.mo
locale/zh-Hans/LC_MESSAGES/zh-Hans.po
locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.mo
locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.po
locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.mo
locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.po
qanda.php
question.php
register.php
save.php
scripts/calendar/lang/calendar-sq.js
survey.php
templates/basic/startpage.pstpl
templates/blue_heaven/startpage.pstpl
templates/bluengrey/startpage.pstpl
templates/bubblegum/startpage.pstpl
templates/business_grey/startpage.pstpl
templates/clear_logo/startpage.pstpl
templates/default/startpage.pstpl
templates/edgyblue/startpage.pstpl
templates/eirenicon/startpage.pstpl
templates/phpsurveyor/startpage.pstpl
templates/preview.pstpl
templates/softgreencurves/startpage.pstpl
templates/vallendar/startpage.pstpl
verification.php
Attach Issues:
add - admin/conditions.php Diff File
add - admin/dbedit.php Diff File
add - admin/dumpsurvey.php Diff File
add - admin/grouphandling.php Diff File
add - admin/install/create-odbc_mssql.sql Diff File
add - admin/install/upgrade-mysql.php Diff File
add - admin/install/upgrade-odbc_mssql.php Diff File
add - admin/spss.php Diff File
add - admin/stats.php Diff File
add - classes/php-gettext/gettextinc.php Diff File
add - docs/demosurveys/sample_survey_v100.sql Diff File
add - docs/release_notes_and_upgrade_instructions.txt Diff File
add - locale/mk/mk.mo Diff File
add - locale/mk/mk.po Diff File
add - locale/no/LC_MESSAGES/no.mo Diff File
add - locale/no/LC_MESSAGES/no.po Diff File
add - locale/th/index.html Diff File
add - scripts/calendar/lang/calendar-bs.js Diff File
add - scripts/calendar/lang/calendar-es-MX.js Diff File
add - scripts/calendar/lang/calendar-et.js Diff File
add - scripts/calendar/lang/calendar-eu.js Diff File
add - scripts/calendar/lang/calendar-mk.js Diff File
add - scripts/calendar/lang/calendar-sq.js Diff File
add - scripts/calendar/lang/calendar-th.js Diff File
add - scripts/calendar/lang/calendar-zh-Hant-TW.js Diff File
add - templates/blue_heaven/startpage.pstpl Diff File
add - templates/bubblegum/startpage.pstpl Diff File
add - templates/business_grey/startpage.pstpl Diff File
add - templates/edgyblue/startpage.pstpl Diff File
add - templates/phpsurveyor/startpage.pstpl Diff File
add - templates/preview.pstpl Diff File
add - templates/softgreencurves/startpage.pstpl Diff File
mod - COPYRIGHT.php Diff File
mod - admin/access_denied.php Diff File
mod - admin/activate.php Diff File
mod - admin/admin.php Diff File
mod - admin/assessments.php Diff File
mod - admin/browse.php Diff File
mod - admin/cmdline_importsurvey.php Diff File
mod - admin/database.php Diff File
mod - admin/dataentry.php Diff File
mod - admin/deactivate.php Diff File
mod - admin/deletesurvey.php Diff File
mod - admin/dumpdb.php Diff File
mod - admin/dumpgroup.php Diff File
mod - admin/dumplabel.php Diff File
mod - admin/dumpquestion.php Diff File
mod - admin/exportresults.php Diff File
mod - admin/html.php Diff File
mod - admin/http_importsurvey.php Diff File
mod - admin/importgroup.php Diff File
mod - admin/importlabel.php Diff File
mod - admin/importoldresponses.php Diff File
mod - admin/importquestion.php Diff File
mod - admin/importsurvey.php Diff File
mod - admin/install/create-mysql.sql Diff File
mod - admin/install/createdb.php Diff File
mod - admin/install/index.php Diff File
mod - admin/install/phpinfo.php Diff File
mod - admin/integritycheck.php Diff File
mod - admin/labels.php Diff File
mod - admin/listcolumn.php Diff File
mod - admin/login_check.php Diff File
mod - admin/preview.php Diff File
mod - admin/printablesurvey.php Diff File
mod - admin/questionhandling.php Diff File
mod - admin/results.php Diff File
mod - admin/saved.php Diff File
mod - admin/sessioncontrol.php Diff File
mod - admin/statistics.php Diff File
mod - admin/templates.php Diff File
mod - admin/tokens.php Diff File
mod - admin/usercontrol.php Diff File
mod - admin/userrighthandling.php Diff File
mod - admin/vvexport.php Diff File
mod - admin/vvimport.php Diff File
mod - classes/core/language.php Diff File
mod - classes/core/sanitize.php Diff File
mod - classes/core/surveytranslator.php Diff File
mod - classes/php-gettext/gettext.php Diff File
mod - common.php Diff File
mod - config-ldap.php Diff File
mod - config.php Diff File
mod - group.php Diff File
mod - index.php Diff File
mod - ldap-functions.php Diff File
mod - load.php Diff File
mod - locale/bs/LC_MESSAGES/bs.po Diff File
mod - locale/ca/LC_MESSAGES/ca.po Diff File
mod - locale/cs/LC_MESSAGES/cs.po Diff File
mod - locale/da/LC_MESSAGES/da.po Diff File
mod - locale/de-informal/LC_MESSAGES/de-informal.po Diff File
mod - locale/de/LC_MESSAGES/de.po Diff File
mod - locale/el/LC_MESSAGES/el.po Diff File
mod - locale/en/LC_MESSAGES/en.po Diff File
mod - locale/es-MX/LC_MESSAGES/es-MX.po Diff File
mod - locale/es/LC_MESSAGES/es.po Diff File
mod - locale/et/LC_MESSAGES/et.po Diff File
mod - locale/eu/LC_MESSAGES/eu.po Diff File
mod - locale/fi/LC_MESSAGES/fi.po Diff File
mod - locale/fr/LC_MESSAGES/fr.po Diff File
mod - locale/gl/LC_MESSAGES/gl.po Diff File
mod - locale/hr/LC_MESSAGES/hr.po Diff File
mod - locale/hu/LC_MESSAGES/hu.po Diff File
mod - locale/it/LC_MESSAGES/it.po Diff File
mod - locale/ja/LC_MESSAGES/ja.po Diff File
mod - locale/pt-BR/LC_MESSAGES/pt-BR.po Diff File
mod - locale/ru/LC_MESSAGES/ru.po Diff File
mod - locale/sl/LC_MESSAGES/sl.po Diff File
mod - locale/sq/LC_MESSAGES/sq.po Diff File
mod - locale/sr/LC_MESSAGES/sr.po Diff File
mod - locale/sv/LC_MESSAGES/sv.po Diff File
mod - locale/th/LC_MESSAGES/th.po Diff File
mod - locale/tr/LC_MESSAGES/tr.po Diff File
mod - locale/zh-Hans/LC_MESSAGES/zh-Hans.po Diff File
mod - locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.po Diff File
mod - locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.po Diff File
mod - qanda.php Diff File
mod - question.php Diff File
mod - register.php Diff File
mod - save.php Diff File
mod - survey.php Diff File
mod - templates/basic/startpage.pstpl Diff File
mod - templates/bluengrey/startpage.pstpl Diff File
mod - templates/clear_logo/startpage.pstpl Diff File
mod - templates/default/startpage.pstpl Diff File
mod - templates/eirenicon/startpage.pstpl Diff File
mod - templates/vallendar/startpage.pstpl Diff File
mod - verification.php Diff File

Yii ddcd57df

2012-01-27 21:35:05

TMSWhite

Details Diff
Fixed issue 05702: Invalid question - probably missing sub-questions or language-specific settings for language en
Dev core problem is that groups.group_order can have gaps - needed to ensure groupSeq count is sequential from 0

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12247 b72ed6b6-b9f8-46b5-92b4-906544132732
Affected Issues
05702
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File

master 6fc4099a

2012-01-27 21:31:11

tmswhite

Details Diff
Fixed issue 05702: Invalid question - probably missing sub-questions or language-specific settings for language en
Dev core problem is that groups.group_order can have gaps - needed to ensure groupSeq count is sequential from 0

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@12246 b72ed6b6-b9f8-46b5-92b4-906544132732
Attach Issues:
mod - classes/eval/LimeExpressionManager.php Diff File
mod - common_functions.php Diff File

Yii 1bf0c8b4

2012-01-27 15:49:15

c_schmitz

Details Diff
Fixed casing on showxquestions field

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12245 b72ed6b6-b9f8-46b5-92b4-906544132732
Attach Issues:
mod - docs/demosurveys/limesurvey2_sample_survey_english.lss Diff File
mod - docs/demosurveys/ls2_cascading_array_filter.lss Diff File
mod - docs/demosurveys/ls2_subquestion_relevance.lss Diff File
mod - docs/demosurveys/ls2_validation_tests.lss Diff File

master 1a117160

2012-01-27 15:48:37

Carsten Schmitz

Details Diff
Fixed casing on showxquestions field

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@12244 b72ed6b6-b9f8-46b5-92b4-906544132732
Attach Issues:
rm - admin/remotecontrol/surveys/limesurvey_survey_29846.lss Diff File
mod - docs/demosurveys/Randomization_Group_Test.lss Diff File
mod - docs/demosurveys/SAMPLE_SURVEY_191_EN_DE_FR.lss Diff File
mod - docs/demosurveys/limesurvey2_sample_survey_english.lss Diff File
mod - docs/demosurveys/ls2_cascading_array_filter.lss Diff File
mod - docs/demosurveys/ls2_subquestion_relevance.lss Diff File
mod - docs/demosurveys/ls2_validation_tests.lss Diff File

Yii ec1772da

2012-01-27 15:42:21

c_schmitz

Details Diff
Fixed PostgreSQL installation issues
Fixed casing on showxquestions field

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12243 b72ed6b6-b9f8-46b5-92b4-906544132732
Attach Issues:
mod - application/config/config-defaults.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/surveyaction.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/update/upgrade-mssql_helper.php Diff File
mod - application/helpers/update/upgrade-mssqlnative_helper.php Diff File
mod - application/helpers/update/upgrade-mysql_helper.php Diff File
mod - application/helpers/update/upgrade-postgres_helper.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/survey/subview/tabPresentation_view.php Diff File
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mssqlnative.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File

master ded33589

2012-01-27 15:41:13

Carsten Schmitz

Details Diff
Fixed PostgreSQL installation issues
Fixed casing on showxquestions field

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@12242 b72ed6b6-b9f8-46b5-92b4-906544132732
Attach Issues:
mod - admin/database.php Diff File
mod - admin/editsurveysettings.php Diff File
mod - admin/globalsettings.php Diff File
mod - admin/install/create-mssql.sql Diff File
mod - admin/install/create-mssqlnative.sql Diff File
mod - admin/install/create-mysql.sql Diff File
mod - admin/install/create-postgres.sql Diff File
mod - admin/update/upgrade-all.php Diff File
mod - admin/update/upgrade-mssql.php Diff File
mod - admin/update/upgrade-mssqlnative.php Diff File
mod - admin/update/upgrade-mysql.php Diff File
mod - admin/update/upgrade-postgres.php Diff File
mod - common.php Diff File
mod - config-defaults.php Diff File
mod - replacements.php Diff File

Yii 9bcb8e8c

2012-01-27 13:43:02

TMSWhite

Details Diff
Fixed issue 05709: Validation tips not appearing for questions that have relevance equations

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12241 b72ed6b6-b9f8-46b5-92b4-906544132732
Affected Issues
05709
mod - application/helpers/expressions/em_manager_helper.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 900 ... 1050 ... 1147 1148 1149 1150 1151 1152 1153 ... 1200 ... 1350 ... 1448 1449 1450  Next  Last