Changesets: LimeSurvey
2.1 697fe65b 2012-12-04 21:14:36 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 21:06:18 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 15:15:04 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 15:13:36 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 File | ||
2.1 c6153bf7 2012-12-04 15:13:00 Details Diff |
Dev Added support for multiple attachments in SendEmailMessage function. | ||
mod - application/helpers/common_helper.php | Diff File | ||
master 79e1cbeb 2012-12-04 13:54:42 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 13:54:42 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 12:50:38 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey | ||
mod - docs/release_notes.txt | Diff File | ||
master e125d9de 2012-12-04 12:48:09 Details Diff |
dev: exclude third party | ||
add - third_party/.gitattributes | Diff File | ||
master fd7cfe54 2012-12-04 12:43:56 Details Diff |
dev: test normalize line endings | ||
add - .gitattributes | Diff File | ||
master b3f1fa99 2012-12-04 12:04:48 Details Diff |
Release 2.00+ Build 121204 | ||
mod - docs/release_notes.txt | Diff File | ||
master 54a29845 2012-12-04 11:58:03 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 11:56: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 10:55:44 Details Diff |
Merge remote-tracking branch 'origin/master' | ||
mod - scripts/admin/labels.js | Diff File | ||
master dcb36b6b 2012-12-04 10:52:45 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 10:52:35 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 10:49:08 Details Diff |
Merge remote-tracking branch 'origin/2.1' into 2.1 | ||
mod - application/controllers/admin/update.php | Diff File | ||
2.1 d82dd040 2012-12-04 10:48:51 Details Diff |
Dev Implemented JS function to remove the surrounding DIV of CSRF protection token if needed | ||
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 | ||
2.1 31ab674c 2012-12-04 10:47:08 Details Diff |
Dev Consolidated labels js to one file Dev Another exception for CSRF |
||
mod - application/controllers/admin/labels.php | Diff File | ||
mod - application/core/LSYii_Application.php | Diff File | ||
mod - scripts/admin/labels.js | Diff File | ||
rm - scripts/admin/updateset.js | Diff File | ||
2.1 edadb693 2012-12-04 10:45:44 Details Diff |
Fixed issue: Missing CSRF protection Dev Can now be enabled in LSYii_Application.php. Its currently deactivated as it is mostly untested. Dev New HttpRequest class enables exceptions for certain POST requests (like AJAX) |
||
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 | ||
add - application/core/HttpRequest.php | Diff File | ||
mod - application/core/LSYii_Application.php | Diff File | ||
2.1 e87cf6aa 2012-12-04 10:44:48 Details Diff |
Fixed issue 06985: Custom default template is not used as default in user template permission |
Affected Issues 06985 |
|
mod - application/controllers/admin/globalsettings.php | Diff File | ||
mod - application/controllers/admin/useraction.php | Diff File | ||
master 4088c0ec 2012-12-04 10:41:37 Details Diff |
Dev Path fixes. | ||
mod - application/controllers/AdminController.php | Diff File | ||
2.1 4f2bb675 2012-12-04 10:36:40 Details Diff |
Dev removed debug code. | ||
mod - application/controllers/admin/update.php | Diff File | ||
master 70a793f9 2012-12-04 10:35:22 Details Diff |
Dev Implemented JS function to remove the surrounding DIV of CSRF protection token if needed | ||
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 | ||
2.1 309b2e57 2012-12-04 10:33:58 Details Diff |
Dev removed MySQL specific keyword After from dbupgrade 165 | ||
mod - application/helpers/update/updatedb_helper.php | Diff File |