Changesets: LimeSurvey
|
master 7d52d015 2012-12-05 13:44 Details Diff |
Merge remote-tracking branch 'upstream/master' into Yii | ||
| add - .gitattributes | Diff File | ||
| mod - application/controllers/AdminController.php | Diff File | ||
| mod - application/controllers/PrintanswersController.php | Diff File | ||
| mod - application/controllers/admin/checkintegrity.php | Diff File | ||
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/controllers/admin/labels.php | Diff File | ||
| mod - application/controllers/admin/question.php | Diff File | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/core/LSYii_Application.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/helpers/export_helper.php | Diff File | ||
| mod - application/helpers/update/update_helper.php | Diff File | ||
| mod - application/models/Survey_links.php | Diff File | ||
| mod - application/models/Surveys_languagesettings.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/conditions/includes/conditions_scenario.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/emailtemplates/emailtemplates_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_view.php | Diff File | ||
| mod - application/views/admin/export/vv_view.php | Diff File | ||
| mod - application/views/admin/expressions/test/navigation_test.php | Diff File | ||
| mod - application/views/admin/expressions/test/survey_logic_file.php | Diff File | ||
| mod - application/views/admin/labels/exportmulti_view.php | Diff File | ||
| mod - application/views/admin/labels/labelview_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/quotas/editquota_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/viewquotasfooter_view.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotasrowsub_view.php | Diff File | ||
| mod - application/views/admin/responses/browsetimeheader_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/activateSurvey_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/tabImport_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/tabResourceManagement_view.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/tokenbar.php | Diff File | ||
| mod - application/views/admin/update/step2.php | Diff File | ||
| mod - application/views/admin/update/step3.php | Diff File | ||
| mod - application/views/admin/update/update.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/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/viewUserGroup_view.php | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/it/LC_MESSAGES/it.mo | Diff File | ||
| mod - locale/pt/LC_MESSAGES/pt.mo | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
| mod - scripts/admin/answers.js | Diff File | ||
| mod - scripts/admin/labels.js | Diff File | ||
| mod - scripts/admin/subquestions.js | Diff File | ||
| rm - scripts/admin/updateset.js | Diff | ||
| mod - styles/blobblueish/adminstyle.css | Diff File | ||
| mod - styles/gartergrey/adminstyle.css | Diff File | ||
| mod - styles/gringegreen/adminstyle.css | Diff File | ||
| add - third_party/.gitattributes | Diff File | ||
|
master 7847e600 2012-12-05 12:02 Details Diff |
Dev Normalize line endings - fixed files to LF | ||
| mod - application/controllers/PrintanswersController.php | Diff File | ||
| mod - application/controllers/admin/labels.php | Diff File | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/models/Survey_links.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/conditions/includes/conditions_scenario.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/emailtemplates/emailtemplates_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_view.php | Diff File | ||
| mod - application/views/admin/export/vv_view.php | Diff File | ||
| mod - application/views/admin/participants/displayParticipants_view.php | Diff File | ||
| mod - application/views/admin/quotas/editquota_view.php | Diff File | ||
| mod - application/views/admin/responses/browsetimeheader_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/subQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/editGroup_view.php | Diff File | ||
| mod - application/views/admin/survey/activateSurvey_view.php | Diff File | ||
| mod - application/views/admin/survey/deactivateSurvey_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/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/user/deluser.php | Diff File | ||
| mod - application/views/admin/user/editusers.php | Diff File | ||
| mod - application/views/admin/usergroup/addUserGroup_view.php | Diff File | ||
| mod - application/views/admin/usergroup/editUserGroup_view.php | Diff File | ||
|
master 82fcc571 2012-12-05 11:59 Details Diff |
Dev Normalize line endings - fixed files to LF | ||
| mod - application/views/admin/labels/exportmulti_view.php | Diff File | ||
| mod - application/views/admin/labels/labelview_view.php | Diff File | ||
| mod - application/views/admin/participants/importCSV_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/viewquotasfooter_view.php | Diff File | ||
| mod - application/views/admin/quotas/viewquotasrowsub_view.php | Diff File | ||
| mod - application/views/admin/survey/organizeGroupsAndQuestions_view.php | Diff File | ||
| mod - application/views/admin/token/exportdialog.php | Diff File | ||
| mod - application/views/admin/token/tokenbar.php | Diff File | ||
| mod - application/views/admin/user/modifyuser.php | Diff File | ||
| mod - application/views/admin/user/setusertemplates.php | Diff File | ||
| mod - application/views/admin/usergroup/mailUserGroup_view.php | Diff File | ||
| mod - application/views/admin/usergroup/viewUserGroup_view.php | Diff File | ||
|
master cd86fe0c 2012-12-05 11:50 Details Diff |
Dev Renamed HTTPRequest class due to possible name collisions | ||
| mod - application/core/LSYii_Application.php | Diff File | ||
|
2.1 e5e227be 2012-12-05 11:50 Details Diff |
Dev Renamed HTTPRequest class due to possible name collisions | ||
| mod - application/core/LSYii_Application.php | Diff File | ||
|
master 836c341a 2012-12-05 11:07 Details Diff |
Dev Normalize line endings - fixed files to LF | ||
| mod - application/views/admin/survey/QuestionGroups/addGroup_view.php | Diff File | ||
|
master 664d3255 2012-12-05 10:55 Details Diff |
Dev Normalize line endings - more careful approach | ||
| mod - .gitattributes | Diff File | ||
|
master 96400a2b 2012-12-05 00:05 LimeSurvey Translations Bot Details Diff |
Updated translation: Italian by lfanfoni Updated translation: Portuguese (Portugal) by taborda |
||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/it/LC_MESSAGES/it.mo | Diff File | ||
| mod - locale/pt/LC_MESSAGES/pt.mo | Diff File | ||
|
2.1 697fe65b 2012-12-04 22:14 Details Diff |
Fixed issue 07009: Label set quick add function broken Dev Cleaned up invalid selectors and vars |
Affected Issues 07009 |
|
| mod - scripts/admin/labels.js | Diff File | ||
|
master 8c543bd4 2012-12-04 22:06 Details Diff |
Fixed issue 07009: Label set quick add function broken Dev Cleaned up invalid selectors and vars |
Affected Issues 07009 |
|
| mod - scripts/admin/labels.js | Diff File | ||
|
2.1 49dc4156 2012-12-04 16:15 Details Diff |
Dev Added support for uploading template-specific attachments. Sending them has not yet been implemented. | ||
| mod - application/controllers/admin/emailtemplates.php | Diff File | ||
| mod - application/views/admin/emailtemplates/email_language_tab.php | Diff File | ||
| mod - application/views/admin/emailtemplates/email_language_template_tab.php | Diff File | ||
| mod - application/views/admin/emailtemplates/emailtemplates_view.php | Diff File | ||
| mod - scripts/admin/emailtemplates.js | Diff File | ||
|
2.1 182932eb 2012-12-04 16:13 Details Diff |
Merge branch '2.1' of github.com:LimeSurvey/LimeSurvey into 2.1 | ||
| mod - application/config/config-sample-mysql.php | Diff File | ||
| mod - application/config/config-sample-pgsql.php | Diff File | ||
| mod - application/config/config-sample-sqlsrv.php | Diff File | ||
| mod - application/controllers/InstallerController.php | Diff File | ||
| mod - application/controllers/admin/globalsettings.php | Diff File | ||
| mod - application/controllers/admin/labels.php | Diff File | ||
| mod - application/controllers/admin/question.php | Diff File | ||
| mod - application/controllers/admin/useraction.php | Diff File | ||
| add - application/core/HttpRequest.php | Diff File | ||
| mod - application/core/LSYii_Application.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
| mod - scripts/admin/answers.js | Diff File | ||
| mod - scripts/admin/labels.js | Diff File | ||
| mod - scripts/admin/subquestions.js | Diff File | ||
| rm - scripts/admin/updateset.js | Diff | ||
|
2.1 c6153bf7 2012-12-04 16:13 Details Diff |
Dev Added support for multiple attachments in SendEmailMessage function. | ||
| mod - application/helpers/common_helper.php | Diff File | ||
|
master 79e1cbeb 2012-12-04 14:54 Details Diff |
Fix issue : Export_responses did not produce all responses Dev: Now If responseMaxRecord is null then all the responses will be returned |
||
| mod - application/controllers/admin/remotecontrol.php | Diff File | ||
|
2.1 cda0812e 2012-12-04 14:54 Details Diff |
Fix issue : Export_responses did not produce all responses Dev: Now If responseMaxRecord is null then all the responses will be returned |
||
| mod - application/controllers/admin/remotecontrol.php | Diff File | ||
|
master 02e47bb2 2012-12-04 13:50 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey | ||
| mod - docs/release_notes.txt | Diff File | ||
|
master e125d9de 2012-12-04 13:48 Details Diff |
dev: exclude third party | ||
| add - third_party/.gitattributes | Diff File | ||
|
master fd7cfe54 2012-12-04 13:43 Details Diff |
dev: test normalize line endings | ||
| add - .gitattributes | Diff File | ||
|
master b3f1fa99 2012-12-04 13:04 Details Diff |
Release 2.00+ Build 121204 | ||
| mod - docs/release_notes.txt | Diff File | ||
|
master 54a29845 2012-12-04 12:58 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git | ||
| mod - application/controllers/AdminController.php | Diff File | ||
| mod - application/helpers/update/update_helper.php | Diff File | ||
| mod - application/views/admin/update/step2.php | Diff File | ||
| mod - application/views/admin/update/step3.php | Diff File | ||
| mod - application/views/admin/update/update.php | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
| mod - scripts/admin/answers.js | Diff File | ||
| mod - scripts/admin/labels.js | Diff File | ||
| mod - scripts/admin/subquestions.js | Diff File | ||
|
master 0e8aef79 2012-12-04 12:56 Details Diff |
dev: removed extra php close tag | ||
| mod - application/views/admin/expressions/test/navigation_test.php | Diff File | ||
| mod - application/views/admin/expressions/test/survey_logic_file.php | Diff File | ||
|
master aed0c9e2 2012-12-04 11:55 Details Diff |
Merge remote-tracking branch 'origin/master' | ||
| mod - scripts/admin/labels.js | Diff File | ||
|
master dcb36b6b 2012-12-04 11:52 Details Diff |
Dev: redo http://git.io/HmZeTg after http://git.io/vaBN3A | ||
| mod - scripts/admin/labels.js | Diff File | ||
|
master 1ca44aa5 2012-12-04 11:52 Details Diff |
Dev Fixed update controller routes to new compatible format | ||
| mod - application/helpers/update/update_helper.php | Diff File | ||
| mod - application/views/admin/update/step2.php | Diff File | ||
| mod - application/views/admin/update/step3.php | Diff File | ||
| mod - application/views/admin/update/update.php | Diff File | ||
|
2.1 8148802b 2012-12-04 11:49 Details Diff |
Merge remote-tracking branch 'origin/2.1' into 2.1 | ||
| mod - application/controllers/admin/update.php | Diff File | ||
