Changesets: LimeSurvey
Yii 9c6f9aa2 2012-07-10 19:57:02 Details Diff |
Fixed issue: search with multiple criteria not working in various scenarios Fixed issue: third search choice in search popup did not include attribute search options |
||
mod - application/models/Participants.php | Diff File | ||
mod - application/views/admin/token/tokenbar.php | Diff File | ||
mod - scripts/admin/displayParticipant.js | Diff File | ||
Yii 31c5458e 2012-07-10 12:52:37 Details Diff |
Merge remote-tracking branch 'origin/Yii' into Yii | ||
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - scripts/ranking.js | Diff File | ||
mod - styles-public/ranking.css | Diff File | ||
mod - styles/blobblueish/attributeMap.css | Diff File | ||
mod - styles/blobblueish/attributeMapCSV.css | Diff File | ||
mod - styles/blobblueish/attributeMapToken.css | Diff File | ||
mod - styles/gringegreen/attributeMap.css | Diff File | ||
mod - styles/gringegreen/attributeMapToken.css | Diff File | ||
mod - templates/basic/ie_fix_8.css | Diff File | ||
mod - templates/basic/template.css | Diff File | ||
mod - templates/bluengrey/ie_fix_8.css | Diff File | ||
mod - templates/bluengrey/template.css | Diff File | ||
mod - templates/citronade/template.css | Diff File | ||
mod - templates/clear_logo/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 986c7b39 2012-07-10 08:08:49 Details Diff |
New feature : Header of ranking droptable in advanced settings Dev : tested whole template in IE8 and FF12 for ranking question type Dev :new attribute for samechoiceheight, samelistheight Dev : without showpopups attribute : return true, but add class error to sortable item |
||
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - scripts/ranking.js | Diff File | ||
mod - styles-public/ranking.css | Diff File | ||
mod - templates/basic/ie_fix_8.css | Diff File | ||
mod - templates/basic/template.css | Diff File | ||
mod - templates/bluengrey/ie_fix_8.css | Diff File | ||
mod - templates/bluengrey/template.css | Diff File | ||
mod - templates/citronade/template.css | Diff File | ||
mod - templates/clear_logo/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 4ca0acb0 2012-07-10 06:55:39 Details Diff |
New feature: RemoteControl 'Activate tokens' function | ||
mod - application/controllers/admin/remotecontrol.php | Diff File | ||
mod - application/helpers/admin/token_helper.php | Diff File | ||
mod - application/helpers/database_helper.php | Diff File | ||
mod - application/helpers/update/updatedb_helper.php | Diff File | ||
Yii 09266c12 2012-07-10 06:17:53 Details Diff |
New feature: RemoteControl 'Activate survey' function | ||
mod - application/controllers/admin/remotecontrol.php | Diff File | ||
mod - application/controllers/admin/surveyadmin.php | Diff File | ||
mod - application/helpers/admin/activate_helper.php | Diff File | ||
Yii bc6b6979 2012-07-10 05:41:53 Details Diff |
Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii | ||
add - templates/citronade/images/ui-bg_flat_0_aaaaaa_40x100.png | Diff File | ||
add - templates/citronade/images/ui-icons_161c28_256x240.png | Diff File | ||
add - templates/citronade/images/ui-icons_222222_256x240.png | Diff File | ||
add - templates/citronade/images/ui-icons_415479_256x240.png | Diff File | ||
add - templates/citronade/images/ui-icons_5670a1_256x240.png | Diff File | ||
add - templates/citronade/images/ui-icons_cd0a0a_256x240.png | Diff File | ||
add - templates/citronade/images/ui-icons_fefefe_256x240.png | Diff File | ||
mod - templates/citronade/jquery-ui.css | Diff File | ||
mod - templates/citronade/template.js | Diff File | ||
Yii ffd6a8b8 2012-07-10 05:38:02 Details Diff |
Fixed issue: cleaned up and synchronised styles for attribute mapping (including blobbluish) | ||
mod - styles/blobblueish/attributeMap.css | Diff File | ||
mod - styles/blobblueish/attributeMapCSV.css | Diff File | ||
mod - styles/blobblueish/attributeMapToken.css | Diff File | ||
mod - styles/gringegreen/attributeMap.css | Diff File | ||
mod - styles/gringegreen/attributeMapToken.css | Diff File | ||
Yii 89eb91b6 2012-07-10 05:22:23 Details Diff |
New feature: RemoteControl RPC API can now be switched to Off,JSON-RPC or XML-RPC New feature: RemoteControl Import survey function |
||
mod - application/config/config-defaults.php | Diff File | ||
mod - application/controllers/admin/globalsettings.php | Diff File | ||
mod - application/controllers/admin/remotecontrol.php | Diff File | ||
add - application/libraries/jsonRPCClient.php | Diff File | ||
add - application/libraries/jsonRPCServer.php | Diff File | ||
mod - application/views/admin/globalSettings_view.php | Diff File | ||
Yii 2bca7f5f 2012-07-10 02:14:10 Details Diff |
Dev : jquery ui for citronade | ||
add - templates/citronade/images/ui-bg_flat_0_aaaaaa_40x100.png | Diff File | ||
add - templates/citronade/images/ui-icons_161c28_256x240.png | Diff File | ||
add - templates/citronade/images/ui-icons_222222_256x240.png | Diff File | ||
add - templates/citronade/images/ui-icons_415479_256x240.png | Diff File | ||
add - templates/citronade/images/ui-icons_5670a1_256x240.png | Diff File | ||
add - templates/citronade/images/ui-icons_cd0a0a_256x240.png | Diff File | ||
add - templates/citronade/images/ui-icons_fefefe_256x240.png | Diff File | ||
mod - templates/citronade/jquery-ui.css | Diff File | ||
mod - templates/citronade/template.js | Diff File | ||
Yii 05e9f583 2012-07-09 22:09:55 Details Diff |
Fixed issue: copying of values and attributes from tokens to cpdb, and vice versa, now fully tested and working including the ability to select to overwrite attribute values to participants who already exist in either table (token or cpdb) Dev: some translation updates will be required, sorry |
||
mod - application/controllers/admin/participantsaction.php | Diff File | ||
mod - application/models/Participants.php | Diff File | ||
mod - application/views/admin/participants/attributeMapToken_view.php | Diff File | ||
mod - application/views/admin/participants/attributeMap_view.php | Diff File | ||
mod - scripts/admin/attributeMap.js | Diff File | ||
mod - scripts/admin/displayParticipant.js | Diff File | ||
mod - styles/gringegreen/attributeMap.css | Diff File | ||
mod - styles/gringegreen/attributeMapToken.css | Diff File | ||
Yii c82c9cb8 2012-07-09 17:09:25 Details Diff |
Fixed issue: missing semi-colons | ||
mod - application/controllers/admin/participantsaction.php | Diff File | ||
Yii 236f7789 2012-07-09 05:59:43 Details Diff |
Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii | ||
mod - application/controllers/admin/templates.php | Diff File | ||
mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
Yii 722dde49 2012-07-09 05:58:48 Details Diff |
Fixed issue: Copy token participants and mapping token attributes functionality and layouts corrected and now work in all tested scenarios | ||
mod - application/controllers/admin/participantsaction.php | Diff File | ||
mod - application/models/Participants.php | Diff File | ||
mod - application/views/admin/participants/attributeMapToken_view.php | Diff File | ||
mod - scripts/admin/attributeMapToken.js | Diff File | ||
mod - scripts/admin/displayParticipant.js | Diff File | ||
mod - styles/gringegreen/attributeMapToken.css | Diff File | ||
1.92 526c36f0 2012-07-08 12:26:04 Details Diff |
Fixed issue Excel Survey Structure export was not exporting assessment values | ||
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
Yii 53545e98 2012-07-08 12:03:25 Details Diff |
Dev: fixed more 06306 (fix for rename and return) |
Affected Issues 06306 |
|
mod - application/controllers/admin/templates.php | Diff File | ||
Yii 13c5512e 2012-07-08 05:25:20 Details Diff |
Fixed issue Excel Survey Structure export was not exporting assessment values | ||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
1.92 f92d985f 2012-07-08 04:58:42 Details Diff |
Merge branch 'master' into 192_dev | ||
mod - classes/expressions/ExpressionManager.php | Diff File | ||
master 9b8aec45 2012-07-07 21:34:20 Details Diff |
Dev fixed processing of 'self' and 'that' variables so that only applies to whole words | ||
mod - classes/expressions/ExpressionManager.php | Diff File | ||
Yii e6f9c886 2012-07-07 21:30:12 Details Diff |
Dev fixed processing of 'self' and 'that' variables so that only applies to whole words | ||
mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
1.92 2ea7f6db 2012-07-07 20:17:40 Details Diff |
Merge branch 'master' into 192_dev | ||
mod - admin/dataentry.php | Diff File | ||
mod - admin/statistics.php | Diff File | ||
mod - admin/tokens.php | Diff File | ||
mod - classes/expressions/LimeExpressionManager.php | Diff File | ||
mod - common.php | Diff File | ||
mod - common_functions.php | Diff File | ||
mod - docs/release_notes.txt | Diff File | ||
mod - index.php | Diff File | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/cs/LC_MESSAGES/cs.mo | Diff File | ||
mod - locale/it/LC_MESSAGES/it.mo | Diff File | ||
mod - qanda.php | Diff File | ||
mod - scripts/uploader.css | Diff File | ||
mod - statistics_user.php | Diff File | ||
Yii b84b0cda 2012-07-07 16:53:46 Details Diff |
Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii | ||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
mod - application/views/admin/expressions/test/survey_logic_file.php | Diff File | ||
Yii 209ff665 2012-07-07 16:52:52 Details Diff |
Fixed issue: colors for CPDB attribute mapping pages in gringegreen template had not been updated | ||
mod - styles/gringegreen/attributeMap.css | Diff File | ||
mod - styles/gringegreen/attributeMapCSV.css | Diff File | ||
mod - styles/gringegreen/attributeMapToken.css | Diff File | ||
mod - styles/gringegreen/displayParticipants.css | Diff File | ||
Yii ef074e2c 2012-07-07 13:14:24 Details Diff |
Fixed issue 06305: Assessment values are not shown in logic file; nor in question, and group previews |
Affected Issues 06305 |
|
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
Yii 109120de 2012-07-07 12:38:21 Details Diff |
Fixed issue 06219: Show Logic File does not show auto-generated array_filter equations |
Affected Issues 06219 |
|
mod - application/views/admin/expressions/test/survey_logic_file.php | Diff File | ||
Yii e7eced03 2012-07-07 05:26:34 Details Diff |
Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii | ||
mod - application/controllers/admin/templates.php | Diff File |