Changesets: LimeSurvey

master ecf1e594

2012-09-13 05:45:41

c_schmitz

Details Diff
Fixed issue 06547: Arbitrary URL redirect - parameter "redirect" Affected Issues
06547
mod - index.php Diff File

Yii 806c96cd

2012-09-13 05:45:29

c_schmitz

Details Diff
Fixed issue 06547: Arbitrary URL redirect - parameter "redirect" Affected Issues
06547
mod - application/controllers/survey/index.php Diff File

1.92 9584d89c

2012-09-13 03:00:01

TMSWhite

Details Diff
Merge branch 'master' into 192_dev
Attach Issues:
mod - admin/database.php Diff File
mod - admin/scripts/ckeditor.36/limesurvey-config.js Diff File

Yii c026442f

2012-09-13 02:32:08

c_schmitz

Details Diff
Fixed issue 06478: Unable to import excel survey Affected Issues
06478
mod - application/helpers/admin/import_helper.php Diff File

1.92 76dfa1da

2012-09-13 01:50:17

TMSWhite

Details Diff
Updated Feature Excel Import/Export now uses .txt (tab separated values) instead of .xls to avoid i18n and encoding bugs in the excel_reader package (which has been removed)
Attach Issues:
rm - admin/classes/excel/excel_reader2.php Diff File
mod - admin/editsurveysettings.php Diff File
mod - admin/export_structure_excel.php Diff File
mod - admin/html.php Diff File
mod - admin/http_importsurvey.php Diff File
mod - admin/import_functions.php Diff File

1.92 4b75d206

2012-09-12 20:30:36

TMSWhite

Details Diff
Merge branch 'master' into 192_dev
Attach Issues:
mod - admin/activate_functions.php Diff File
mod - admin/preview.php Diff File
mod - admin/surveytable_functions.php Diff File
mod - admin/userrighthandling.php Diff File
mod - common_functions.php Diff File
mod - docs/release_notes.txt Diff File
mod - scripts/modaldialog.js Diff File

Yii cd1590c8

2012-09-12 19:51:16

TMSWhite

Details Diff
Fixed issue 06478: Unable to import excel survey
Dev Removed dependency upon excel_reader; instead read/write to tab separated value (.txt) file
Dev This works fine in the 1.92 extension.
Dev However, this still can has trouble (like with accents) in 2.0; but since the code changes are identical in 1.92, the source of that problem must be elsewhere (perhaps in the model->insertRecords() functions?)
Affected Issues
06478
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
rm - application/libraries/admin/excel/excel_reader2.php Diff File
mod - application/views/admin/survey/subview/tabImport_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File

Yii 4d9eda8f

2012-09-12 15:29:47

c_schmitz

Details Diff
Merge remote-tracking branch 'origin/Yii' into Yii
Attach Issues:
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs-informal/LC_MESSAGES/cs-informal.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File

Yii 39f3bf3a

2012-09-12 15:29:33

c_schmitz

Details Diff
Fixed issue 06536: HTML editor converts special characters to html entities within equations Affected Issues
06536
mod - application/config/config-defaults.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - scripts/admin/ckeditor-config.js Diff File

master 8e1620c7

2012-09-12 15:22:57

c_schmitz

Details Diff
Fixed issue 06536: HTML editor converts special characters to html entities within equations Affected Issues
06536
mod - admin/database.php Diff File
mod - admin/scripts/ckeditor.36/limesurvey-config.js Diff File

Yii 885ee283

2012-09-12 15:06:03

root

Details Diff
Updated translation: Czech by slansky
Updated translation: French (France) by DenisChenu
Updated translation: Norwegian (Bokmål) by peterhol, finni
Updated translation: Polish by elisa, zozlak
Updated translation: Serbian by MilaVeljovic
Updated translation: Czech Informal by slansky
Attach Issues:
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs-informal/LC_MESSAGES/cs-informal.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File

Yii d2f86347

2012-09-12 05:29:14

c_schmitz

Details Diff
Merge remote-tracking branch 'origin/Yii' into Yii
Attach Issues:
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File

Yii e93e9315

2012-09-12 05:28:49

c_schmitz

Details Diff
Dev Removing obsolete LSRC code
Attach Issues:
mod - application/config/config-defaults.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/helpers/export_helper.php Diff File
rm - application/views/admin/export/group_view.php Diff File
rm - application/views/admin/export/question_view.php Diff File

Yii 7be50ff3

2012-09-11 15:05:52

root

Details Diff
Updated translation: German by c_schmitz
Updated translation: French (France) by DenisChenu
Updated translation: Norwegian (Bokmål) by peterhol, finni
Attach Issues:
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File

Yii 17109ccc

2012-09-11 10:45:39

DenisChenu

Details Diff
Dev: fixed issue 06550 : Translation of 'Other:' comment mandatory for survey taking is untranslatable
Dev : use Curling Quotes : tested with 192 translation and poedit: time to see with glotpress
Affected Issues
06550
mod - application/helpers/expressions/em_manager_helper.php Diff File

Yii 04bbc571

2012-09-11 10:33:03

DenisChenu

Details Diff
Fixed issue : 06553 : $column_style global parameter aren't used
Dev : remove obsolete G (gender) display_columns attribute (not used in qanda.php)
Attach Issues:
mod - application/helpers/common_helper.php Diff File

2.1 63d5e33c

2012-09-11 10:12:56

user16774

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

Conflicts:
application/controllers/admin/remotecontrol.php
application/views/admin/quotas/newanswererror_view.php
application/views/admin/survey/importSurvey_view.php
Attach Issues:
mod - .gitignore Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/models/Participants.php Diff File
mod - application/views/admin/globalSettings_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/survey/copySurvey_view.php Diff File
mod - application/views/admin/survey/importSurvey_view.php Diff File
mod - locale/_template/limesurvey.pot Diff File
add - locale/cs-informal/LC_MESSAGES/cs-informal.mo Diff File
add - locale/cs-informal/LC_MESSAGES/index.html Diff File
add - locale/cs-informal/index.html Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/da/LC_MESSAGES/da.mo Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/el/LC_MESSAGES/el.mo Diff File
mod - locale/et/LC_MESSAGES/et.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/hu/LC_MESSAGES/hu.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/ru/LC_MESSAGES/ru.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File
mod - locale/swh/LC_MESSAGES/swh.mo Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File
mod - scripts/modaldialog.js Diff File

master 76cd751b

2012-09-11 10:04:13

DenisChenu

Details Diff
Fixed issue : 06553 : $column_style global parameter aren't used
Dev : remove obsolete G (gender) display_columns attribute (not used in qanda.php)
Attach Issues:
mod - common_functions.php Diff File

Yii 048a855b

2012-09-11 05:09:58

root

Details Diff
Dev Automatic translation update
Attach Issues:
mod - locale/_template/limesurvey.pot Diff File

Yii 3cba5ba0

2012-09-11 05:05:28

c_schmitz

Details Diff
Merge remote-tracking branch 'origin/Yii' into Yii
Attach Issues:
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File

Yii b1a1c5bd

2012-09-11 05:05:12

c_schmitz

Details Diff
Dev Fixed some translations
Attach Issues:
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/views/admin/survey/importSurvey_view.php Diff File

Yii 5775274c

2012-09-11 05:03:36

root

Details Diff
Updated translation: German by c_schmitz
Updated translation: Japanese by nomoto
Updated translation: Norwegian (Bokmål) by finni, peterhol
Updated translation: Polish by elisa
Updated translation: Serbian by MilaVeljovic
Attach Issues:
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File

Yii 11b490fc

2012-09-10 23:41:06

jcleeland

Details Diff
Merge branch 'Yii' of https://github.com/LimeSurvey/LimeSurvey into Yii
Attach Issues:
mod - .gitignore Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/views/admin/globalSettings_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/survey/copySurvey_view.php Diff File
mod - application/views/admin/survey/importSurvey_view.php Diff File
mod - locale/_template/limesurvey.pot Diff File
add - locale/cs-informal/LC_MESSAGES/cs-informal.mo Diff File
add - locale/cs-informal/LC_MESSAGES/index.html Diff File
add - locale/cs-informal/index.html Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/da/LC_MESSAGES/da.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/hu/LC_MESSAGES/hu.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/ru/LC_MESSAGES/ru.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File

Yii 5067b570

2012-09-10 23:40:24

jcleeland

Details Diff
Fixed issue 06507 - Central Participant Database: Admin language should not influence on the mapping of token attributes. System now checks if there is a matching description in the default language of the survey, then if not if there is a matching description in the currently selected admin language, then finally defaults to the first returned language. Affected Issues
06507
mod - application/models/Participants.php Diff File

Yii 0ef82b68

2012-09-10 15:06:00

root

Details Diff
Updated translation: Czech by slansky
Updated translation: Norwegian (Bokmål) by peterhol, finni
Updated translation: Polish by elisa
Updated translation: Serbian by MilaVeljovic
Updated translation: Czech Informal by slansky
Attach Issues:
mod - locale/cs-informal/LC_MESSAGES/cs-informal.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 900 ... 1050 ... 1063 1064 1065 1066 1067 1068 1069 ... 1200 ... 1350 ... 1452 1453 1454  Next  Last