LimeSurvey: master 1dd4ef50

Diff Back to Repository
Author Committer Branch Timestamp Parent
Marcel Minke Marcel Minke master 2012-04-26 08:35:21 master 8636f320
Changeset

Merge branch 'master' of https://maziminke@github.com/LimeSurvey/LimeSurvey.git
add - scripts/em_javascript.js Diff File
rm - classes/expressions/em_javascript.js Diff File
mod - admin/activate_functions.php Diff File
mod - admin/dataentry.php Diff File
mod - admin/html.php Diff File
mod - admin/importlabel.php Diff File
mod - admin/iterate_survey.php Diff File
mod - admin/login_check.php Diff File
mod - admin/questiongrouphandling.php Diff File
mod - admin/questionhandling.php Diff File
mod - admin/tokens.php Diff File
mod - admin/usercontrol.php Diff File
mod - classes/adodb/datadict/datadict-mssql.inc.php Diff File
mod - classes/adodb/datadict/datadict-mssqlnative.inc.php Diff File
mod - classes/expressions/LimeExpressionManager.php Diff File
mod - classes/expressions/test/navigation_test.php Diff File
mod - classes/expressions/test/relevance.php Diff File
mod - classes/expressions/test/unit.php Diff File
mod - common_functions.php Diff File
mod - config-defaults.php Diff File
mod - docs/release_notes.txt Diff File
mod - group.php Diff File
mod - index.php Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.po Diff File
mod - locale/da/LC_MESSAGES/da.mo Diff File
mod - locale/da/LC_MESSAGES/da.po Diff File
mod - locale/de-informal/LC_MESSAGES/de-informal.mo Diff File
mod - locale/de-informal/LC_MESSAGES/de-informal.po Diff File
mod - locale/de/LC_MESSAGES/de.mo Diff File
mod - locale/de/LC_MESSAGES/de.po Diff File
mod - locale/es-MX/LC_MESSAGES/es-MX.mo Diff File
mod - locale/es-MX/LC_MESSAGES/es-MX.po Diff File
mod - locale/fi/LC_MESSAGES/fi.mo Diff File
mod - locale/fi/LC_MESSAGES/fi.po Diff File
mod - locale/fr/LC_MESSAGES/fr.mo Diff File
mod - locale/fr/LC_MESSAGES/fr.po Diff File
mod - locale/gl/LC_MESSAGES/gl.mo Diff File
mod - locale/gl/LC_MESSAGES/gl.po Diff File
mod - locale/it/LC_MESSAGES/it.mo Diff File
mod - locale/it/LC_MESSAGES/it.po Diff File
mod - qanda.php Diff File
mod - replacements.php Diff File
mod - save.php Diff File
mod - scripts/jquery/jquery-ui.js Diff File
mod - scripts/modaldialog.js Diff File
mod - templates/basic/navigator.pstpl Diff File
mod - templates/basic/startpage.pstpl Diff File
mod - templates/citronade/template.js Diff File
mod - uploader.php Diff File