Changesets: LimeSurvey

master 6284ca6c

2012-11-30 14:07:54

mdekker

Details Diff
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git
Attach Issues:
mod - application/helpers/admin/statistics_helper.php Diff File

master b1ffaa96

2012-11-30 14:06:42

mdekker

Details Diff
dev: fixing blurry buttons due to fontsize in template editor
Attach Issues:
mod - styles/adminstyle.css Diff File

master 0bca7c29

2012-11-30 14:05:06

c_schmitz

Details Diff
Fixed issue 06931: Array questions do not display graphs by default even if set to Yes - patch by pfpDave Affected Issues
06931
mod - application/helpers/admin/statistics_helper.php Diff File

2.1 6f2f0f5c

2012-11-30 13:40:26

mdekker

Details Diff
dev: removed some more almost duplicate code
Attach Issues:
mod - application/controllers/admin/participantsaction.php Diff File

master 04c54a37

2012-11-30 13:40:20

mdekker

Details Diff
dev: removed some more almost duplicate code
Attach Issues:
mod - application/controllers/admin/participantsaction.php Diff File

2.1 147692a1

2012-11-30 13:21:27

mdekker

Details Diff
dev: simplified exportcsv
Attach Issues:
mod - application/controllers/admin/participantsaction.php Diff File

master c2f2c7ee

2012-11-30 13:20:17

mdekker

Details Diff
dev: simplified exportcsv
Attach Issues:
mod - application/controllers/admin/participantsaction.php Diff File

2.1 7b8aead3

2012-11-30 12:51:03

mdekker

Details Diff
dev: ported changes from master
Attach Issues:
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/models/Participants.php Diff File

master 78cab8f6

2012-11-30 12:43:17

mdekker

Details Diff
dev: participant panel export to csv now operates on the current search/filter
Attach Issues:
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/models/Participants.php Diff File

2.1 c3a72c77

2012-11-30 12:26:15

c_schmitz

Details Diff
Fixed issue 06936: Restricted users can enter central participant database panel when they shouldn't have access Affected Issues
06936
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - scripts/admin/tokens.js Diff File

2.1 69b11154

2012-11-30 12:25:00

c_schmitz

Details Diff
Dev Changing controller URLs to allow for IIS compatibility
Attach Issues:
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/participants/attributeMapCSV_view.php Diff File
mod - application/views/admin/participants/attributeMap_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/importCSV_view.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/admin/participants/sharePanel_view.php Diff File
mod - application/views/admin/participants/uploadSummary_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 - application/views/admin/responses/browsemenubar_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/tokenbar.php Diff File
mod - application/views/statistics_user_view.php Diff File

2.1 7ad1c760

2012-11-30 12:22:39

c_schmitz

Details Diff
Dev Changing controller URLs to allow for IIS compatibility
Attach Issues:
mod - application/config/routes.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/index.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/question.php Diff File
mod - application/controllers/admin/questiongroup.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/views/admin/assessments_view.php Diff File
mod - application/views/admin/authentication/error.php Diff File
mod - application/views/admin/authentication/forgotpassword.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/authentication/message.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/conditions/conditionslist_view.php Diff File
mod - application/views/admin/conditions/includes/conditions_scenario.php Diff File
mod - application/views/admin/dataentry/delete.php Diff File
mod - application/views/admin/dataentry/insert.php Diff File
mod - application/views/admin/dataentry/vvimport.php Diff File
mod - application/views/admin/dataentry/vvimport_upload.php Diff File
mod - application/views/admin/emailtemplates/emailtemplates_view.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/r_view.php Diff File
mod - application/views/admin/export/spss_view.php Diff File
mod - application/views/admin/export/statistics_browse_view.php Diff File
mod - application/views/admin/export/vv_view.php Diff File
mod - application/views/admin/expressions/test/survey_logic_file.php Diff File
mod - application/views/admin/expressions/test_view.php Diff File
mod - application/views/admin/labels/editlabel_view.php Diff File
mod - application/views/admin/labels/exportmulti_view.php Diff File
mod - application/views/admin/labels/labelbar_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/labels/labelview_view.php Diff File
mod - application/views/admin/participants/attributeMap_view.php Diff File
mod - application/views/admin/quotas/editquota_view.php Diff File
mod - application/views/admin/quotas/editquotafooter_view.php Diff File
mod - application/views/admin/quotas/newanswer_view.php Diff File
mod - application/views/admin/quotas/newanswererror_view.php Diff File
mod - application/views/admin/quotas/newanswertwo_view.php Diff File
mod - application/views/admin/quotas/newquota_view.php Diff File
mod - application/views/admin/quotas/viewquotas_view.php Diff File
mod - application/views/admin/quotas/viewquotasfooter_view.php Diff File
mod - application/views/admin/quotas/viewquotasrow_view.php Diff File
mod - application/views/admin/quotas/viewquotasrowsub_view.php Diff File
mod - application/views/admin/responses/browseallheader_view.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/browsemenubar_view.php Diff File
mod - application/views/admin/responses/browsetimeheader_view.php Diff File
mod - application/views/admin/responses/browsetimerow_view.php Diff File
mod - application/views/admin/saved/savedbar_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/import_view.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/addGroup_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/editGroup_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/import_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php Diff File
mod - application/views/admin/survey/activateSurvey_view.php Diff File
mod - application/views/admin/survey/copySurvey_view.php Diff File
mod - application/views/admin/survey/deactivateSurvey_view.php Diff File
mod - application/views/admin/survey/deleteSurvey_view.php Diff File
mod - application/views/admin/survey/importSurveyResources_view.php Diff File
mod - application/views/admin/survey/importSurvey_view.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/survey/organizeGroupsAndQuestions_view.php Diff File
mod - application/views/admin/survey/subview/tabCopy_view.php Diff File
mod - application/views/admin/survey/subview/tabImport_view.php Diff File
mod - application/views/admin/survey/subview/tabResourceManagement_view.php Diff File
mod - application/views/admin/survey/subview/tab_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/templates/templateeditorbar_view.php Diff File
mod - application/views/admin/templates/templatesummary_view.php Diff File
mod - application/views/admin/token/actions.php Diff File
mod - application/views/admin/token/addtokenpost.php Diff File
mod - application/views/admin/token/bounce.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/csvupload.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/email.php Diff File
mod - application/views/admin/token/emailwarning.php Diff File
mod - application/views/admin/token/exportdialog.php Diff File
mod - application/views/admin/token/ldapform.php Diff File
mod - application/views/admin/token/managetokenattributes.php Diff File
mod - application/views/admin/token/remind.php Diff File
mod - application/views/admin/token/tokenbar.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/admin/user/deluser.php Diff File
mod - application/views/admin/user/editusers.php Diff File
mod - application/views/admin/user/modifyuser.php Diff File
mod - application/views/admin/user/setuserrights.php Diff File
mod - application/views/admin/user/setusertemplates.php Diff File
mod - application/views/admin/usergroup/addUserGroup_view.php Diff File
mod - application/views/admin/usergroup/editUserGroup_view.php Diff File
mod - application/views/admin/usergroup/mailUserGroup_view.php Diff File
mod - application/views/admin/usergroup/usergroupbar_view.php Diff File
mod - application/views/admin/usergroup/viewUserGroup_view.php Diff File

master 51436c44

2012-11-30 12:15:16

mdekker

Details Diff
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
Attach Issues:
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/question.php Diff File
mod - application/controllers/admin/quotas.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/libraries/admin/quexmlpdf.php Diff File
mod - application/views/admin/assessments_view.php Diff File
mod - application/views/admin/authentication/error.php Diff File
mod - application/views/admin/authentication/forgotpassword.php Diff File
mod - application/views/admin/authentication/login.php Diff File
mod - application/views/admin/authentication/message.php Diff File
mod - application/views/admin/conditions/conditionshead_view.php Diff File
mod - application/views/admin/conditions/conditionslist_view.php Diff File
mod - application/views/admin/conditions/includes/conditions_scenario.php Diff File
mod - application/views/admin/dataentry/delete.php Diff File
mod - application/views/admin/dataentry/insert.php Diff File
mod - application/views/admin/dataentry/vvimport_upload.php Diff File
mod - application/views/admin/emailtemplates/emailtemplates_view.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/export/r_view.php Diff File
mod - application/views/admin/export/spss_view.php Diff File
mod - application/views/admin/export/statistics_browse_view.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/export/vv_view.php Diff File
mod - application/views/admin/expressions/test/survey_logic_file.php Diff File
mod - application/views/admin/expressions/test_view.php Diff File
mod - application/views/admin/labels/exportmulti_view.php Diff File
mod - application/views/admin/labels/labelbar_view.php Diff File
mod - application/views/admin/labels/labelsetsbar_view.php Diff File
mod - application/views/admin/labels/labelview_view.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/participants/attributeMapCSV_view.php Diff File
mod - application/views/admin/participants/attributeMap_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/importCSV_view.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/admin/participants/sharePanel_view.php Diff File
mod - application/views/admin/participants/uploadSummary_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 - application/views/admin/quotas/editquota_view.php Diff File
mod - application/views/admin/quotas/editquotafooter_view.php Diff File
mod - application/views/admin/quotas/newanswer_view.php Diff File
mod - application/views/admin/quotas/newanswererror_view.php Diff File
mod - application/views/admin/quotas/newanswertwo_view.php Diff File
mod - application/views/admin/quotas/newquota_view.php Diff File
mod - application/views/admin/quotas/viewquotas_view.php Diff File
mod - application/views/admin/quotas/viewquotasfooter_view.php Diff File
mod - application/views/admin/quotas/viewquotasrow_view.php Diff File
mod - application/views/admin/quotas/viewquotasrowsub_view.php Diff File
mod - application/views/admin/responses/browseallheader_view.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/browsemenubar_view.php Diff File
mod - application/views/admin/responses/browsetimeheader_view.php Diff File
mod - application/views/admin/responses/browsetimerow_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/addGroup_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/editGroup_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php Diff File
mod - application/views/admin/survey/deactivateSurvey_view.php Diff File
mod - application/views/admin/survey/organizeGroupsAndQuestions_view.php Diff File
mod - application/views/admin/survey/subview/tabResourceManagement_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/templates/templateeditorbar_view.php Diff File
mod - application/views/admin/token/actions.php Diff File
mod - application/views/admin/token/addtokenpost.php Diff File
mod - application/views/admin/token/bounce.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/csvupload.php Diff File
mod - application/views/admin/token/dummytokenform.php Diff File
mod - application/views/admin/token/email.php Diff File
mod - application/views/admin/token/emailwarning.php Diff File
mod - application/views/admin/token/exportdialog.php Diff File
mod - application/views/admin/token/ldapform.php Diff File
mod - application/views/admin/token/managetokenattributes.php Diff File
mod - application/views/admin/token/remind.php Diff File
mod - application/views/admin/token/tokenbar.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/statistics_user_view.php Diff File
mod - scripts/admin/tokens.js Diff File

master 17901944

2012-11-30 12:12:13

mdekker

Details Diff
dev: participant panel search should now be fully functional and sortable
Attach Issues:
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/models/Participants.php Diff File

master 6d89157d

2012-11-30 11:57:29

c_schmitz

Details Diff
Merge remote-tracking branch 'origin/master'
Attach Issues:
mod - application/helpers/replacements_helper.php Diff File

master ea5b4cfc

2012-11-30 11:57:13

c_schmitz

Details Diff
Fixed issue 06936: Restricted users can enter central participant database panel when they shouldn't have access Affected Issues
06936
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - scripts/admin/tokens.js Diff File

master a83149b8

2012-11-30 09:56:55

c_schmitz

Details Diff
Dev Changing controller URLs to allow for IIS compatibility
Attach Issues:
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/participants/attributeControl_view.php Diff File
mod - application/views/admin/participants/attributeMapCSV_view.php Diff File
mod - application/views/admin/participants/attributeMap_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/importCSV_view.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/admin/participants/sharePanel_view.php Diff File
mod - application/views/admin/participants/uploadSummary_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 - application/views/admin/responses/browsemenubar_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/tokenbar.php Diff File
mod - application/views/statistics_user_view.php Diff File

master 1ffa7c45

2012-11-30 09:56:36

c_schmitz

Details Diff
Fixed issue: Sorting problem in MSSQL when browsing free text responses
Attach Issues:
mod - application/controllers/admin/statistics.php Diff File

2.1 b7b65f50

2012-11-30 09:56:36

c_schmitz

Details Diff
Fixed issue: Sorting problem in MSSQL when browsing free text responses
Attach Issues:
mod - application/controllers/admin/statistics.php Diff File

2.1 f7bc43b8

2012-11-30 09:51:08

DenisChenu

Details Diff
Dev: typo for 06966
Dev: Missing argument 1 for buildsurveysession() in some condition
Attach Issues:
mod - application/controllers/survey/index.php Diff File
mod - application/helpers/common_helper.php Diff File

2.1 294dd281

2012-11-30 09:23:31

DenisChenu

Details Diff
Dev: 06966 children, take the good fvalues
Attach Issues:
mod - application/modules/NumericalQuestion.php Diff File

2.1 f2b85f16

2012-11-30 09:13:46

DenisChenu

Details Diff
Merge branch '2.1' of github.com:LimeSurvey/LimeSurvey into 2.1
Attach Issues:
mod - application/models/Participants.php Diff File

master 92d8c272

2012-11-30 09:03:46

DenisChenu

Details Diff
Fixed issue #6991: Review anonymous survey
Dev: actually, only in templatereplace, verify $anonymized param in the function.
Affected Issues
06991
mod - application/helpers/replacements_helper.php Diff File

master 7db126f7

2012-11-30 08:51:18

c_schmitz

Details Diff
Merge remote-tracking branch 'origin/master'
Attach Issues:
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/LC_MESSAGES/ca.mo Diff File
mod - locale/de-informal/LC_MESSAGES/de-informal.mo Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/el/LC_MESSAGES/el.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/nl-informal/LC_MESSAGES/nl-informal.mo Diff File
mod - locale/nl/LC_MESSAGES/nl.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/pt/LC_MESSAGES/pt.mo Diff File
mod - locale/ro/LC_MESSAGES/ro.mo Diff File

master af53f25f

2012-11-29 23:33:48

LimeSurvey Translations Bot

Details Diff
Updated translation: German by c_schmitz
Updated translation: Greek by kiolalis
Updated translation: Romanian by izbieta
Updated translation: German (Informal) by c_schmitz
Attach Issues:
mod - locale/de-informal/LC_MESSAGES/de-informal.mo Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/el/LC_MESSAGES/el.mo Diff File
mod - locale/ro/LC_MESSAGES/ro.mo Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 900 ... 1024 1025 1026 1027 1028 1029 1030 ... 1050 ... 1200 ... 1350 ... 1453 1454 1455  Next  Last