LimeSurvey: 2.1 b92ffb7b

Diff Back to Repository
Author Committer Branch Timestamp Parent
c_schmitz c_schmitz 2.1 2012-12-03 11:23:28 2.1 754fe515
Changeset

Merge remote-tracking branch 'origin/2.1' into 2.1
mod - application/config/config-defaults.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/core/UserIdentity.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/modules/CheckQuestion.php Diff File
mod - application/modules/NumberArrayQuestion.php Diff File
mod - application/modules/RankingQuestion.php Diff File
mod - application/views/admin/token/remind.php Diff File
mod - scripts/admin/answers.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - third_party/ckeditor/CHANGES.html Diff File
mod - third_party/ckeditor/_source/core/ckeditor_base.js Diff File
mod - third_party/ckeditor/_source/core/dom/element.js Diff File
mod - third_party/ckeditor/_source/core/dom/event.js Diff File
mod - third_party/ckeditor/_source/core/dom/node.js Diff File
mod - third_party/ckeditor/_source/core/dom/range.js Diff File
mod - third_party/ckeditor/_source/core/dom/walker.js Diff File
mod - third_party/ckeditor/_source/core/lang.js Diff File
mod - third_party/ckeditor/_source/core/loader.js Diff File
mod - third_party/ckeditor/_source/core/tools.js Diff File
mod - third_party/ckeditor/_source/lang/_languages.js Diff File
mod - third_party/ckeditor/_source/lang/_translationstatus.txt Diff File
mod - third_party/ckeditor/_source/lang/af.js Diff File
mod - third_party/ckeditor/_source/lang/ar.js Diff File
mod - third_party/ckeditor/_source/lang/bg.js Diff File
mod - third_party/ckeditor/_source/lang/bn.js Diff File
mod - third_party/ckeditor/_source/lang/bs.js Diff File
mod - third_party/ckeditor/_source/lang/ca.js Diff File
mod - third_party/ckeditor/_source/lang/cs.js Diff File
mod - third_party/ckeditor/_source/lang/cy.js Diff File
mod - third_party/ckeditor/_source/lang/da.js Diff File
mod - third_party/ckeditor/_source/lang/de.js Diff File
mod - third_party/ckeditor/_source/lang/el.js Diff File
mod - third_party/ckeditor/_source/lang/en-au.js Diff File
mod - third_party/ckeditor/_source/lang/en-ca.js Diff File
mod - third_party/ckeditor/_source/lang/en-gb.js Diff File
mod - third_party/ckeditor/_source/lang/en.js Diff File
mod - third_party/ckeditor/_source/lang/eo.js Diff File
mod - third_party/ckeditor/_source/lang/es.js Diff File
mod - third_party/ckeditor/_source/lang/et.js Diff File
mod - third_party/ckeditor/_source/lang/eu.js Diff File
mod - third_party/ckeditor/_source/lang/fa.js Diff File
mod - third_party/ckeditor/_source/lang/fi.js Diff File
mod - third_party/ckeditor/_source/lang/fo.js Diff File
mod - third_party/ckeditor/_source/lang/fr-ca.js Diff File
mod - third_party/ckeditor/_source/lang/fr.js Diff File
mod - third_party/ckeditor/_source/lang/gl.js Diff File
mod - third_party/ckeditor/_source/lang/gu.js Diff File
mod - third_party/ckeditor/_source/lang/he.js Diff File
mod - third_party/ckeditor/_source/lang/hi.js Diff File
mod - third_party/ckeditor/_source/lang/hr.js Diff File
mod - third_party/ckeditor/_source/lang/hu.js Diff File
mod - third_party/ckeditor/_source/lang/id.js Diff File
mod - third_party/ckeditor/_source/lang/is.js Diff File
mod - third_party/ckeditor/_source/lang/it.js Diff File
mod - third_party/ckeditor/_source/lang/ja.js Diff File
mod - third_party/ckeditor/_source/lang/ka.js Diff File
mod - third_party/ckeditor/_source/lang/km.js Diff File
mod - third_party/ckeditor/_source/lang/ko.js Diff File
add - third_party/ckeditor/_source/lang/ku.js Diff File
mod - third_party/ckeditor/_source/lang/lt.js Diff File
mod - third_party/ckeditor/_source/lang/lv.js Diff File
mod - third_party/ckeditor/_source/lang/mk.js Diff File
mod - third_party/ckeditor/_source/lang/mn.js Diff File
mod - third_party/ckeditor/_source/lang/ms.js Diff File
mod - third_party/ckeditor/_source/lang/nb.js Diff File
mod - third_party/ckeditor/_source/lang/nl.js Diff File
mod - third_party/ckeditor/_source/lang/no.js Diff File
mod - third_party/ckeditor/_source/lang/pl.js Diff File
mod - third_party/ckeditor/_source/lang/pt-br.js Diff File
mod - third_party/ckeditor/_source/lang/pt.js Diff File
mod - third_party/ckeditor/_source/lang/ro.js Diff File
mod - third_party/ckeditor/_source/lang/ru.js Diff File
mod - third_party/ckeditor/_source/lang/sk.js Diff File
mod - third_party/ckeditor/_source/lang/sl.js Diff File
mod - third_party/ckeditor/_source/lang/sr-latn.js Diff File
mod - third_party/ckeditor/_source/lang/sr.js Diff File
mod - third_party/ckeditor/_source/lang/sv.js Diff File
mod - third_party/ckeditor/_source/lang/th.js Diff File
mod - third_party/ckeditor/_source/lang/tr.js Diff File
mod - third_party/ckeditor/_source/lang/ug.js Diff File
mod - third_party/ckeditor/_source/lang/uk.js Diff File
mod - third_party/ckeditor/_source/lang/vi.js Diff File
mod - third_party/ckeditor/_source/lang/zh-cn.js Diff File
mod - third_party/ckeditor/_source/lang/zh.js Diff File
mod - third_party/ckeditor/_source/plugins/a11yhelp/lang/_translationstatus.txt Diff File
mod - third_party/ckeditor/_source/plugins/a11yhelp/lang/fa.js Diff File
add - third_party/ckeditor/_source/plugins/a11yhelp/lang/ku.js Diff File
add - third_party/ckeditor/_source/plugins/a11yhelp/lang/sk.js Diff File
mod - third_party/ckeditor/_source/plugins/a11yhelp/lang/zh-cn.js Diff File
mod - third_party/ckeditor/_source/plugins/a11yhelp/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/autogrow/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/bbcode/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/devtools/lang/_translationstatus.txt Diff File
mod - third_party/ckeditor/_source/plugins/devtools/lang/fa.js Diff File
add - third_party/ckeditor/_source/plugins/devtools/lang/ku.js Diff File
add - third_party/ckeditor/_source/plugins/devtools/lang/sk.js Diff File
mod - third_party/ckeditor/_source/plugins/devtools/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/dialog/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/dialogadvtab/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/htmldataprocessor/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/image/dialogs/image.js Diff File
mod - third_party/ckeditor/_source/plugins/link/dialogs/anchor.js Diff File
mod - third_party/ckeditor/_source/plugins/link/dialogs/link.js Diff File
mod - third_party/ckeditor/_source/plugins/list/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/placeholder/lang/_translationstatus.txt Diff File
mod - third_party/ckeditor/_source/plugins/placeholder/lang/fa.js Diff File
add - third_party/ckeditor/_source/plugins/placeholder/lang/ku.js Diff File
add - third_party/ckeditor/_source/plugins/placeholder/lang/sk.js Diff File
mod - third_party/ckeditor/_source/plugins/placeholder/lang/zh-cn.js Diff File
mod - third_party/ckeditor/_source/plugins/placeholder/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/selection/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/smiley/dialogs/smiley.js Diff File
mod - third_party/ckeditor/_source/plugins/specialchar/dialogs/specialchar.js Diff File
mod - third_party/ckeditor/_source/plugins/specialchar/lang/_translationstatus.txt Diff File
mod - third_party/ckeditor/_source/plugins/specialchar/lang/fa.js Diff File
add - third_party/ckeditor/_source/plugins/specialchar/lang/ku.js Diff File
mod - third_party/ckeditor/_source/plugins/styles/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/tableresize/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/tabletools/plugin.js Diff File
add - third_party/ckeditor/_source/plugins/toolbar/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/uicolor/lang/_translationstatus.txt Diff File
mod - third_party/ckeditor/_source/plugins/uicolor/lang/fa.js Diff File
add - third_party/ckeditor/_source/plugins/uicolor/lang/ku.js Diff File
add - third_party/ckeditor/_source/plugins/uicolor/lang/sk.js Diff File
mod - third_party/ckeditor/_source/plugins/uicolor/lang/zh-cn.js Diff File
mod - third_party/ckeditor/_source/plugins/uicolor/plugin.js Diff File
mod - third_party/ckeditor/_source/plugins/wysiwygarea/plugin.js Diff File
mod - third_party/ckeditor/ckeditor.asp Diff File
mod - third_party/ckeditor/ckeditor.js Diff File
mod - third_party/ckeditor/ckeditor_basic.js Diff File
mod - third_party/ckeditor/ckeditor_basic_source.js Diff File
mod - third_party/ckeditor/ckeditor_php4.php Diff File
mod - third_party/ckeditor/ckeditor_php5.php Diff File
mod - third_party/ckeditor/ckeditor_source.js Diff File
mod - third_party/ckeditor/lang/_languages.js Diff File
mod - third_party/ckeditor/lang/_translationstatus.txt Diff File
mod - third_party/ckeditor/lang/af.js Diff File
mod - third_party/ckeditor/lang/ar.js Diff File
mod - third_party/ckeditor/lang/bg.js Diff File
mod - third_party/ckeditor/lang/bn.js Diff File
mod - third_party/ckeditor/lang/bs.js Diff File
mod - third_party/ckeditor/lang/ca.js Diff File
mod - third_party/ckeditor/lang/cs.js Diff File
mod - third_party/ckeditor/lang/cy.js Diff File
mod - third_party/ckeditor/lang/da.js Diff File
mod - third_party/ckeditor/lang/de.js Diff File
mod - third_party/ckeditor/lang/el.js Diff File
mod - third_party/ckeditor/lang/en-au.js Diff File
mod - third_party/ckeditor/lang/en-ca.js Diff File
mod - third_party/ckeditor/lang/en-gb.js Diff File
mod - third_party/ckeditor/lang/en.js Diff File
mod - third_party/ckeditor/lang/eo.js Diff File
mod - third_party/ckeditor/lang/es.js Diff File
mod - third_party/ckeditor/lang/et.js Diff File
mod - third_party/ckeditor/lang/eu.js Diff File
mod - third_party/ckeditor/lang/fa.js Diff File
mod - third_party/ckeditor/lang/fi.js Diff File
mod - third_party/ckeditor/lang/fo.js Diff File
mod - third_party/ckeditor/lang/fr-ca.js Diff File
mod - third_party/ckeditor/lang/fr.js Diff File
mod - third_party/ckeditor/lang/gl.js Diff File
mod - third_party/ckeditor/lang/gu.js Diff File
mod - third_party/ckeditor/lang/he.js Diff File
mod - third_party/ckeditor/lang/hi.js Diff File
mod - third_party/ckeditor/lang/hr.js Diff File
mod - third_party/ckeditor/lang/hu.js Diff File
mod - third_party/ckeditor/lang/id.js Diff File
mod - third_party/ckeditor/lang/is.js Diff File
mod - third_party/ckeditor/lang/it.js Diff File
mod - third_party/ckeditor/lang/ja.js Diff File
mod - third_party/ckeditor/lang/ka.js Diff File
mod - third_party/ckeditor/lang/km.js Diff File
mod - third_party/ckeditor/lang/ko.js Diff File
add - third_party/ckeditor/lang/ku.js Diff File
mod - third_party/ckeditor/lang/lt.js Diff File
mod - third_party/ckeditor/lang/lv.js Diff File
mod - third_party/ckeditor/lang/mk.js Diff File
mod - third_party/ckeditor/lang/mn.js Diff File
mod - third_party/ckeditor/lang/ms.js Diff File
mod - third_party/ckeditor/lang/nb.js Diff File
mod - third_party/ckeditor/lang/nl.js Diff File
mod - third_party/ckeditor/lang/no.js Diff File
mod - third_party/ckeditor/lang/pl.js Diff File
mod - third_party/ckeditor/lang/pt-br.js Diff File
mod - third_party/ckeditor/lang/pt.js Diff File
mod - third_party/ckeditor/lang/ro.js Diff File
mod - third_party/ckeditor/lang/ru.js Diff File
mod - third_party/ckeditor/lang/sk.js Diff File
mod - third_party/ckeditor/lang/sl.js Diff File
mod - third_party/ckeditor/lang/sr-latn.js Diff File
mod - third_party/ckeditor/lang/sr.js Diff File
mod - third_party/ckeditor/lang/sv.js Diff File
mod - third_party/ckeditor/lang/th.js Diff File
mod - third_party/ckeditor/lang/tr.js Diff File
mod - third_party/ckeditor/lang/ug.js Diff File
mod - third_party/ckeditor/lang/uk.js Diff File
mod - third_party/ckeditor/lang/vi.js Diff File
mod - third_party/ckeditor/lang/zh-cn.js Diff File
mod - third_party/ckeditor/lang/zh.js Diff File
mod - third_party/ckeditor/plugins/a11yhelp/lang/_translationstatus.txt Diff File
mod - third_party/ckeditor/plugins/a11yhelp/lang/fa.js Diff File
add - third_party/ckeditor/plugins/a11yhelp/lang/ku.js Diff File
add - third_party/ckeditor/plugins/a11yhelp/lang/sk.js Diff File
mod - third_party/ckeditor/plugins/a11yhelp/lang/zh-cn.js Diff File
mod - third_party/ckeditor/plugins/autogrow/plugin.js Diff File
mod - third_party/ckeditor/plugins/bbcode/plugin.js Diff File
mod - third_party/ckeditor/plugins/devtools/lang/_translationstatus.txt Diff File
mod - third_party/ckeditor/plugins/devtools/lang/fa.js Diff File
add - third_party/ckeditor/plugins/devtools/lang/ku.js Diff File
add - third_party/ckeditor/plugins/devtools/lang/sk.js Diff File
mod - third_party/ckeditor/plugins/devtools/plugin.js Diff File
mod - third_party/ckeditor/plugins/image/dialogs/image.js Diff File
mod - third_party/ckeditor/plugins/link/dialogs/anchor.js Diff File
mod - third_party/ckeditor/plugins/link/dialogs/link.js Diff File
mod - third_party/ckeditor/plugins/placeholder/lang/_translationstatus.txt Diff File
mod - third_party/ckeditor/plugins/placeholder/lang/fa.js Diff File
add - third_party/ckeditor/plugins/placeholder/lang/ku.js Diff File
add - third_party/ckeditor/plugins/placeholder/lang/sk.js Diff File
mod - third_party/ckeditor/plugins/placeholder/lang/zh-cn.js Diff File
mod - third_party/ckeditor/plugins/placeholder/plugin.js Diff File
mod - third_party/ckeditor/plugins/smiley/dialogs/smiley.js Diff File
mod - third_party/ckeditor/plugins/specialchar/dialogs/specialchar.js Diff File
mod - third_party/ckeditor/plugins/specialchar/lang/_translationstatus.txt Diff File
mod - third_party/ckeditor/plugins/specialchar/lang/fa.js Diff File
add - third_party/ckeditor/plugins/specialchar/lang/ku.js Diff File
mod - third_party/ckeditor/plugins/tableresize/plugin.js Diff File
mod - third_party/ckeditor/plugins/uicolor/lang/_translationstatus.txt Diff File
mod - third_party/ckeditor/plugins/uicolor/lang/fa.js Diff File
add - third_party/ckeditor/plugins/uicolor/lang/ku.js Diff File
add - third_party/ckeditor/plugins/uicolor/lang/sk.js Diff File
mod - third_party/ckeditor/plugins/uicolor/lang/zh-cn.js Diff File
mod - third_party/ckeditor/plugins/uicolor/plugin.js Diff File