Changesets: LimeSurvey

2.1 1aa2d1df

2012-08-19 03:14

user16774


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

Conflicts:
application/controllers/admin/quotas.php
mod - application/controllers/admin/quotas.php Diff File

Yii a1185d32

2012-08-19 03:02

user16774


Details Diff
Fixed issue: quota creation doesn't function properly.
mod - application/controllers/admin/quotas.php Diff File

2.1 4d95031a

2012-08-18 19:54

user16774


Details Diff
Merge branch 'Yii' of github.com:LimeSurvey/LimeSurvey into Question_Objects
mod - application/controllers/InstallerController.php Diff File
mod - application/views/installer/dbconfig_view.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File
mod - styles/gringegreen/adminstyle.css Diff File

Yii 539f5563

2012-08-18 19:52

user16774


Details Diff
Add modules path to install script as well

See also https://github.com/LimeSurvey/LimeSurvey/commit/9ff76fcb1aec1c94447c1266e4a8e959daf213c4
mod - application/controllers/InstallerController.php Diff File

2.1 9b6cbd98

2012-08-18 19:40

user16774


Details Diff
Clean up common_helper.php and apply some other fixes.
mod - application/controllers/admin/question.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/modules/HugeTextQuestion.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File

Yii 1018cccf

2012-08-18 17:46

c_schmitz


Details Diff
Fixed issue 06489: Display problems in installer Affected Issues
06489
mod - application/views/installer/dbconfig_view.php Diff File
mod - styles/gringegreen/adminstyle.css Diff File

Yii 8c000c78

2012-08-18 17:05

root


Details Diff
Updated translation: Turkish by kayazeren
mod - locale/_template/limesurvey.pot Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File

2.1 f86fda4d

2012-08-18 16:12

user16774


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

Conflicts:
application/config/version.php
application/controllers/survey/index.php
application/helpers/admin/import_helper.php
application/helpers/frontend_helper.php
application/models/Conditions.php
mod - application/config/version.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/libraries/admin/excel/excel_reader2.php Diff File
mod - application/models/Conditions.php Diff File
mod - application/views/admin/checkintegrity/check_view.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/installer/success_view.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/th/LC_MESSAGES/th.mo Diff File
mod - tmp/.gitignore Diff File

Yii 1a0afb36

2012-08-18 15:57

user16774


Details Diff
Fixed issue: Undefined variable: dv in check_view.php
mod - application/views/admin/checkintegrity/check_view.php Diff File

Yii 0196e4b7

2012-08-18 14:01

Igor Dobrača


Details Diff
Fix issue: Missing translation of some fields
mod - application/views/admin/participants/participantsPanel_view.php Diff File
mod - application/views/installer/success_view.php Diff File

Yii 874aa803

2012-08-18 05:54

jcleeland


Details Diff
Fixed issue 06481 - Filters showing all text responses Affected Issues
06481
mod - application/controllers/admin/statistics.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File

2.1 c50a42d2

2012-08-18 05:33

user16774


Details Diff
Fix the install SQL.
mod - installer/sql/create-mssql.sql Diff File
mod - installer/sql/create-mysql.sql Diff File
mod - installer/sql/create-pgsql.sql Diff File

2.1 1f236496

2012-08-18 05:20

user16774


Details Diff
Port import helper to question objects.
mod - application/controllers/admin/dataentry.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/views/admin/dataentry/content_view.php Diff File

2.1 77aa2e4b

2012-08-17 18:14

user16774


Details Diff
Clean templates.php of type: down to 15 files!
mod - application/controllers/admin/templates.php Diff File

2.1 9ae187c5

2012-08-17 17:45

user16774


Details Diff
Remove getQuestionAttributeValues from UploaderController.php.
mod - application/controllers/UploaderController.php Diff File

2.1 5312204b

2012-08-17 17:27

user16774


Details Diff
Port activate_helper.php to the question objects.
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/question.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/models/Conditions.php Diff File

Yii a26385a9

2012-08-17 17:05

root


Details Diff
Updated translation: German by c_schmitz
Updated translation: Italian by lfanfoni, alesarrett
Updated translation: Japanese by nomoto
Updated translation: Norwegian (Bokmål) by peterhol
Updated translation: Thai by c_schmitz
Updated translation: Chinese (Simplified) by jun9
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/th/LC_MESSAGES/th.mo Diff File

master 71552abe

2012-08-17 17:00

root


Details Diff
Updated translation: French (France) by BenoitBouvarel
Updated translation: Italian by lfanfoni
Updated translation: Thai by c_schmitz
Updated translation: Chinese (Simplified) by jun9
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/th/LC_MESSAGES/th.mo Diff File

Yii 0f567912

2012-08-17 06:50

c_schmitz


Details Diff
Fixed issue 06495: Version shows as RC8 on the RC9 release Affected Issues
06495
mod - application/config/version.php Diff File

Yii 4b7ce9d7

2012-08-17 06:47

c_schmitz


Details Diff
Fixed issue 06496: Server error when changing question group for a question Affected Issues
06496
mod - application/controllers/admin/database.php Diff File
mod - application/models/Conditions.php Diff File

Yii 3e96fa10

2012-08-17 06:20

c_schmitz


Details Diff
Fixed issue 06478: Unable to import excel survey
Dev Fixed incorrect URL description reading in Excel reader
Affected Issues
06478
mod - application/helpers/admin/import_helper.php Diff File
mod - application/libraries/admin/excel/excel_reader2.php Diff File
mod - tmp/.gitignore Diff File

1.92 6c97fa31

2012-08-17 04:39

TMSWhite


Details Diff
Merge branch 'master' into 192_dev
mod - admin/dataentry.php Diff File
mod - admin/editsurveysettings.php Diff File
mod - admin/scripts/updateset.js 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 - classes/expressions/ExpressionManager.php Diff File
mod - classes/expressions/LimeExpressionManager.php Diff File
mod - common_functions.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs/LC_MESSAGES/cs.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/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/ms/LC_MESSAGES/ms.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File
mod - qanda.php Diff File
mod - templates/basic/template.css Diff File
mod - templates/bluengrey/template.css Diff File
mod - templates/citronade/template.css Diff File
mod - templates/clear_logo/template.css Diff File
mod - templates/default/template.css Diff File
mod - templates/eirenicon/template.css Diff File
mod - templates/limespired/template.css Diff File
mod - templates/mint_idea/template.css Diff File
mod - templates/sherpa/template.css Diff File

Yii f003d3d2

2012-08-16 17:05

root


Details Diff
Updated translation: Italian by lfanfoni
mod - locale/_template/limesurvey.pot Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File

master a70853f4

2012-08-16 17:00

root


Details Diff
Updated translation: Italian by lfanfoni
mod - locale/it/LC_MESSAGES/it.mo Diff File

Yii a040e6ac

2012-08-16 11:35

user16774


Details Diff
Fixed issue 06484: EM sessions misbehaving

This line should fix the majority of the session troubles with EM because setting the survey forces EM to reload if the surveyid has changed. I still don't think this is quite the right approach, however, because the original survey is reset. I think we should work to move all frontend session variable in to different session arrays (each with ID survey_######) so that two or more surveys can be taken concurrently without issue.
mod - application/controllers/survey/index.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 900 ... 1050 ... 1081 1082 1083 1084 1085 1086 1087 ... 1200 ... 1350 ... 1465 1466 1467  Next  Last