Changesets: LimeSurvey

master 5c61eaf5

2012-06-09 04:20:27

c_schmitz

Details Diff
Fixed issue 06178: es-CL is listed as Spanish (Mexico) instead of Spanish (Chile) Affected Issues
06178
mod - classes/core/surveytranslator.php Diff File

2.1 657b1b05

2012-06-09 03:00:11

Aaron Schmitz

Details Diff
Ported a couple more files to question objects. The frontend is nearing completion.
Attach Issues:
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/question.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/models/Questions.php Diff File

2.1 11c262f9

2012-06-09 02:27:35

Aaron Schmitz

Details Diff
Everything in common_helper is ported. All the things that will need cleanup are now labeled with //AJS comments.
Attach Issues:
mod - application/controllers/admin/browse.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/modules/CheckQuestion.php Diff File
mod - application/modules/CommentCheckQuestion.php Diff File
mod - application/modules/DateQuestion.php Diff File
mod - application/modules/FiveRadioArrayQuestion.php Diff File
mod - application/modules/GenderQuestion.php Diff File
mod - application/modules/LanguageQuestion.php Diff File
mod - application/modules/ListQuestion.php Diff File
mod - application/modules/QuestionModule.php Diff File
mod - application/modules/RadioArrayQuestion.php Diff File
mod - application/modules/RankingQuestion.php Diff File
mod - application/modules/SelectQuestion.php Diff File
mod - application/modules/TenRadioArrayQuestion.php Diff File
mod - application/modules/YNQuestion.php Diff File

2.1 b8f54b99

2012-06-08 21:16:36

Aaron Schmitz

Details Diff
Port getExtendedAnswer to question objects.
Attach Issues:
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/modules/ArrayQuestion.php Diff File
mod - application/modules/CheckQuestion.php Diff File
mod - application/modules/DateQuestion.php Diff File
mod - application/modules/DualRadioArrayQuestion.php Diff File
mod - application/modules/FileQuestion.php Diff File
mod - application/modules/FiveRadioArrayQuestion.php Diff File
mod - application/modules/GenderQuestion.php Diff File
mod - application/modules/IDRadioArrayQuestion.php Diff File
mod - application/modules/LanguageQuestion.php Diff File
mod - application/modules/ListQuestion.php Diff File
mod - application/modules/QuestionModule.php Diff File
mod - application/modules/RadioArrayQuestion.php Diff File
mod - application/modules/RankingQuestion.php Diff File
mod - application/modules/TenRadioArrayQuestion.php Diff File
mod - application/modules/YNQuestion.php Diff File
mod - application/modules/YNRadioArrayQuestion.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File

2.1 fc914acd

2012-06-08 13:08:30

Aaron Schmitz

Details Diff
Port question creation to use the question objects.
Attach Issues:
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/question.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
add - images/screenshots/Check.png Diff File
add - images/screenshots/ColumnRadioArray.png Diff File
add - images/screenshots/CommentCheck.png Diff File
add - images/screenshots/CommentList.png Diff File
add - images/screenshots/Date.png Diff File
add - images/screenshots/Display.png Diff File
add - images/screenshots/DualRadioArray.png Diff File
add - images/screenshots/Equation.png Diff File
add - images/screenshots/File.png Diff File
add - images/screenshots/FiveList.png Diff File
add - images/screenshots/FiveRadioArray.png Diff File
add - images/screenshots/Gender.png Diff File
add - images/screenshots/HugeText.png Diff File
add - images/screenshots/IDRadioArray.png Diff File
add - images/screenshots/Language.png Diff File
add - images/screenshots/List.png Diff File
add - images/screenshots/LongText.png Diff File
add - images/screenshots/Multinumerical.png Diff File
add - images/screenshots/Multitext.png Diff File
add - images/screenshots/NumberArray.png Diff File
add - images/screenshots/Numerical.png Diff File
add - images/screenshots/RadioArray.png Diff File
add - images/screenshots/Ranking.png Diff File
add - images/screenshots/Select.png Diff File
add - images/screenshots/ShortText1.png Diff File
add - images/screenshots/ShortText2.png Diff File
add - images/screenshots/TenRadioArray.png Diff File
add - images/screenshots/TextArray.png Diff File
add - images/screenshots/YN.png Diff File
add - images/screenshots/YNRadioArray.png Diff File
mod - scripts/admin/admin_core.js Diff File

1.92 f68b7b25

2012-06-08 12:59:28

TMSWhite

Details Diff
Merge branch 'master' into 192_dev
Attach Issues:
mod - classes/expressions/LimeExpressionManager.php Diff File

2.1 7f2dc1d0

2012-06-08 11:47:30

Aaron Schmitz

Details Diff
Clean up some of the //AJS comments.
Attach Issues:
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/question.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File

2.1 821d2552

2012-06-08 11:42:07

Aaron Schmitz

Details Diff
Found it.
Attach Issues:
mod - application/modules/FileQuestion.php Diff File

2.1 056a5bf0

2012-06-08 08:47:50

Aaron Schmitz

Details Diff
Merge branch 'Yii' of github.com:LimeSurvey/LimeSurvey into Yii

Conflicts:
application/helpers/common_helper.php
application/helpers/qanda_helper.php
application/helpers/update/updatedb_helper.php
installer/sql/create-mssql.sql
installer/sql/create-mysql.sql
installer/sql/create-pgsql.sql

There's a bug in this merge somewhere. I'm gonna figure this out :p
Attach Issues:
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/participantsaction.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/helpers/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/modules/CheckQuestion.php Diff File
mod - application/modules/CommentCheckQuestion.php Diff File
mod - application/modules/DualRadioArrayQuestion.php Diff File
mod - application/modules/EquationQuestion.php Diff File
mod - application/modules/FileQuestion.php Diff File
mod - application/modules/FiveRadioArrayQuestion.php Diff File
mod - application/modules/IDRadioArrayQuestion.php Diff File
mod - application/modules/ListQuestion.php Diff File
mod - application/modules/MultinumericalQuestion.php Diff File
mod - application/modules/MultitextQuestion.php Diff File
mod - application/modules/NumberArrayQuestion.php Diff File
mod - application/modules/RadioArrayQuestion.php Diff File
mod - application/modules/SelectQuestion.php Diff File
mod - application/modules/TenRadioArrayQuestion.php Diff File
mod - application/modules/TextArrayQuestion.php Diff File
mod - application/modules/YNRadioArrayQuestion.php Diff File
mod - framework/db/schema/pgsql/CPgsqlSchema.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
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.po Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/it/LC_MESSAGES/it.po Diff File
mod - scripts/modaldialog.js Diff File

master 26924513

2012-06-08 05:56:26

c_schmitz

Details Diff
Merge remote-tracking branch 'origin/master'
Attach Issues:
mod - classes/expressions/ExpressionManager.php Diff File
mod - classes/expressions/LimeExpressionManager.php Diff File

master 63c18b6b

2012-06-08 05:56:07

c_schmitz

Details Diff
Dev Reverted version upgrade to 155.5 - no DB version changes in a stable version please - in addition the creation scripts were not updated (reverse-merged from commit 3da858ee43d0f314dc000c93a2e6fc5efe9af995)
Dev Also fixed the SQL creation scripts to reflect the version number
Attach Issues:
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 - version.php Diff File

Yii eedc5796

2012-06-07 20:56:38

TMSWhite

Details Diff
Fixed issue "Please check at least one item" not appropriate for single select list questions
Attach Issues:
mod - application/helpers/expressions/em_manager_helper.php Diff File

master 9ac79440

2012-06-07 20:51:58

TMSWhite

Details Diff
Fixed issue "Please check at least one item" not appropriate for single select list questions
Attach Issues:
mod - classes/expressions/LimeExpressionManager.php Diff File

1.92 be143c09

2012-06-07 15:41:04

TMSWhite

Details Diff
Merge branch 'master' into 192_dev
Attach Issues:
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 - classes/expressions/ExpressionManager.php Diff File
mod - docs/release_notes.txt Diff File
mod - version.php Diff File

1.92 662079c5

2012-06-07 13:37:14

TMSWhite

Details Diff
Merge branch 'master' into 192_dev
Attach Issues:
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/am/LC_MESSAGES/am.mo Diff File
mod - locale/am/LC_MESSAGES/am.po Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.po Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/it/LC_MESSAGES/it.po Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.po Diff File

1.92 26bc5f22

2012-06-07 13:30:02

TMSWhite

Details Diff
Fixed issue HTML error in hidden field for equation question type
Dev extra period before closing >. Does not appear to prevent accurate data collection, but shows up as error when viewing source.
Attach Issues:
mod - qanda.php Diff File

master f3b39317

2012-06-07 08:17:57

TMSWhite

Details Diff
Merge branch 'master' of github.com:LimeSurvey/LimeSurvey
Attach Issues:
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 - docs/release_notes.txt Diff File
mod - version.php Diff File

Yii e1f44c80

2012-06-07 08:17:44

TMSWhite

Details Diff
Fixed issue #06177: uppercase logical operators (e.g. 'OR') in EM yield JavaScript errors
Dev authors can now use uppercase versions of operators (e.g. OR, AND, EQ, LT, etc.)
Affected Issues
06177
mod - application/helpers/expressions/em_core_helper.php Diff File

master e960298e

2012-06-07 08:16:30

TMSWhite

Details Diff
Fixed issue #06177: uppercase logical operators (e.g. 'OR') in EM yield JavaScript errors
Dev authors can now use uppercase versions of operators (e.g. OR, AND, EQ, LT, etc.)
Affected Issues
06177
mod - classes/expressions/ExpressionManager.php Diff File

master 0b87f997

2012-06-07 07:01:19

c_schmitz

Details Diff
Release 1.92+ Build 120608
Attach Issues:
mod - docs/release_notes.txt Diff File

master 3da858ee

2012-06-07 06:51:05

c_schmitz

Details Diff
Dev Reverted version upgrade to 155.5 - no DB version changes in a stable version please - in addition the creation scripts were not updated
Attach Issues:
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 - version.php Diff File

Yii 414b6358

2012-06-07 06:38:23

TMSWhite

Details Diff
Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii
Attach Issues:
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/admin/authentication.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
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.po Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/it/LC_MESSAGES/it.po Diff File

Yii d6866186

2012-06-07 06:36:56

TMSWhite

Details Diff
Fixed issue HTML error in hidden field for equation question type
Dev extra period before closing >. Does not appear to prevent accurate data collection, but shows up as error when viewing source.
Attach Issues:
mod - application/helpers/qanda_helper.php Diff File

Yii 64baf8df

2012-06-07 06:36:53

c_schmitz

Details Diff
Dev Fixed DBVersion number not being raised in creation scripts
Attach Issues:
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 e0710990

2012-06-07 06:32:09

TMSWhite

Details Diff
Fixed issue HTML error in hidden field for equation question type
Dev extra period before closing >. Does not appear to prevent accurate data collection, but shows up as error when viewing source.
Attach Issues:
mod - qanda.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 900 ... 1050 ... 1100 1101 1102 1103 1104 1105 1106 ... 1200 ... 1350 ... 1452 1453 1454  Next  Last