Changesets: LimeSurvey
Yii 80f6915d 2012-06-18 09:00:03 Details Diff |
Fixed issue 06211: Problems with two "file upload" question types in the same question group |
Affected Issues 06227 |
|
mod - scripts/modaldialog.js | Diff File | ||
master 9e80a506 2012-06-18 08:58:36 Details Diff |
Fixed issue 06211: Problems with two "file upload" question types in the same question group |
Affected Issues 06227 |
|
mod - scripts/modaldialog.js | Diff File | ||
Yii 31aa783f 2012-06-18 07:47:02 Details Diff |
Fixed issue 06231: EM doesn't convert condition correctly, OR becomes AND |
Affected Issues 06231 |
|
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
master 45f97217 2012-06-18 07:43:20 Details Diff |
Fixed issue 06231: EM doesn't convert condition correctly, OR becomes AND |
Affected Issues 06231 |
|
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
Yii 6461d700 2012-06-18 05:17:42 Details Diff |
Merge remote-tracking branch 'origin/Yii' into Yii | ||
mod - application/controllers/survey/index.php | Diff File | ||
mod - application/helpers/common_helper.php | Diff File | ||
Yii 1664db8f 2012-06-18 04:53:47 Details Diff |
Fixed issue : 06226 & 06229 : Cannot edit answer (token and edit answers after submitting activated) Fixed issue : cannot do a survey with edit answers after submitting activated or token answer persistance Dev : buildsurveysession need surveyid in Yii : can be removed with a $thisurvey['sid'] ? |
||
mod - application/controllers/survey/index.php | Diff File | ||
mod - application/helpers/common_helper.php | Diff File | ||
1.92 21f00706 2012-06-18 03:59:55 Details Diff |
Merge branch 'master' into 192_dev | ||
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
mod - common_functions.php | Diff File | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/sv/LC_MESSAGES/sv.mo | Diff File | ||
mod - locale/sv/LC_MESSAGES/sv.po | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.mo | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.po | Diff File | ||
Yii aabee7ac 2012-06-18 03:32:30 Details Diff |
Updated KCFinder to 2.51 | ||
mod - application/controllers/admin/kcfinder.php | Diff File | ||
mod - application/controllers/admin/surveyadmin.php | Diff File | ||
mod - scripts/admin/kcfinder/browse.php | Diff File | ||
mod - scripts/admin/kcfinder/config.php | Diff File | ||
add - scripts/admin/kcfinder/core/autoload.php | Diff File | ||
mod - scripts/admin/kcfinder/core/browser.php | Diff File | ||
mod - scripts/admin/kcfinder/core/types/type_img.php | Diff File | ||
mod - scripts/admin/kcfinder/core/types/type_mime.php | Diff File | ||
mod - scripts/admin/kcfinder/core/uploader.php | Diff File | ||
add - scripts/admin/kcfinder/css.php | Diff File | ||
mod - scripts/admin/kcfinder/doc/Changelog | Diff File | ||
mod - scripts/admin/kcfinder/doc/README | Diff File | ||
mod - scripts/admin/kcfinder/js/browser/0bject.js | Diff File | ||
mod - scripts/admin/kcfinder/js/browser/clipboard.js | Diff File | ||
add - scripts/admin/kcfinder/js/browser/dropUpload.js | Diff File | ||
mod - scripts/admin/kcfinder/js/browser/files.js | Diff File | ||
mod - scripts/admin/kcfinder/js/browser/folders.js | Diff File | ||
mod - scripts/admin/kcfinder/js/browser/init.js | Diff File | ||
mod - scripts/admin/kcfinder/js/browser/joiner.php | Diff File | ||
mod - scripts/admin/kcfinder/js/browser/misc.js | Diff File | ||
mod - scripts/admin/kcfinder/js/browser/settings.js | Diff File | ||
mod - scripts/admin/kcfinder/js/browser/toolbar.js | Diff File | ||
mod - scripts/admin/kcfinder/js/helper.js | Diff File | ||
mod - scripts/admin/kcfinder/js/jquery.drag.js | Diff File | ||
mod - scripts/admin/kcfinder/js/jquery.js | Diff File | ||
mod - scripts/admin/kcfinder/js/jquery.rightClick.js | Diff File | ||
add - scripts/admin/kcfinder/js_localize.php | Diff File | ||
mod - scripts/admin/kcfinder/lang/bg.php | Diff File | ||
add - scripts/admin/kcfinder/lang/ca.php | Diff File | ||
mod - scripts/admin/kcfinder/lang/cs.php | Diff File | ||
add - scripts/admin/kcfinder/lang/da.php | Diff File | ||
add - scripts/admin/kcfinder/lang/el.php | Diff File | ||
mod - scripts/admin/kcfinder/lang/en.php | Diff File | ||
mod - scripts/admin/kcfinder/lang/es.php | Diff File | ||
mod - scripts/admin/kcfinder/lang/fa.php | Diff File | ||
mod - scripts/admin/kcfinder/lang/fr.php | Diff File | ||
mod - scripts/admin/kcfinder/lang/hu.php | Diff File | ||
mod - scripts/admin/kcfinder/lang/it.php | Diff File | ||
add - scripts/admin/kcfinder/lang/ja.php | Diff File | ||
add - scripts/admin/kcfinder/lang/lt.php | Diff File | ||
add - scripts/admin/kcfinder/lang/no.php | Diff File | ||
add - scripts/admin/kcfinder/lang/pt-br.php | Diff File | ||
mod - scripts/admin/kcfinder/lang/ru.php | Diff File | ||
add - scripts/admin/kcfinder/lang/sk.php | Diff File | ||
mod - scripts/admin/kcfinder/lang/tr.php | Diff File | ||
add - scripts/admin/kcfinder/lang/vi.php | Diff File | ||
mod - scripts/admin/kcfinder/lang/zh-cn.php | Diff File | ||
mod - scripts/admin/kcfinder/lib/class_gd.php | Diff File | ||
mod - scripts/admin/kcfinder/lib/class_input.php | Diff File | ||
mod - scripts/admin/kcfinder/lib/class_zipFolder.php | Diff File | ||
mod - scripts/admin/kcfinder/lib/helper_dir.php | Diff File | ||
mod - scripts/admin/kcfinder/lib/helper_file.php | Diff File | ||
mod - scripts/admin/kcfinder/lib/helper_httpCache.php | Diff File | ||
mod - scripts/admin/kcfinder/lib/helper_path.php | Diff File | ||
mod - scripts/admin/kcfinder/lib/helper_text.php | Diff File | ||
mod - scripts/admin/kcfinder/themes/oxygen/about.txt | Diff File | ||
add - scripts/admin/kcfinder/themes/oxygen/img/alert.png | Diff File | ||
add - scripts/admin/kcfinder/themes/oxygen/img/bg_transparent.png | Diff File | ||
add - scripts/admin/kcfinder/themes/oxygen/img/confirm.png | Diff File | ||
add - scripts/admin/kcfinder/themes/oxygen/img/files/big/psd.png | Diff File | ||
add - scripts/admin/kcfinder/themes/oxygen/img/files/big/rar.png | Diff File | ||
add - scripts/admin/kcfinder/themes/oxygen/img/files/small/psd.png | Diff File | ||
add - scripts/admin/kcfinder/themes/oxygen/img/files/small/rar.png | Diff File | ||
add - scripts/admin/kcfinder/themes/oxygen/img/icons/close-clicked.png | Diff File | ||
add - scripts/admin/kcfinder/themes/oxygen/img/icons/close-hover.png | Diff File | ||
add - scripts/admin/kcfinder/themes/oxygen/img/icons/close.png | Diff File | ||
add - scripts/admin/kcfinder/themes/oxygen/img/kcf_logo.png | Diff File | ||
mod - scripts/admin/kcfinder/themes/oxygen/style.css | Diff File | ||
mod - scripts/admin/kcfinder/tpl/tpl_browser.php | Diff File | ||
add - scripts/admin/kcfinder/tpl/tpl_css.php | Diff File | ||
add - scripts/admin/kcfinder/tpl/tpl_javascript.php | Diff File | ||
mod - scripts/admin/kcfinder/upload.php | Diff File | ||
Yii 551dc768 2012-06-18 03:07:17 Details Diff |
Merge remote-tracking branch 'origin/Yii' into Yii | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/cs/LC_MESSAGES/cs.mo | Diff File | ||
mod - locale/cs/LC_MESSAGES/cs.po | Diff File | ||
Yii cb8844e3 2012-06-18 03:07:01 Details Diff |
Fixed issue 06197: Session expiration timeout is 0 |
Affected Issues 06197 |
|
mod - application/config/config-defaults.php | Diff File | ||
mod - application/controllers/admin/globalsettings.php | Diff File | ||
mod - application/controllers/admin/remotecontrol.php | Diff File | ||
mod - application/controllers/survey/index.php | Diff File | ||
mod - application/models/Sessions.php | Diff File | ||
mod - application/views/admin/globalSettings_view.php | Diff File | ||
Yii fcf7c07d 2012-06-18 01:38:55 root Details Diff |
Updated translation: Czech by slansky Updated translation: Chinese (Simplified) by yooyooh |
||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/cs/LC_MESSAGES/cs.mo | Diff File | ||
mod - locale/cs/LC_MESSAGES/cs.po | Diff File | ||
Yii e12bec3a 2012-06-18 01:37:58 Details Diff |
Dev Fixed original string | ||
mod - application/views/admin/super/adminmenu.php | Diff File | ||
Yii b4e4e292 2012-06-18 01:35:32 Details Diff |
Dev Fixed original string | ||
mod - application/views/admin/super/adminmenu.php | Diff File | ||
master 77ae0660 2012-06-18 01:33:05 Details Diff |
Merge remote-tracking branch 'origin/master' | ||
mod - admin/tokens.php | Diff File | ||
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
mod - common_functions.php | Diff File | ||
mod - index.php | Diff File | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/it/LC_MESSAGES/it.mo | Diff File | ||
mod - locale/it/LC_MESSAGES/it.po | Diff File | ||
mod - locale/sv/LC_MESSAGES/sv.mo | Diff File | ||
mod - locale/sv/LC_MESSAGES/sv.po | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.mo | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.po | Diff File | ||
master 3af73b4a 2012-06-18 00:41:46 Details Diff |
Fixed issue 06226 & 06229: Only end message with Cannot edit answer (token and edit answers after submitting activated) Dev: only load lastpage if submitdate == '' Dev: new functionnality : link to do survey with allowalloweditaftercompletion |
Affected Issues 06226 |
|
mod - admin/tokens.php | Diff File | ||
mod - index.php | Diff File | ||
master b88d460a 2012-06-17 20:54:45 Details Diff |
Fixed issue QID links in Show Survey Logic File should open new edit-question window, not just view question | ||
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
Yii 420595a2 2012-06-17 20:34:55 Details Diff |
Fixed issue 05766: exclude_all_others_auto does not work Dev was not working for Multiple Choice with Comments |
Affected Issues 05766 |
|
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
master d91b420d 2012-06-17 20:29:03 Details Diff |
Merge branch 'master' of github.com:LimeSurvey/LimeSurvey | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/sv/LC_MESSAGES/sv.mo | Diff File | ||
mod - locale/sv/LC_MESSAGES/sv.po | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.mo | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.po | Diff File | ||
master 9b67423b 2012-06-17 20:28:40 Details Diff |
Fixed issue 05766: exclude_all_others_auto does not work Dev was not working for Multiple Choice with Comments |
Affected Issues 05766 |
|
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
mod - common_functions.php | Diff File | ||
Yii 25266fd7 2012-06-17 19:28:19 Details Diff |
Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.mo | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.po | Diff File | ||
Yii 8a3e68fe 2012-06-17 19:28:09 Details Diff |
Fixed issue PHP errors thrown if use invalid array filter question Dev converted exclusive_option to use is_empty() instead of != "" Dev Confirmed that exclusive_option works for all single-entry multiple question types |
||
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
master 87f2a40a 2012-06-17 12:18:24 root Details Diff |
Updated translation: Swedish by c_schmitz Updated translation: Turkish by kayazeren |
||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/sv/LC_MESSAGES/sv.mo | Diff File | ||
mod - locale/sv/LC_MESSAGES/sv.po | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.mo | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.po | Diff File | ||
Yii 52c08023 2012-06-17 12:15:46 root Details Diff |
Updated translation: Turkish by kayazeren | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.mo | Diff File | ||
mod - locale/tr/LC_MESSAGES/tr.po | Diff File | ||
master ec41d474 2012-06-17 07:04:58 Details Diff |
Fixed issue PHP errors thrown if use invalid array filter question Dev converted exclusive_option to use is_empty() instead of != "" Dev Confirmed that exclusive_option works for all single-entry multiple question types |
||
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
mod - common_functions.php | Diff File | ||
1.92 275ba80a 2012-06-17 03:10:35 Details Diff |
Merge branch 'master' into 192_dev | ||
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
mod - index.php | Diff File |