Changesets: LimeSurvey
1.92 1cbf3a1c 2012-05-16 04:54:10 Details Diff |
Merge branch 'master' into 192_dev | ||
mod - admin/database.php | Diff File | ||
mod - admin/dataentry.php | Diff File | ||
mod - admin/html.php | Diff File | ||
mod - admin/preview.php | Diff File | ||
mod - admin/printablesurvey.php | Diff File | ||
mod - admin/questiongrouphandling.php | Diff File | ||
mod - admin/questionhandling.php | Diff File | ||
mod - admin/translate.php | Diff File | ||
mod - classes/expressions/ExpressionManager.php | Diff File | ||
mod - classes/expressions/test/conditions2relevance.php | Diff File | ||
mod - classes/expressions/test/functions.php | Diff File | ||
mod - classes/expressions/test/strings_with_expressions.php | Diff File | ||
mod - classes/expressions/test/stringsplit.php | Diff File | ||
mod - classes/expressions/test/tokenizer.php | Diff File | ||
mod - classes/expressions/test/upgrade_conditions2relevance.php | Diff File | ||
mod - common.php | Diff File | ||
mod - common_functions.php | Diff File | ||
mod - group.php | Diff File | ||
mod - qanda.php | Diff File | ||
mod - scripts/survey_runtime.js | Diff File | ||
1.92 4c5495cb 2012-05-16 04:39:06 Details Diff |
Merge branch 'master' into 192_dev | ||
mod - admin/scripts/subquestions.js | Diff File | ||
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
1.92 ebaaccc7 2012-05-15 22:07:20 Details Diff |
Merge branch 'master' into 192_dev | ||
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
add - docs/demosurveys/ls2_cascading_array_filter_exclude.lss | Diff File | ||
mod - qanda.php | Diff File | ||
master e1e38ca3 2012-05-15 21:50:47 Details Diff |
Dev removed obsolete comments (code made obsolete by EM, most of which code has been commented out for months) | ||
mod - admin/database.php | Diff File | ||
mod - admin/dataentry.php | Diff File | ||
mod - admin/html.php | Diff File | ||
mod - admin/preview.php | Diff File | ||
mod - admin/printablesurvey.php | Diff File | ||
mod - admin/questiongrouphandling.php | Diff File | ||
mod - admin/questionhandling.php | Diff File | ||
mod - admin/translate.php | Diff File | ||
mod - classes/expressions/ExpressionManager.php | Diff File | ||
mod - classes/expressions/test/conditions2relevance.php | Diff File | ||
mod - classes/expressions/test/functions.php | Diff File | ||
mod - classes/expressions/test/strings_with_expressions.php | Diff File | ||
mod - classes/expressions/test/stringsplit.php | Diff File | ||
mod - classes/expressions/test/tokenizer.php | Diff File | ||
mod - classes/expressions/test/upgrade_conditions2relevance.php | Diff File | ||
mod - common.php | Diff File | ||
mod - common_functions.php | Diff File | ||
mod - group.php | Diff File | ||
mod - qanda.php | Diff File | ||
mod - scripts/survey_runtime.js | Diff File | ||
master 3c22b332 2012-05-15 21:37:18 Details Diff |
Merge branch 'master' of github.com:LimeSurvey/LimeSurvey | ||
mod - admin/scripts/subquestions.js | Diff File | ||
Yii 57928d46 2012-05-15 21:36:27 Details Diff |
Fixed issue 05766: exclude_all_others_auto does not work Dev fixed typo in logic detecting that exclude_all_others_auto is active |
Affected Issues 05766 |
|
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
master 024865fe 2012-05-15 21:35:21 Details Diff |
Fixed issue 05766: exclude_all_others_auto does not work Dev fixed typo in logic detecting that exclude_all_others_auto is active |
Affected Issues 05766 |
|
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
1.92 bc202a66 2012-05-15 15:43:53 Details Diff |
Merge branch 'master' into 192_dev | ||
mod - admin/scripts/answers.js | Diff File | ||
mod - admin/scripts/subquestions.js | Diff File | ||
mod - classes/core/surveytranslator.php | Diff File | ||
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
mod - common_functions.php | Diff File | ||
mod - index.php | Diff File | ||
add - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/am/LC_MESSAGES/am.mo | Diff File | ||
mod - locale/am/LC_MESSAGES/am.po | Diff File | ||
add - locale/es-CL/LC_MESSAGES/es-CL.mo | Diff File | ||
add - locale/es-CL/LC_MESSAGES/es-CL.po | Diff File | ||
add - locale/es-CL/LC_MESSAGES/index.html | Diff File | ||
add - locale/es-CL/index.html | Diff File | ||
mod - locale/fa/LC_MESSAGES/fa.mo | Diff File | ||
mod - locale/fa/LC_MESSAGES/fa.po | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.mo | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.po | Diff File | ||
mod - qanda.php | Diff File | ||
Yii 49c043b2 2012-05-15 14:59:44 Details Diff |
Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii | ||
mod - application/views/admin/survey/Question/subQuestion_view.php | Diff File | ||
mod - scripts/admin/subquestions.js | Diff File | ||
Yii 1e88fcf8 2012-05-15 14:59:09 Details Diff |
Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii | ||
mod - application/controllers/admin/browse.php | Diff File | ||
mod - application/controllers/admin/database.php | Diff File | ||
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/helpers/update/upgrade-pgsql_helper.php | Diff File | ||
mod - application/libraries/Save.php | Diff File | ||
mod - application/views/admin/browse/browsemenubar_view.php | Diff File | ||
master 0a086ac1 2012-05-15 14:58:53 Details Diff |
Merge remote-tracking branch 'origin/master' | ||
add - docs/demosurveys/ls2_cascading_array_filter_exclude.lss | Diff File | ||
add - locale/_template/limesurvey.pot | Diff File | ||
mod - admin/scripts/answers.js | Diff File | ||
mod - admin/scripts/subquestions.js | Diff File | ||
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
mod - qanda.php | Diff File | ||
Yii 9d598b8e 2012-05-15 14:58:31 Details Diff |
Merge remote-tracking branch 'origin/Yii' into Yii | ||
mod - application/controllers/admin/browse.php | Diff File | ||
mod - application/views/admin/browse/browsemenubar_view.php | Diff File | ||
Yii 114cef20 2012-05-15 14:58:20 Details Diff |
Fixed issue#05766: exclude_all_others_auto does not work Dev Now works properly even if question is array_filtered (e.g. sets exclusive option if all other visible/relevant options are set) |
Affected Issues 05766 |
|
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - scripts/survey_runtime.js | Diff File | ||
Yii ab77d01f 2012-05-15 14:58:12 Details Diff |
Fixed issue 06085: By pasting a subquestion code can contain a space |
Affected Issues 06085 |
|
mod - application/views/admin/survey/Question/subQuestion_view.php | Diff File | ||
mod - scripts/admin/subquestions.js | Diff File | ||
master f67c1157 2012-05-15 14:58:06 Details Diff |
Fixed issue 06085: By pasting a subquestion code can contain a space |
Affected Issues 06085 |
|
mod - admin/scripts/subquestions.js | Diff File | ||
master 4627d347 2012-05-15 14:49:08 Details Diff |
Fixed issue#05766: exclude_all_others_auto does not work Dev Now works properly even if question is array_filtered (e.g. sets exclusive option if all other visible/relevant options are set) |
Affected Issues 05766 |
|
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
mod - qanda.php | Diff File | ||
Yii 30b18e8b 2012-05-15 13:38:25 Details Diff |
Dev : better fix 06073 browse response Dev : separation of index and browse |
Affected Issues 06073 |
|
mod - application/controllers/admin/browse.php | Diff File | ||
mod - application/views/admin/browse/browsemenubar_view.php | Diff File | ||
Yii 9fddbd80 2012-05-15 12:34:21 Details Diff |
Fixed issue 06077: Error on listing surveys |
Affected Issues 06077 |
|
mod - application/helpers/common_helper.php | Diff File | ||
Yii 7afad535 2012-05-15 12:29:28 Details Diff |
Fixed issue 06088: Saving a subquestion using Postgres shows error |
Affected Issues 06088 |
|
mod - application/controllers/admin/database.php | Diff File | ||
Yii b80083b0 2012-05-15 12:18:49 Details Diff |
Merge remote-tracking branch 'origin/Yii' into Yii | ||
mod - application/controllers/admin/browse.php | Diff File | ||
mod - application/libraries/Save.php | Diff File | ||
Yii edc0448c 2012-05-15 12:17:20 Details Diff |
Fixed issue: Small error in Postgres on update | ||
mod - application/helpers/update/upgrade-pgsql_helper.php | Diff File | ||
Yii f6c7ef42 2012-05-15 12:16:18 Details Diff |
Fixed issue 06073 : survey summary is not implemented Fixed issue : unable to end survey with save timing TODO: browse save timing / clean browse code |
Affected Issues 06073 |
|
mod - application/controllers/admin/browse.php | Diff File | ||
mod - application/libraries/Save.php | Diff File | ||
Yii c16bb49d 2012-05-15 09:53:54 Details Diff |
Fixed issue 05943: exclusive option in multiple choice hide all other answer options |
Affected Issues 05943 |
|
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
Yii ae7e851e 2012-05-15 09:36:51 Details Diff |
Fixed issue #06087: cascading array filter fails for depth>=3 in group and question modes Dev added sample survey testing/demonstrating desired behavior |
Affected Issues 06087 |
|
add - docs/demosurveys/ls2_cascading_array_filter_exclude.lss | Diff File | ||
master caf2c67d 2012-05-15 09:33:28 Details Diff |
Fixed issue #06087: cascading array filter fails for depth>=3 in group and question modes Dev added sample survey testing/demonstrating desired behavior |
Affected Issues 06087 |
|
add - docs/demosurveys/ls2_cascading_array_filter_exclude.lss | Diff File |