Changesets: LimeSurvey

Search Browse Back to Index

master 17e3b3f5

2012-10-16 07:15:20

c_schmitz

Details Diff 		Fixed issue: Template editor not working
Attach Issues:
mod - application/helpers/replacements_helper.php Diff File

2.1 9dcfe149

2012-10-16 06:59:17

c_schmitz

Details Diff 		Merge remote-tracking branch 'origin/2.1' into 2.1

Conflicts:
application/controllers/admin/tokens.php
application/core/Survey_Common_Action.php
Attach Issues:
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
add - application/helpers/viewHelper.php Diff File
mod - scripts/admin/tokens.js Diff File
mod - styles/adminstyle.css Diff File
mod - styles/blobblueish/adminstyle.css Diff File
mod - styles/gartergrey/adminstyle.css Diff File
mod - styles/gringegreen/adminstyle.css Diff File

2.1 29ae6bec

2012-10-16 06:56:32

c_schmitz

Details Diff 		Merge remote-tracking branch 'origin/master' into 2.1

Conflicts:
application/config/config-sample.php
application/controllers/Statistics_userController.php
application/controllers/UploaderController.php
application/controllers/admin/conditionsaction.php
application/controllers/admin/database.php
application/controllers/admin/dataentry.php
application/controllers/admin/printablesurvey.php
application/controllers/admin/remotecontrol.php
application/controllers/admin/tokens.php
application/controllers/admin/translate.php
application/controllers/survey/index.php
application/core/Survey_Common_Action.php
application/helpers/admin/exportresults_helper.php
application/helpers/admin/import_helper.php
application/helpers/admin/statistics_helper.php
application/helpers/export_helper.php
application/helpers/expressions/em_manager_helper.php
application/helpers/frontend_helper.php
application/helpers/qanda_helper.php
application/models/Groups.php
application/models/InstallerConfigForm.php
application/models/Questions.php
application/models/Survey_url_parameters.php
application/models/Tokens_dynamic.php
application/models/User_groups.php
application/models/User_in_groups.php
application/views/admin/export/exportresults_view.php
application/views/admin/token/actions.php
installer/sql/create-mssql.sql
installer/sql/create-mysql.sql
installer/sql/create-pgsql.sql
Attach Issues:
add - application/commands/InstallCommand.php Diff File
add - application/commands/starter.php Diff File
mod - application/config/config-sample.php Diff File
mod - application/config/routes.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/dumpdb.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/question.php Diff File
mod - application/controllers/admin/questiongroup.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/surveypermission.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/translate.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSYii_Application.php Diff File
add - application/core/LSYii_Validators.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/backupdb_helper.php Diff File
mod - application/helpers/admin/exportresults_helper.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/database_helper.php Diff File
mod - application/helpers/export_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/models/Groups.php Diff File
mod - application/models/InstallerConfigForm.php Diff File
mod - application/models/ParticipantAttributeNames.php Diff File
mod - application/models/Participants.php Diff File
mod - application/models/Questions.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Survey_permissions.php Diff File
mod - application/models/Survey_url_parameters.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
mod - application/models/User_groups.php Diff File
mod - application/models/User_in_groups.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/responses/browsemenubar_view.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/editGroup_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/import_view.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/survey/subview/tabResourceManagement_view.php Diff File
mod - application/views/admin/templates/importuploaded_view.php Diff File
mod - application/views/admin/templates/templateeditor_navigator_view.php Diff File
mod - application/views/admin/templates/templateeditor_question_answer_view.php Diff File
mod - application/views/admin/token/actions.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/email.php Diff File
mod - application/views/statistics_user_view.php Diff File
mod - docs/release_notes.txt 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/ar/LC_MESSAGES/ar.mo Diff File
mod - locale/bg/LC_MESSAGES/bg.mo 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/es/LC_MESSAGES/es.mo Diff File
mod - locale/et/LC_MESSAGES/et.mo Diff File
mod - locale/fi/LC_MESSAGES/fi.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/hu/LC_MESSAGES/hu.mo Diff File
mod - locale/it-informal/LC_MESSAGES/it-informal.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/lv/LC_MESSAGES/lv.mo Diff File
mod - locale/ms/LC_MESSAGES/ms.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/nl/LC_MESSAGES/nl.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/ru/LC_MESSAGES/ru.mo Diff File
mod - locale/sk/LC_MESSAGES/sk.mo Diff File
mod - locale/sl/LC_MESSAGES/sl.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File
mod - locale/sv/LC_MESSAGES/sv.mo Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File
mod - scripts/admin/globalsettings.js Diff File
mod - scripts/admin/listsurvey.js Diff File
add - scripts/admin/questions.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/admin/tokens.js Diff File
mod - scripts/date.js Diff File
add - scripts/statistics_user.js Diff File
mod - styles/blobblueish/adminstyle.css Diff File
mod - styles/blobblueish/superfish.css Diff File
mod - styles/gartergrey/adminstyle.css Diff File
mod - styles/gringegreen/adminstyle.css Diff File
mod - styles/gringegreen/superfish.css Diff File
mod - third_party/kcfinder/core/browser.php Diff File
mod - third_party/kcfinder/core/uploader.php Diff File

master d7e61a55

2012-10-16 06:50:58

mdekker

Details Diff 		dev: unable to restore token table without attributes due to uninitialised variable
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File

2.1 af319092

2012-10-16 06:43:29

mdekker

Details Diff 		dev: fixed merge issue
Attach Issues:
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/core/Survey_Common_Action.php Diff File

2.1 9230e2e6

2012-10-16 06:30:06

mdekker

Details Diff 		dev: in token screen moved input to real links
Attach Issues:
mod - application/controllers/admin/tokens.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
add - application/helpers/viewHelper.php Diff File
mod - scripts/admin/tokens.js Diff File
mod - styles/adminstyle.css Diff File
mod - styles/blobblueish/adminstyle.css Diff File
mod - styles/gartergrey/adminstyle.css Diff File
mod - styles/gringegreen/adminstyle.css Diff File

2.1 6a28d17e

2012-10-16 06:29:34

mdekker

Details Diff 		dev: fixed missing bracket in remotecontrol
Attach Issues:
mod - application/controllers/admin/remotecontrol.php Diff File

2.1 2ecc3e29

2012-10-16 04:54:30

c_schmitz

Details Diff 		Dev Fixed issue. Unable to select a question in the admin interface
Attach Issues:
mod - application/core/Survey_Common_Action.php Diff File

master 1c940fe7

2012-10-16 03:10:55

c_schmitz

Details Diff 		Merge remote-tracking branch 'origin/master'
Attach Issues:
mod - locale/_template/limesurvey.pot Diff File
mod - locale/bg/LC_MESSAGES/bg.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/fi/LC_MESSAGES/fi.mo Diff File
mod - locale/hu/LC_MESSAGES/hu.mo Diff File
mod - locale/ru/LC_MESSAGES/ru.mo Diff File
mod - locale/sl/LC_MESSAGES/sl.mo Diff File

master cc71ad1a

2012-10-16 03:10:38

c_schmitz

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

master 4f54451f

2012-10-16 02:58:39

LimeSurvey Translations Bot

Details Diff 		Updated translation: Bulgarian by klaster
Updated translation: Danish by nielsb
Updated translation: German by c_schmitz
Updated translation: Greek by kiolalis
Updated translation: Finnish by klaster, hirvojo1
Updated translation: Hungarian by hunkissleslie
Updated translation: Russian by vipgroup, ldemeschew
Updated translation: Slovenian by Aambro
Attach Issues:
mod - locale/_template/limesurvey.pot Diff File
mod - locale/bg/LC_MESSAGES/bg.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/fi/LC_MESSAGES/fi.mo Diff File
mod - locale/hu/LC_MESSAGES/hu.mo Diff File
mod - locale/ru/LC_MESSAGES/ru.mo Diff File
mod - locale/sl/LC_MESSAGES/sl.mo Diff File

master 74f3751c

2012-10-16 02:38:22

c_schmitz

Details Diff 		Fixed issue 06709: Export results - token values missing Affected Issues
06709
mod - application/helpers/admin/exportresults_helper.php Diff File

master 13ae7772

2012-10-16 02:10:58

c_schmitz

Details Diff 		Fixed issue 06708: Error messages not displaying at survey signup when user did not completely/correctly fill out the form Affected Issues
06708
mod - application/controllers/RegisterController.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - scripts/admin/questions.js Diff File

master 887eb23e

2012-10-16 01:14:24

c_schmitz

Details Diff 		Fixed issue 06688: Apostrophe (single quote) in question code for File upload questions disrupts EM logic Affected Issues
06688
mod - application/controllers/admin/question.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
add - scripts/admin/questions.js Diff File

master 87625a36

2012-10-15 15:06:02

LimeSurvey Translations Bot

Details Diff 		Updated translation: Czech by slansky
Updated translation: Estonian by klaster
Updated translation: Japanese by nomoto
Updated translation: Latvian by vipgroup
Updated translation: Malay by xbonize
Updated translation: Norwegian (Bokmål) by pmonstad, peterhol
Updated translation: Portuguese (Brazil) by wagner, mauriciofurtado
Attach Issues:
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/et/LC_MESSAGES/et.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/lv/LC_MESSAGES/lv.mo Diff File
mod - locale/ms/LC_MESSAGES/ms.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File

master b9beb4c4

2012-10-15 12:44:52

c_schmitz

Details Diff 		New feature: Console installation scripts
Attach Issues:
mod - application/commands/InstallCommand.php Diff File

master a559987f

2012-10-15 12:22:55

c_schmitz

Details Diff 		New feature: Console installation scripts
Attach Issues:
mod - application/commands/starter.php Diff File

master c56cdc28

2012-10-15 09:29:56

c_schmitz

Details Diff 		New feature: Console installation scripts
Attach Issues:
mod - application/commands/InstallCommand.php Diff File
mod - application/commands/starter.php Diff File

master 10438c17

2012-10-15 09:25:52

c_schmitz

Details Diff 		New feature: Console installation scripts
Attach Issues:
add - application/commands/InstallCommand.php Diff File
add - application/commands/starter.php Diff File

master eb4d02f1

2012-10-15 09:25:27

aniesshsethh

Details Diff 		Merge branch 'master' of git://github.com/LimeSurvey/LimeSurvey
Attach Issues:
mod - application/config/config-sample.php Diff File
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/models/User_groups.php Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/es/LC_MESSAGES/es.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File

2.1 6c71f1af

2012-10-15 09:22:41

aniesshsethh

Details Diff 		Fixed issue 06606: Participant attribute grid - can only edit the first attribute
Dev Working working fine now		 Affected Issues
06606
mod - application/controllers/admin/participantsaction.php Diff File

master 3ee990fe

2012-10-15 09:22:41

aniesshsethh

Details Diff 		Fixed issue 06606: Participant attribute grid - can only edit the first attribute
Dev Working working fine now		 Affected Issues
06606
mod - application/controllers/admin/participantsaction.php Diff File

master b4ce0a99

2012-10-15 04:14:16

sammousa

Details Diff 		Merge branch 'master' of ssh://github.com/LimeSurvey/LimeSurvey
Attach Issues:
mod - application/config/config-sample.php Diff File

master 7410337d

2012-10-15 04:12:10

sammousa

Details Diff 		Fixed issue: http://bugs.limesurvey.org/view.php?id=6668
Dev Changed emailtemplates action to correctly set FileManagerContext
Dev Removed uninitialized $schema parameter in htmleditor helper.
Attach Issues:
mod - application/controllers/admin/emailtemplates.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File

master dcef91eb

2012-10-15 03:58:37

c_schmitz

Details Diff 		Dev Updated sample configuration
Attach Issues:
mod - application/config/config-sample.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 900 ... 1050 ... 1060 1061 1062 1063 1064 1065 1066 ... 1200 ... 1350 ... 1460 1461 1462  Next  Last