Changesets: LimeSurvey
|
master 490460a4 2012-11-08 21:20 Details Diff |
Fixed issue 06840: When copying a shipped template the "images" folder is missing Dev Remove phpzip library for good |
Affected Issues 06840 |
|
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/helpers/admin/template_helper.php | Diff File | ||
| rm - application/libraries/admin/Phpzip.php | Diff | ||
| mod - application/views/admin/templates/importuploaded_view.php | Diff File | ||
|
master 0357b7bc 2012-11-08 20:00 Details Diff |
Fixed issue 06834: "Subtotals based on displayed questions" doesn't work with Multiple Choices questions Fixed issue: Bad label for Not displayed Dev: Add a multiNotDisplayed var, test if all subQ is NULL Dev: Varname is not clear (gdata/grawdata/results), tested and tested again |
Affected Issues 06834 |
|
| mod - application/helpers/admin/statistics_helper.php | Diff File | ||
|
2.1 1674dbdb 2012-11-08 19:51 Details Diff |
Revert "Fixed issue 06834: "Subtotals based on displayed questions" doesn't work with Multiple Choices questions" This reverts commit 05182f70c62501b510f21637f43c6a0b8dc957b5. |
Affected Issues 06834 |
|
| mod - application/helpers/admin/statistics_helper.php | Diff File | ||
|
2.1 05182f70 2012-11-08 19:47 Details Diff |
Fixed issue 06834: "Subtotals based on displayed questions" doesn't work with Multiple Choices questions Fixed issue: Bad label for Not displayed Dev: Add a multiNotDisplayed var, test if all subQ is NULL Dev: I hope it's OK, varname is not clear (gdata/grawdata/results), tested and tested again |
Affected Issues 06834 |
|
| mod - application/helpers/admin/statistics_helper.php | Diff File | ||
|
2.1 d57b1731 2012-11-08 19:29 Details Diff |
Merge branch '2.1' of github.com:LimeSurvey/LimeSurvey into 2.1 | ||
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/admin/globalsettings.php | Diff File | ||
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
| mod - application/core/LSYii_Application.php | Diff File | ||
| mod - application/helpers/admin/activate_helper.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| mod - application/models/ParticipantAttributeNames.php | Diff File | ||
| mod - application/models/Participants.php | Diff File | ||
| mod - application/views/admin/responses/browseallrow_view.php | Diff File | ||
| mod - application/views/admin/responses/browseidheader_view.php | Diff File | ||
| mod - application/views/admin/responses/browsetimeheader_view.php | Diff File | ||
| mod - application/views/admin/usergroup/usergroupbar_view.php | Diff File | ||
| mod - installer/sql/create-mssql.sql | Diff File | ||
| mod - installer/sql/create-mysql.sql | Diff File | ||
| mod - installer/sql/create-pgsql.sql | Diff File | ||
|
master 9f0cbcd9 2012-11-08 17:02 Details Diff |
Fixed some bugs and cvs-export via remote-control | ||
| mod - application/helpers/admin/exportresults_helper.php | Diff File | ||
|
master 7bb8660c 2012-11-08 14:43 Details Diff |
Fixed issue 06838: RemoteControl export_responses returns an error |
Affected Issues 06838 |
|
| mod - application/controllers/admin/remotecontrol.php | Diff File | ||
|
master 13add807 2012-11-08 13:39 Details Diff |
Fixed issue 06773: Missing translations in CPDB |
Affected Issues 06773 |
|
| mod - application/views/admin/participants/attributeControl_view.php | Diff File | ||
| mod - application/views/admin/participants/blacklist_view.php | Diff File | ||
| mod - application/views/admin/participants/displayParticipants_view.php | Diff File | ||
| mod - application/views/admin/participants/userControl_view.php | Diff File | ||
| mod - application/views/admin/participants/viewAttribute_view.php | Diff File | ||
| mod - scripts/admin/attributeControl.js | Diff File | ||
| mod - scripts/admin/displayParticipant.js | Diff File | ||
| rm - styles/gringegreen/jquery-ui/images/ui-icons_0078ae_256x240.png | Diff | ||
| rm - styles/gringegreen/jquery-ui/images/ui-icons_056b93_256x240.png | Diff | ||
| rm - styles/gringegreen/jquery-ui/images/ui-icons_2e83ff_256x240.png | Diff | ||
| rm - styles/gringegreen/jquery-ui/images/ui-icons_6da8d5_256x240.png | Diff | ||
| rm - styles/gringegreen/jquery-ui/images/ui-icons_85a2c7_256x240.png | Diff | ||
| mod - styles/gringegreen/jquery-ui/jquery-ui.css | Diff File | ||
|
2.1 4407caab 2012-11-08 13:39 Details Diff |
Fixed issue 06773: Missing translations in CPDB |
Affected Issues 06773 |
|
| mod - application/views/admin/participants/attributeControl_view.php | Diff File | ||
| mod - application/views/admin/participants/blacklist_view.php | Diff File | ||
| mod - application/views/admin/participants/displayParticipants_view.php | Diff File | ||
| mod - application/views/admin/participants/userControl_view.php | Diff File | ||
| mod - application/views/admin/participants/viewAttribute_view.php | Diff File | ||
| mod - scripts/admin/attributeControl.js | Diff File | ||
| mod - scripts/admin/displayParticipant.js | Diff File | ||
| rm - styles/gringegreen/jquery-ui/images/ui-icons_0078ae_256x240.png | Diff | ||
| rm - styles/gringegreen/jquery-ui/images/ui-icons_056b93_256x240.png | Diff | ||
| rm - styles/gringegreen/jquery-ui/images/ui-icons_2e83ff_256x240.png | Diff | ||
| rm - styles/gringegreen/jquery-ui/images/ui-icons_6da8d5_256x240.png | Diff | ||
| rm - styles/gringegreen/jquery-ui/images/ui-icons_85a2c7_256x240.png | Diff | ||
| mod - styles/gringegreen/jquery-ui/jquery-ui.css | Diff File | ||
|
master 530d38d0 2012-11-08 13:19 Details Diff |
Fixed issue 06828: Web server authentication not working |
Affected Issues 06828 |
|
| mod - application/config/config-defaults.php | Diff File | ||
|
2.1 a0cee6b8 2012-11-08 13:19 Details Diff |
Fixed issue 06828: Web server authentication not working |
Affected Issues 06828 |
|
| mod - application/config/config-defaults.php | Diff File | ||
|
master d6eabcc7 2012-11-08 12:38 Details Diff |
Merge remote-tracking branch 'origin/master' | ||
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/nb/LC_MESSAGES/nb.mo | Diff File | ||
|
master 22242733 2012-11-08 12:23 Details Diff |
Fixed issue 06828: Web server authentication not working Fixed issue: strip_query_from_referrer_url config parameter not working |
Affected Issues 06828 |
|
| mod - application/config/config-defaults.php | Diff File | ||
| mod - application/controllers/admin/useraction.php | Diff File | ||
| mod - application/core/UserIdentity.php | Diff File | ||
| mod - application/helpers/frontend_helper.php | Diff File | ||
|
master a40399c1 2012-11-08 09:53 Details Diff |
dev: subval_sort fixed for empty array in all places (is in common_helper in 2.1 already) | ||
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
|
2.1 1648b60c 2012-11-08 09:34 Details Diff |
dev: pushing changes to participant panel from master | ||
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/models/ParticipantAttributeNames.php | Diff File | ||
| mod - application/models/Participants.php | Diff File | ||
|
2.1 cce8fbfd 2012-11-08 09:06 Details Diff |
dev: cleanup files i committed by accident | ||
| rm - installer/sql/create-mssql.sql.BASE.sql | Diff | ||
| rm - installer/sql/create-mssql.sql.LOCAL.sql | Diff | ||
| rm - installer/sql/create-mssql.sql.REMOTE.sql | Diff | ||
|
master fc985c74 2012-11-08 00:05 LimeSurvey Translations Bot Details Diff |
Updated translation: Norwegian (Bokmål) by peterhol | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/nb/LC_MESSAGES/nb.mo | Diff File | ||
|
master 8d0c0cd1 2012-11-07 21:55 Details Diff |
Fixed issue: SQL statement shown when invalid SID is given | ||
| mod - application/helpers/database_helper.php | Diff File | ||
|
2.1 5db802a2 2012-11-07 21:55 Details Diff |
Fixed issue: SQL statement shown when invalid SID is given | ||
| mod - application/helpers/database_helper.php | Diff File | ||
|
2.1 368f5909 2012-11-07 21:03 Details Diff |
dev: added table fix from master, db version is now 165 for 2.1 instead of 164 could be a problem for dev databases sorry dev: also noticed create-mssql.sql merge conflic files, didn't check them |
||
| mod - application/config/version.php | Diff File | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
| mod - installer/sql/create-mssql.sql | Diff File | ||
| mod - installer/sql/create-mysql.sql | Diff File | ||
| mod - installer/sql/create-pgsql.sql | Diff File | ||
|
2.1 7485a2cc 2012-11-07 20:53 Details Diff |
dev: allow sql logging | ||
| mod - application/core/LSYii_Application.php | Diff File | ||
| add - installer/sql/create-mssql.sql.BASE.sql | Diff File | ||
| add - installer/sql/create-mssql.sql.LOCAL.sql | Diff File | ||
| add - installer/sql/create-mssql.sql.REMOTE.sql | Diff File | ||
|
master e16fe676 2012-11-07 17:42 Details Diff |
Fixed issue: Problem on database upgrade | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
|
2.1 3241ec11 2012-11-07 17:42 Details Diff |
Fixed issue: Problem on database upgrade | ||
| mod - application/helpers/update/updatedb_helper.php | Diff File | ||
|
master bd97c450 2012-11-07 17:25 Details Diff |
Fixed issue 06773: Missing translations in CPDB |
Affected Issues 06773 |
|
| mod - application/controllers/admin/question.php | Diff File | ||
| mod - application/views/admin/participants/displayParticipants_view.php | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
| mod - scripts/admin/displayParticipant.js | Diff File | ||
|
2.1 bebd1975 2012-11-07 17:25 Details Diff |
Fixed issue 06773: Missing translations in CPDB |
Affected Issues 06773 |
|
| mod - application/controllers/admin/question.php | Diff File | ||
| mod - application/views/admin/participants/displayParticipants_view.php | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
| mod - scripts/admin/displayParticipant.js | Diff File | ||
