Changesets: LimeSurvey
|
Yii 40745ad5 2012-01-12 00:29:10 Aaron Schmitz Details Diff |
Repair translate, merge 11973 into the Yii branch, and convert all database calls in translate to models. Note that HTML still needs moved to views. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11997 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - application/controllers/admin/translate.php | Diff File | ||
| mod - application/models/Answers.php | Diff File | ||
| mod - application/models/Groups.php | Diff File | ||
| mod - application/models/Questions.php | Diff File | ||
|
master e3ebff79 2012-01-11 21:01:08 Thomas White Details Diff |
Dev Added {AID}, {QID}, {GID}, {SQID}, which are in 2.0 but missing from 1.92 git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@11996 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - classes/eval/ExpressionManager.php | Diff File | ||
| mod - classes/eval/LimeExpressionManager.php | Diff File | ||
| mod - group.php | Diff File | ||
| mod - replacements.php | Diff File | ||
|
Yii 7a76b5c8 2012-01-11 12:45:30 Details Diff |
Updated translation: Punjabi by Angad Updated translation: Hindi by Angad git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11995 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - locale/hi/LC_MESSAGES/hi.mo | Diff File | ||
| mod - locale/hi/LC_MESSAGES/hi.po | Diff File | ||
| mod - locale/pa/LC_MESSAGES/pa.mo | Diff File | ||
| mod - locale/pa/LC_MESSAGES/pa.po | Diff File | ||
|
Yii c559703a 2012-01-11 12:19:52 Details Diff |
Fix things from last commit. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11994 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - application/controllers/SurveyController.php | Diff File | ||
| mod - application/controllers/surveyaction.php | Diff File | ||
| mod - application/libraries/Limesurvey_lang.php | Diff File | ||
|
Yii f8e86afa 2012-01-11 11:57:57 Details Diff |
Removed obsolete code git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11993 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - application/controllers/AdminController.php | Diff File | ||
| mod - application/controllers/InstallerController.php | Diff File | ||
| mod - application/controllers/OptinController.php | Diff File | ||
| mod - application/controllers/OptoutController.php | Diff File | ||
| mod - application/controllers/RegisterController.php | Diff File | ||
| mod - application/controllers/SurveyController.php | Diff File | ||
| mod - application/controllers/admin/dataentry.php | Diff File | ||
| mod - application/controllers/admin/emailtemplates.php | Diff File | ||
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/controllers/admin/printablesurvey.php | Diff File | ||
| mod - application/controllers/admin/question.php | Diff File | ||
| mod - application/controllers/admin/surveyaction.php | Diff File | ||
| mod - application/controllers/printanswers.php | Diff File | ||
| mod - application/controllers/surveyaction.php | Diff File | ||
| mod - application/core/LSYii_Controller.php | Diff File | ||
| mod - application/helpers/admin/exportresults_helper.php | Diff File | ||
| mod - application/helpers/admin/statistics_helper.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/helpers/export_helper.php | Diff File | ||
| mod - application/helpers/surveytranslator_helper.php | Diff File | ||
| mod - application/libraries/Limesurvey_lang.php | Diff File | ||
| mod - application/views/admin/token/email.php | Diff File | ||
|
Yii 8bd0e2e0 2012-01-11 11:13:24 Aaron Schmitz Details Diff |
Refactor database action by GCI participant Aaron Schmitz git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11992 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - application/controllers/admin/database.php | Diff File | ||
|
master 60b1016a 2012-01-11 10:42:36 Thomas White Details Diff |
Fixed Issue 05655: Javascript error after clicking "submit" button git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@11991 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - scripts/survey_runtime.js | Diff File | ||
|
master 64d7996a 2012-01-11 10:11:44 Thomas White Details Diff |
Dev fixed bug in Google Analytics Support - was missing two default values. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@11990 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - admin/editsurveysettings.php | Diff File | ||
|
Yii fe10d8c1 2012-01-11 09:57:34 Details Diff |
Fixed issue 05636: INSERTANS:SGQA codes not being converted upon import - Yii Branch. Also fix error not being saved error in FinishProcessingPage() git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11989 b72ed6b6-b9f8-46b5-92b4-906544132732 |
Affected Issues 05636 |
|
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
Yii 7212c2fc 2012-01-11 09:51:14 Details Diff |
Updated translation: Punjabi by Angad git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11988 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - locale/pa/LC_MESSAGES/pa.mo | Diff File | ||
| mod - locale/pa/LC_MESSAGES/pa.po | Diff File | ||
|
Yii 9a1ac9fd 2012-01-11 09:08:02 Details Diff |
Fix up database calls regarding SQLI - done by GCI participant Noostra git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11987 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - application/models/Answers.php | Diff File | ||
| mod - application/models/Conditions.php | Diff File | ||
| mod - application/models/Groups.php | Diff File | ||
| mod - application/models/Label.php | Diff File | ||
| mod - application/models/ParticipantAttributeNames.php | Diff File | ||
| mod - application/models/Participants.php | Diff File | ||
|
Yii d25e370e 2012-01-11 09:00:25 Aaron Schmitz Details Diff |
Fix small bug in the em_manager_helper.php. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11986 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
Yii 4f14b064 2012-01-11 07:20:21 Details Diff |
Remove show/reset syntax errors functionality. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11985 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| rm - application/views/admin/survey/resetSyntaxErrorLog_view.php | Diff File | ||
| rm - application/views/admin/survey/showSyntaxErrors_view.php | Diff File | ||
| mod - application/controllers/admin/surveyaction.php | Diff File | ||
| mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
|
Yii e3c0da92 2012-01-11 06:42:20 Aaron Schmitz Details Diff |
Amend previous commit. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11984 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
Yii 2674001d 2012-01-11 06:28:23 Aaron Schmitz Details Diff |
Fix unported code in the expression manager helper and port the Expression_errors model. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11983 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| add - application/models/Expression_errors.php | Diff File | ||
| rm - application/models/expression_errors_model.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master e411c6bb 2012-01-11 04:28:04 Carsten Schmitz Details Diff |
Updated translation: Portuguese (Brazil) git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@11982 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - locale/pt-BR/LC_MESSAGES/pt-BR.mo | Diff File | ||
| mod - locale/pt-BR/LC_MESSAGES/pt-BR.po | Diff File | ||
|
Yii dc62f733 2012-01-11 03:56:44 Details Diff |
Enable filling out additional token attributes when registering for a survey, GCI task #7233323 git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11981 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/RegisterController.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/helpers/replacements_helper.php | Diff File | ||
| mod - application/helpers/update/upgrade-all_helper.php | Diff File | ||
| mod - application/models/Survey.php | Diff File | ||
| mod - application/models/Surveys_languagesettings.php | Diff File | ||
| mod - application/views/admin/token/dummytokenform.php | Diff File | ||
| mod - application/views/admin/token/managetokenattributes.php | Diff File | ||
| mod - application/views/admin/token/tokenform.php | Diff File | ||
| mod - installer/sql/create-mssql.sql | Diff File | ||
| mod - installer/sql/create-mssqlnative.sql | Diff File | ||
| mod - installer/sql/create-mysql.sql | Diff File | ||
| mod - installer/sql/create-pgsql.sql | Diff File | ||
|
Yii 35a41d93 2012-01-10 12:52:25 Details Diff |
Improve survey/label resource management. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11980 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/controllers/admin/labels.php | Diff File | ||
| mod - application/controllers/admin/surveyaction.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/views/admin/labels/importlabelresources_view.php | Diff File | ||
| mod - application/views/admin/labels/labelview_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/tabResourceManagement_view.php | Diff File | ||
|
master 0b26b620 2012-01-10 12:28:22 Thomas White Details Diff |
New Feature Google Analytics Support Dev Global and Survey-specific Google Analytics API Keys Dev Allows multiple styles of Google Analytics, starting with {none, default, survey-group tracking} Dev New Keywords {GOOGLE_ANALYTICS_API_KEY} and {GOOGLE_ANALYTICS_JAVASCRIPT} git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@11979 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - admin/database.php | Diff File | ||
| mod - admin/editsurveysettings.php | Diff File | ||
| mod - admin/globalsettings.php | Diff File | ||
| mod - admin/install/create-mssql.sql | Diff File | ||
| mod - admin/install/create-mssqlnative.sql | Diff File | ||
| mod - admin/install/create-mysql.sql | Diff File | ||
| mod - admin/install/create-postgres.sql | Diff File | ||
| mod - admin/update/upgrade-mssql.php | Diff File | ||
| mod - admin/update/upgrade-mssqlnative.php | Diff File | ||
| mod - admin/update/upgrade-mysql.php | Diff File | ||
| mod - admin/update/upgrade-postgres.php | Diff File | ||
| mod - config-defaults.php | Diff File | ||
| mod - replacements.php | Diff File | ||
| mod - version.php | Diff File | ||
|
Yii 188f9c2c 2012-01-10 12:11:28 Details Diff |
Updated translation: Persian by oren git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@11978 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - locale/fa/LC_MESSAGES/fa.mo | Diff File | ||
| mod - locale/fa/LC_MESSAGES/fa.po | Diff File | ||
|
master 7119b693 2012-01-10 09:57:32 Carsten Schmitz Details Diff |
Fixed issue 05649: Error message on numerical input type question not working for more than one question of this type git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@11977 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - index.php | Diff File | ||
|
master fc70dd5e 2012-01-10 09:33:10 Thomas White Details Diff |
Fixed Issue 05637: Display conditions and validation rules in printable survey and data entry views Dev Now working for Data Entry Dev Note, Data Entry does not currently validate the inputs. We can fix that as a new feature using EM. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@11976 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - admin/dataentry.php | Diff File | ||
|
master 387c894f 2012-01-10 08:52:26 Thomas White Details Diff |
Fixed Issue 05637: Display conditions and validation rules in printable survey and data entry views Dev Now working for HTML version of Printable Survey git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@11975 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - admin/printablesurvey.php | Diff File | ||
|
master 881bf2cf 2012-01-10 08:34:56 Carsten Schmitz Details Diff |
New feature: Code/QID visible in quick-translation answers/subquestions/questions for easier orientation git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@11974 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - admin/styles/default/adminstyle.css | Diff File | ||
| mod - admin/translate.php | Diff File | ||
| mod - admin/translate_functions.php | Diff File | ||
|
master 4507cc8d 2012-01-10 08:33:34 Carsten Schmitz Details Diff |
New feature: Code/QID visible in quick-translation answers/subquestions/questions for easier orientation git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@11973 b72ed6b6-b9f8-46b5-92b4-906544132732 |
||
| mod - admin/styles/default/adminstyle.css | Diff File | ||
| mod - admin/translate.php | Diff File | ||
| mod - admin/translate_functions.php | Diff File | ||
