Changesets: LimeSurvey

master 350a0f4a

2013-05-27 15:20

mdekker


Details Diff
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git
add - application/commands/ResetPasswordCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/admin/authentication.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/printablesurvey.php Diff File
mod - application/controllers/admin/questiongroup.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_Validators.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/exportresults_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
add - application/helpers/pdfHelper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/viewHelper.php Diff File
add - application/libraries/LSjsonRPCServer.php Diff File
mod - application/libraries/admin/pdf.php Diff File
mod - application/models/Tokens_dynamic.php Diff File
mod - application/models/User.php Diff File
mod - application/views/admin/dataentry/iteratesurvey.php Diff File
mod - application/views/admin/export/statistics_view.php Diff File
mod - application/views/admin/responses/browseallheader_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/subQuestion_view.php Diff File
mod - application/views/admin/survey/surveybar_view.php Diff File
mod - application/views/admin/token/browse.php Diff File
mod - application/views/admin/token/csvpost.php Diff File
mod - docs/release_notes.txt 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/ca/LC_MESSAGES/ca.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/cy/LC_MESSAGES/cy.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/es-AR-informal/LC_MESSAGES/es-AR-informal.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/fi/LC_MESSAGES/fi.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/gl/LC_MESSAGES/gl.mo Diff File
mod - locale/hr/LC_MESSAGES/hr.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/mn/LC_MESSAGES/mn.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
add - locale/oc/LC_MESSAGES/index.html Diff File
add - locale/oc/LC_MESSAGES/oc.mo Diff File
add - locale/oc/index.html Diff File
mod - locale/pl/LC_MESSAGES/pl.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/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 - locale/uk/LC_MESSAGES/uk.mo Diff File
mod - locale/zh-Hans/LC_MESSAGES/zh-Hans.mo Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/jquery/lime-conditions-tabs.js Diff File
mod - scripts/ranking.js Diff File
mod - styles-public/ranking.css Diff File
add - styles/blobblueish/images/iterate_disabled.png Diff File
add - styles/blobblueish/images/takeownership.png Diff File
add - styles/gartergrey/images/iterate_disabled.png Diff File
add - styles/gartergrey/images/takeownership.png Diff File
add - styles/gringegreen/images/iterate_disabled.png Diff File
mod - templates/basic/ie_fix_7.css Diff File
mod - templates/basic/template.css Diff File
mod - templates/bluengrey/ie_fix_7.css Diff File
mod - templates/bluengrey/template.css Diff File
mod - templates/clear_logo/ie_fix_7.css Diff File
mod - templates/clear_logo/template.css Diff File
mod - templates/default/ie_fix_7.css Diff File
mod - templates/default/template.css Diff File
mod - templates/eirenicon/ie_fix_7.css Diff File
mod - templates/eirenicon/template.css Diff File
mod - templates/limespired/ie_fix_7.css Diff File
mod - templates/limespired/template.css Diff File
mod - templates/mint_idea/ie_fix_7.css Diff File
mod - templates/mint_idea/template.css Diff File
mod - templates/sherpa/ie_fix_7.css Diff File
mod - templates/sherpa/template.css Diff File
mod - templates/vallendar/ie_fix_7.css Diff File
mod - templates/vallendar/template.css Diff File

master 63a098b3

2013-05-27 14:50

jbinard


Details Diff
Escape double quotes in R export
mod - application/controllers/admin/export.php Diff File

master 9ce0f31f

2013-05-27 00:11

c_schmitz


Details Diff
Fixed issue #7865: Cannot filter tokens by reminder field
mod - application/models/Tokens_dynamic.php Diff File
mod - application/views/admin/token/browse.php Diff File

master 2b83c3a8

2013-05-27 00:05

LimeSurvey Translations Bot


Details Diff
Updated translation: Arabic by samiubuntu, ysaad
Updated translation: Norwegian (Bokmål) by pmonstad
Updated translation: Norwegian (Nynorsk) by pmonstad
mod - locale/ar/LC_MESSAGES/ar.mo Diff File
mod - locale/nb/LC_MESSAGES/nb.mo Diff File
mod - locale/nn/LC_MESSAGES/nn.mo Diff File

master 2c05f828

2013-05-27 00:05

c_schmitz


Details Diff
Fixed issue 07866: The statistics page crashes when you click the "Clear" button Affected Issues
07866
mod - application/views/admin/export/statistics_view.php Diff File

2.05 2e905626

2013-05-27 00:05

c_schmitz


Details Diff
Fixed issue 07866: The statistics page crashes when you click the "Clear" button Affected Issues
07866
mod - application/views/admin/export/statistics_view.php Diff File

master 65d9ee66

2013-05-26 22:44

c_schmitz


Details Diff
Fixed issue 07073: Rubbish text after upgrading in ComfortUpdate step 4 Affected Issues
07073
mod - application/controllers/admin/update.php Diff File

2.05 fa89f194

2013-05-26 22:44

c_schmitz


Details Diff
Fixed issue 07073: Rubbish text after upgrading in ComfortUpdate step 4 Affected Issues
07073
mod - application/controllers/admin/update.php Diff File

master 3c94058f

2013-05-26 22:23

c_schmitz


Details Diff
Merge remote-tracking branch 'origin/master'
mod - application/config/config-defaults.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/responses.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_Validators.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/exportresults_helper.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
add - application/helpers/pdfHelper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/viewHelper.php Diff File
add - application/libraries/LSjsonRPCServer.php Diff File
mod - application/views/admin/responses/browseallheader_view.php Diff File
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - application/views/admin/token/csvpost.php Diff File
mod - docs/release_notes.txt 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/cy/LC_MESSAGES/cy.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/es/LC_MESSAGES/es.mo Diff File
mod - locale/eu/LC_MESSAGES/eu.mo Diff File
mod - locale/fi/LC_MESSAGES/fi.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/ja/LC_MESSAGES/ja.mo Diff File
mod - locale/mn/LC_MESSAGES/mn.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/oc/LC_MESSAGES/oc.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File
mod - locale/pt/LC_MESSAGES/pt.mo Diff File
mod - locale/sk/LC_MESSAGES/sk.mo Diff File
mod - locale/sv/LC_MESSAGES/sv.mo Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/ranking.js Diff File
mod - styles-public/ranking.css Diff File
mod - templates/basic/ie_fix_7.css Diff File
mod - templates/basic/template.css Diff File
mod - templates/bluengrey/ie_fix_7.css Diff File
mod - templates/bluengrey/template.css Diff File
mod - templates/clear_logo/ie_fix_7.css Diff File
mod - templates/clear_logo/template.css Diff File
mod - templates/default/ie_fix_7.css Diff File
mod - templates/default/template.css Diff File
mod - templates/eirenicon/ie_fix_7.css Diff File
mod - templates/eirenicon/template.css Diff File
mod - templates/limespired/ie_fix_7.css Diff File
mod - templates/limespired/template.css Diff File
mod - templates/mint_idea/ie_fix_7.css Diff File
mod - templates/mint_idea/template.css Diff File
mod - templates/sherpa/ie_fix_7.css Diff File
mod - templates/sherpa/template.css Diff File
mod - templates/vallendar/ie_fix_7.css Diff File
mod - templates/vallendar/template.css Diff File

master 94ae5445

2013-05-26 22:22

c_schmitz


Details Diff
Fixed issue: Memory issue for database backup during ComfortUpdate
mod - application/config/config-defaults.php Diff File
mod - application/controllers/admin/update.php Diff File

2.05 caab90e6

2013-05-26 22:22

c_schmitz


Details Diff
Fixed issue: Memory issue for database backup during ComfortUpdate
mod - application/config/config-defaults.php Diff File
mod - application/controllers/admin/update.php Diff File

master c72d10f7

2013-05-26 20:53

c_schmitz


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

master 77945432

2013-05-26 00:05

LimeSurvey Translations Bot


Details Diff
Updated translation: Greek by kiolalis
Updated translation: French (France) by DenisChenu
Updated translation: Norwegian (Bokmål) by pmonstad
Updated translation: Dutch by Han
Updated translation: Norwegian (Nynorsk) by pmonstad
Updated translation: Dutch (Informal) by Han
mod - locale/el/LC_MESSAGES/el.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.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

master be9c490e

2013-05-25 00:05

LimeSurvey Translations Bot


Details Diff
Updated translation: German by c_schmitz
Updated translation: French (France) by DenisChenu
Updated translation: Norwegian (Bokmål) by pmonstad
Updated translation: Norwegian (Nynorsk) by pmonstad
Updated translation: Portuguese (Portugal) by samarta
Updated translation: German (Informal) by c_schmitz
mod - locale/_template/limesurvey.pot Diff File
mod - locale/de-informal/LC_MESSAGES/de-informal.mo 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
mod - locale/nn/LC_MESSAGES/nn.mo Diff File
mod - locale/pt/LC_MESSAGES/pt.mo Diff File

2.2 61cd15d1

2013-05-24 19:52

mfaber

Committer: mfaber


Details Diff
twig
mod - templates/twig_default/welcome.twig Diff File

master 807dfb88

2013-05-24 17:09

jweberhofer


Details Diff
Fixed a bug validating the input parameters
mod - application/helpers/expressions/em_core_helper.php Diff File

2.05 835c612e

2013-05-24 14:23

sammousa


Details Diff
Dev Fixed HtmlWriter to not export NULLed questions.
mod - application/helpers/admin/export/HtmlWriter.php Diff File

2.05 b4708f5c

2013-05-24 11:00

DenisChenu


Details Diff
Fixed issue : don't translate mandatory column at token upload
Dev: mandatory column must be in english
Dev: remove some br, because br are not needed (use css)
mod - application/views/admin/token/csvpost.php Diff File

master 0c396768

2013-05-24 10:55

DenisChenu


Details Diff
Fixed issue : don't translate mandatory column at token upload
Dev: mandatory column must be in english
mod - application/views/admin/token/csvpost.php Diff File

master 20f57bee

2013-05-24 00:05

LimeSurvey Translations Bot


Details Diff
Updated translation: Mongolian by erka
mod - locale/_template/limesurvey.pot Diff File
mod - locale/mn/LC_MESSAGES/mn.mo Diff File

2.05 854d3c3e

2013-05-23 18:35

DenisChenu


Details Diff
Fixed issue : Relevance equation seems to be editable even if not.
Dev: add a test if condition exist
Affected Issues
08137, 08174
mod - application/controllers/admin/questions.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File

master 25016243

2013-05-23 14:28

c_schmitz


Details Diff
Fixed issue: Relevane equation hints not translated Affected Issues
07264
mod - application/controllers/AdminController.php Diff File
mod - application/core/Survey_Common_Action.php Diff File

2.05 28e0e8f7

2013-05-23 14:28

c_schmitz


Details Diff
Fixed issue: Relevane equation hints not translated
mod - application/controllers/AdminController.php Diff File
mod - application/core/Survey_Common_Action.php Diff File

master 0a721430

2013-05-23 13:23

c_schmitz


Details Diff
Fixed issue: Untranslated strings when creating label sets from answer options/subquestions
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/subquestions.js Diff File

2.05 be36e71c

2013-05-23 13:23

c_schmitz


Details Diff
Fixed issue: Untranslated strings when creating label sets from answer options/subquestions
mod - application/views/admin/survey/Question/answerOptions_view.php Diff File
mod - application/views/admin/survey/Question/subQuestion_view.php Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/subquestions.js Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 900 ... 970 971 972 973 974 975 976 ... 1050 ... 1200 ... 1350 ... 1471 1472 1473  Next  Last