Changesets: LimeSurvey

Search Browse Back to Index

master d5655da8

2012-10-03 06:27

TMSWhite


Details Diff		 Fixed issue 06631: Questions conditional on a previous yes/no question are not displaying after navigating back to a question group. Affected Issues
06631
mod - application/helpers/qanda_helper.php Diff File

master fdb033a0

2012-10-03 05:15

sammousa


Details Diff		 Dev updated UploaderController::run signature to be compatible with CController::run.
mod - application/controllers/UploaderController.php Diff File

master 49da6fb4

2012-10-02 17:45

TMSWhite


Details Diff		 Fixed issue 06623: imported tab delimited surveys are not visible Affected Issues
06623
mod - application/helpers/admin/import_helper.php Diff File

master 1c4294cf

2012-10-02 17:05

root


Details Diff		 Updated translation: Arabic by ysaad
Updated translation: German by PDrews
Updated translation: Italian by lfanfoni
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ar/LC_MESSAGES/ar.mo Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File

master fd8dd956

2012-10-02 13:24

DenisChenu


Details Diff		 Merge branch 'master' of github.com:LimeSurvey/LimeSurvey
mod - application/views/admin/templates/importuploaded_view.php Diff File
mod - docs/release_notes.txt Diff File
mod - locale/_template/limesurvey.pot Diff File
mod - locale/et/LC_MESSAGES/et.mo Diff File
mod - locale/nl/LC_MESSAGES/nl.mo Diff File

master 56b9c56c

2012-10-02 13:23

DenisChenu


Details Diff		 Fixed issue 06593: Displays HTML Quote for Question type List (dropdown) Affected Issues
06593
mod - application/helpers/expressions/em_manager_helper.php Diff File

master ad745b65

2012-10-02 13:00

DenisChenu


Details Diff		 Dev: remove inline style for #questionactioncopy, replace for blobblueish and gartergrey admin style
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - styles/blobblueish/adminstyle.css Diff File
mod - styles/gartergrey/adminstyle.css Diff File
mod - styles/gringegreen/adminstyle.css Diff File

master 1fb78675

2012-10-02 10:09

c_schmitz


Details Diff		 Merge remote-tracking branch 'origin/master'
mod - locale/_template/limesurvey.pot Diff File

master c5e7a640

2012-10-02 10:09

c_schmitz


Details Diff		 Release 2.00+ Build 121002
mod - docs/release_notes.txt Diff File

master c3bb693b

2012-10-02 09:57

root


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

master be72339d

2012-10-02 09:55

c_schmitz


Details Diff		 Dev Minor translation fix
mod - application/views/admin/templates/importuploaded_view.php Diff File

master d2b93aa9

2012-10-02 09:54

root


Details Diff		 Updated translation: Estonian by klaster
Updated translation: Dutch by mdekker
mod - locale/_template/limesurvey.pot Diff File
mod - locale/et/LC_MESSAGES/et.mo Diff File
mod - locale/nl/LC_MESSAGES/nl.mo Diff File

master 8b68a254

2012-10-02 09:24

DenisChenu


Details Diff		 Dev : fixed issue : 06599 children : error on automatic update
Dev : do the is_file only for directory
mod - application/helpers/update/updatedb_helper.php Diff File

master 3a6bb0cf

2012-10-02 08:17

root


Details Diff		 Updated translation: German by c_schmitz, Ebenezer_Arvigenius
Updated translation: Estonian by klaster
Updated translation: Italian by lfanfoni
Updated translation: Italian (Informal) by lfanfoni
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/et/LC_MESSAGES/et.mo Diff File
mod - locale/it-informal/LC_MESSAGES/it-informal.mo Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File

master e07579c5

2012-10-02 06:51

DenisChenu


Details Diff		 Fixed issue 06599 : Old custom templates incompatibility : replace template.js by {TEMPLATEJS} when upload
Dev: add a private function _templateFixes($templatename)
Dev : update release_notes.txt , to do : update docs.limesurvey.org		 Affected Issues
06599
mod - application/controllers/admin/templates.php Diff File
mod - application/views/admin/templates/importuploaded_view.php Diff File
mod - docs/release_notes.txt Diff File

master 76a7c591

2012-10-02 05:23

c_schmitz


Details Diff		 Fixed issue 06604: The survey URL sent with the registration mail is wrong Affected Issues
06604
mod - application/controllers/RegisterController.php Diff File
mod - application/helpers/frontend_helper.php Diff File

master 7c4aa7f1

2012-10-02 04:13

c_schmitz


Details Diff		 Fixed issue 06554: Show logic file always lists "time_limit_action" question attribute though it was not changed Affected Issues
06554
mod - application/helpers/expressions/em_manager_helper.php Diff File

master ac79fdeb

2012-10-02 02:26

c_schmitz


Details Diff		 Merge remote-tracking branch 'origin/master'
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/et/LC_MESSAGES/et.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/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
mod - locale/tr/LC_MESSAGES/tr.mo Diff File

master 9f54865b

2012-10-02 02:25

c_schmitz


Details Diff		 Fixed issue 06621: Incorrect number of radio list display columns Affected Issues
06621
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File

2.1 748cb993

2012-10-02 00:51

user16774


Details Diff		 Fix merge issues.
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/expressions/em_manager_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

2.1 988b6b6e

2012-10-01 22:28

user16774


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

Conflicts:
application/config/routes.php
application/config/version.php
application/controllers/admin/remotecontrol.php
application/controllers/admin/statistics.php
application/controllers/admin/surveyadmin.php
application/controllers/admin/tokens.php
application/controllers/admin/update.php
application/core/LSYii_Controller.php
application/core/Survey_Common_Action.php
application/helpers/admin/activate_helper.php
application/helpers/admin/exportresults_helper.php
application/helpers/admin/statistics_helper.php
application/helpers/common_helper.php
application/helpers/export_helper.php
application/helpers/expressions/em_manager_helper.php
application/helpers/frontend_helper.php
application/helpers/globalsettings_helper.php
application/helpers/update/updatedb_helper.php
application/libraries/Save.php
application/models/ParticipantAttributeNames.php
application/models/Saved_control.php
application/models/Survey_timings.php
application/models/User_groups.php
application/views/admin/update/step3.php
installer/sql/create-mssql.sql
add - admin/admin.php Diff File
mod - admin/index.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/routes.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/VerificationController.php Diff File
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/dumpdb.php Diff File
mod - application/controllers/admin/export.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/labels.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/question.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/statistics.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/useraction.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/LSYii_Controller.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
add - 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/label_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/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/globalsettings_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
rm - application/libraries/admin/excel/excel_reader2.php Diff
mod - application/models/ParticipantAttributeNames.php Diff File
mod - application/models/Participants.php Diff File
mod - application/models/Questions.php Diff File
mod - application/models/Saved_control.php Diff File
mod - application/models/Survey_dynamic.php Diff File
mod - application/models/Survey_timings.php Diff File
mod - application/models/Survey_url_parameters.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
mod - application/models/User.php Diff File
mod - application/models/User_groups.php Diff File
mod - application/modules/FileQuestion.php Diff File
mod - application/modules/GenderQuestion.php Diff File
mod - application/views/admin/export/exportresults_view.php Diff File
rm - application/views/admin/export/group_view.php Diff
rm - application/views/admin/export/question_view.php Diff
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/responses/browseindex_view.php Diff File
mod - application/views/admin/responses/browsetimefooter_view.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/questiongroupbar_view.php Diff File
mod - application/views/admin/survey/listSurveys_view.php Diff File
mod - application/views/admin/survey/subview/tabImport_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/token/bounce.php Diff File
mod - application/views/admin/token/csvpost.php Diff File
mod - application/views/admin/token/ldapform.php Diff File
mod - application/views/admin/update/step2.php Diff File
mod - application/views/admin/update/step3.php Diff File
mod - application/views/admin/update/step4.php Diff File
mod - application/views/admin/update/update.php Diff File
mod - application/views/entertoken_view.php Diff File
mod - application/views/installer/dbconfig_view.php Diff File
mod - application/views/installer/precheck_view.php Diff File
add - docs/demosurveys/ls191_sample_survey_multilingual.lss Diff File
rm - docs/install.txt Diff
mod - docs/release_notes.txt Diff File
add - images/flags/af.png 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/af/LC_MESSAGES/af.mo Diff File
mod - locale/am/LC_MESSAGES/am.mo Diff File
mod - locale/ar/LC_MESSAGES/ar.mo Diff File
mod - locale/be/LC_MESSAGES/be.mo Diff File
mod - locale/bg/LC_MESSAGES/bg.mo Diff File
mod - locale/bs/LC_MESSAGES/bs.mo Diff File
mod - locale/ca/LC_MESSAGES/ca.mo Diff File
mod - locale/cs-informal/LC_MESSAGES/cs-informal.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/cy/LC_MESSAGES/cy.mo Diff File
mod - locale/da/LC_MESSAGES/da.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/en/LC_MESSAGES/en.mo Diff File
mod - locale/es-CL/LC_MESSAGES/es-CL.mo Diff File
mod - locale/es-MX/LC_MESSAGES/es-MX.mo Diff File
mod - locale/es/LC_MESSAGES/es.mo Diff File
mod - locale/et/LC_MESSAGES/et.mo Diff File
mod - locale/eu/LC_MESSAGES/eu.mo Diff File
mod - locale/fa/LC_MESSAGES/fa.mo Diff File
mod - locale/fi/LC_MESSAGES/fi.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/ga/LC_MESSAGES/ga.mo Diff File
mod - locale/gl/LC_MESSAGES/gl.mo Diff File
mod - locale/he/LC_MESSAGES/he.mo Diff File
mod - locale/hi/LC_MESSAGES/hi.mo Diff File
mod - locale/hr/LC_MESSAGES/hr.mo Diff File
mod - locale/hu/LC_MESSAGES/hu.mo Diff File
mod - locale/id/LC_MESSAGES/id.mo Diff File
mod - locale/is/LC_MESSAGES/is.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/ko/LC_MESSAGES/ko.mo Diff File
mod - locale/lt/LC_MESSAGES/lt.mo Diff File
mod - locale/lv/LC_MESSAGES/lv.mo Diff File
mod - locale/mk/LC_MESSAGES/mk.mo Diff File
mod - locale/ms/LC_MESSAGES/ms.mo Diff File
mod - locale/mt/LC_MESSAGES/mt.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/nl-informal/LC_MESSAGES/nl-informal.mo Diff File
mod - locale/nl/LC_MESSAGES/nl.mo Diff File
mod - locale/nn/LC_MESSAGES/nn.mo Diff File
mod - locale/pa/LC_MESSAGES/pa.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/pt-BR/LC_MESSAGES/pt-BR.mo Diff File
mod - locale/pt/LC_MESSAGES/pt.mo Diff File
mod - locale/ro/LC_MESSAGES/ro.mo Diff File
mod - locale/ru/LC_MESSAGES/ru.mo Diff File
mod - locale/si/LC_MESSAGES/si.mo Diff File
mod - locale/sk/LC_MESSAGES/sk.mo Diff File
mod - locale/sl/LC_MESSAGES/sl.mo Diff File
mod - locale/sq/LC_MESSAGES/sq.mo Diff File
mod - locale/sr/LC_MESSAGES/sr.mo Diff File
mod - locale/sv/LC_MESSAGES/sv.mo Diff File
mod - locale/swh/LC_MESSAGES/swh.mo Diff File
mod - locale/th/LC_MESSAGES/th.mo Diff File
mod - locale/tr/LC_MESSAGES/tr.mo Diff File
mod - locale/uk/LC_MESSAGES/uk.mo Diff File
mod - locale/ur/LC_MESSAGES/ur.mo Diff File
mod - locale/vi/LC_MESSAGES/vi.mo Diff File
mod - locale/zh-Hans/LC_MESSAGES/zh-Hans.mo Diff File
mod - locale/zh-Hant-HK/LC_MESSAGES/zh-Hant-HK.mo Diff File
mod - locale/zh-Hant-TW/LC_MESSAGES/zh-Hant-TW.mo Diff File
mod - scripts/admin/ckeditor-config.js Diff File
mod - scripts/admin/listsurvey.js Diff File
mod - scripts/admin/statistics.js Diff File
mod - styles/blobblueish/adminstyle.css Diff File
add - styles/blobblueish/images/bounce_12.png Diff File
add - styles/blobblueish/jquery-ui/jquery-timepicker.css Diff File
rm - styles/blobblueish/jquery-ui/lime-progress.css Diff
add - styles/gartergrey/images/bounce_12.png Diff File
add - styles/gartergrey/jquery-ui/jquery-timepicker.css Diff File
rm - styles/gartergrey/jquery-ui/lime-progress.css Diff
add - tmp/upload/index.html Diff File

master e4675b91

2012-10-01 17:05

root


Details Diff		 Updated translation: Czech by slansky
Updated translation: German by c_schmitz
Updated translation: Estonian by klaster
Updated translation: Italian by lfanfoni
Updated translation: Norwegian (Bokmål) by peterhol
Updated translation: Polish by elisa
Updated translation: Serbian by MilaVeljovic
Updated translation: Turkish by kayazeren
Updated translation: Italian (Informal) by lfanfoni
mod - locale/_template/limesurvey.pot Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/et/LC_MESSAGES/et.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/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
mod - locale/tr/LC_MESSAGES/tr.mo Diff File

master 144d425a

2012-10-01 14:01

c_schmitz


Details Diff		 Fixed issue 06622: Error when opening template editor Affected Issues
06622
mod - application/helpers/replacements_helper.php Diff File

master 74ec1be9

2012-10-01 08:28

c_schmitz


Details Diff		 Fixed issue 06559: Batch emails to selected boxes not batching but trying to send to everyone Affected Issues
06559
mod - application/controllers/admin/tokens.php Diff File

master 625a3de8

2012-10-01 08:00

c_schmitz


Details Diff		 Fixed issue 06610: Security captcha does not accept valid values Affected Issues
06610
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/libraries/Save.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 900 ... 1050 ... 1070 1071 1072 1073 1074 1075 1076 ... 1200 ... 1350 ... 1465 1466 1467  Next  Last