Skip to content

Commit

Permalink
Updated dev branch to agree with 1.92 RC4 release
Browse files Browse the repository at this point in the history
Fixes some previous merge attempts that failed to remove diff marks (so code did not run)

Below is the log of changes from the last two weeks.  Some of these may duplicate the original SVN to Git conversion (and subsequent merge) efforts:

+Changes from 1.92RC3 (build 12204) to 1.92RC4 (build 12453) Feb 14, 2012
+#Updated language: German (maziminke)
++New Feature Each type of validation tip can be styled separately (so if a question fails validation checks, you can see whether it is because of wrong number of answers, wrong value range, wrong sum range, or wrong regex criteria). (tmswhite)
++New feature #5780 : information when there are no match label set (shnoulle)
++New feature : javascript question type selector and Editarea template can be desactivated by user (shnoulle)
+-Fix for bug #05779: When "Edit this response" the responses from Array (Numbers) question type are lost (maziminke)
+-Fix: Added missing information about a token being required for sending invitations. (maziminke)
+-Fixed  issue #05772: Slider "total" and "remaining" values are not rounded (tmswhite)
+-Fixed PostgreSQL installation issues (c_schmitz)
+-Fixed casing for showxquestions field (c_schmitz)
+-Fixed casing on showxquestions field (c_schmitz)
+-Fixed issue  #05694: Map needs to be reset when shown by conditions/EM (tmswhite)
+-Fixed issue  #05768: In List with Comment type, if set to mandatory, the comment is also required (tmswhite)
+-Fixed issue #04948: "label for' tags for certain forms fields (ssachdeva)
+-Fixed issue #04948: "label for' tags for certain forms fields (tmswhite)
+-Fixed issue #05424: validation fails on mandatory comment field in list(radio) (tmswhite)
+-Fixed issue #05566: Survey and e-mails use different methods to include token data (tmswhite)
+-Fixed issue #05602: Graphs show wrong counts (ssachdeva)
+-Fixed issue #05679: Questions conditional upon previous questions do not appear until "Next" button is pressed (tmswhite)
+-Fixed issue #05690: Logic File does not show sub-question level default values (tmswhite)
+-Fixed issue #05696: Embedded JavaScript is fired when editing questions (tmswhite)
+-Fixed issue #05698: All question block have input-error class (tmswhite)
+-Fixed issue #05700: Cannot switch language to German-Informal (tmswhite)
+-Fixed issue #05702: Invalid question - probably missing sub-questions or language-specific settings for language en (tmswhite)
+-Fixed issue #05703: min_answers and max_answers for dual-scale are not correct (tmswhite)
+-Fixed issue #05704: Some missing Tips (tmswhite)
+-Fixed issue #05707: Users won't understand regular expression and equation-based validation tips (tmswhite)
+-Fixed issue #05708: Questions that fail validation criteria are colored red before user ever gets to it (tmswhite)
+-Fixed issue #05709: Validation tips not appearing for questions that have relevance equations (tmswhite)
+-Fixed issue #05711: Auto tab ordering no longer working (tmswhite)
+-Fixed issue #05716: How should equations referencing always-hidden variables be handled? (tmswhite)
+-Fixed issue #05725: Server crash (tmswhite)
+-Fixed issue #05726: Notices when testing survey (tmswhite)
+-Fixed issue #05730: Error in citronade Question template: 'squid' and 'aid' not found in replacement.php (tmswhite)
+-Fixed issue #05732: Warning: htmlspecialchars() expects at most 3 parameters (tmswhite)
+-Fixed issue #05736: At question type selection some sample images are not shown completely (ssachdeva)
+-Fixed issue #05744: EM introduces in-line .css changes (tmswhite)
+-Fixed issue #05748: If export a survey, delete it, then re-import it, get multiple undefined index errors (tmswhite)
+-Fixed issue #05753: Wrong question index marks (white) when using timer (tmswhite)
+-Fixed issue #05755: Validation tips do not appear if hide_tip option is used, even if there are errors (tmswhite)
+-Fixed issue #05759: Default date based on token gives incorrect result (tmswhite)
+-Fixed issue #05761: values from non-hidden equations are not written the the database (tmswhite)
+-Fixed issue #05765: other_numbers_only advanced question option not working (tmswhite)
+-Fixed issue #05769: In multiple choice question with comment, it always shows 'please also fill in "other comment" field' (tmswhite)
+-Fixed issue #05771: ExprMgr_process_relevance_and_tailoring need more and more time after page reload (tmswhite)
+-Fixed issue #05773: Preview image for question type "equation" missing (tmswhite)
+-Fixed issue #05777: performance issue: lots of irrelevant javacript is called with each onchange event (tmswhite)
+-Fixed issue #05782: Mandatory date doesn't block the survey if empty (tmswhite)
+-Fixed issue #05785: in all-in-one survey mode, questions whose tailoring depends entirely on out-of-group variables is not happening (tmswhite)
+-Fixed issue #05803: cascading equation calculations not working (tmswhite)
+-Fixed issue #05804: Equation question type does not work in all templates (tmswhite)
+-Fixed issue #05805: some question types do not accept negative numbers (tmswhite)
+-Fixed issue #5589: Error messages when user deletes himself (c_schmitz)
+-Fixed issue #5592: Wrong answer mapping for dual scale matrix in detailed admin notification email (c_schmitz)
+-Fixed issue #5648: Quota list of questions is not sorted (c_schmitz)
+-Fixed issue #5656: Problem to differentiate between normal survey participation and test mode (c_schmitz)
+-Fixed issue #5658: Notices when importing survey (c_schmitz)
+-Fixed issue #5675: Warning when using wrong formatted validation (c_schmitz)
+-Fixed issue #5688: Quota answers not in base language (c_schmitz)
+-Fixed issue #5695: When creating a survey 'List survey publicly' defaults to Yes instead of Np (c_schmitz)
+-Fixed issue #5734: Problem upgrading from 1.72 to 1.91+ (c_schmitz)
+-Fixed issue #5739: Wrong percentage in graphs with List with Comments question types (c_schmitz)
+-Fixed issue #5749: Wrong date conversion when using certain date formats (c_schmitz)
+-Fixed issue #5751: Quick translation - assignment problem with dual matrix (c_schmitz)
+-Fixed issue #5756: Activate Survey screen always in base survey language (c_schmitz)
+-Fixed issue #5743 : Unactivated JS for star rating system / Section 508 issue (shnoulle)
+-Fixed issue: SQL error on translation (shnoulle)
+-Fixed issue EM unable to recognize nested curly braces or curly braces within strings within curly braces (tmswhite)
+-Fixed issue LS stores entire fieldmap in session twice (so large memory consumption) (tmswhite)
+-Fixed issue Typo prevents display of save message in basic template (tmswhite)
+-Fixed issue Validation test survey shows all excluded options when first loaded, but they should start hidden. (tmswhite)
+-Fixed issue #05770: row-level missing mandatory annotations are not shown (tmswhite)
+-Fixed issue #05701: Exclusive option with more than one subquestion in multiple choice question doesn't work anymore (tmswhite)
  • Loading branch information
TMSWhite committed Feb 14, 2012
1 parent 25fe01b commit fa7fc0a
Show file tree
Hide file tree
Showing 201 changed files with 48,304 additions and 65,594 deletions.
130 changes: 65 additions & 65 deletions COPYRIGHT.php
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
<?php
/**
* LimeSurvey
* Copyright (C) 2010 The LimeSurvey Project Team / Carsten Schmitz
* All rights reserved.
* License: GNU/GPL License v2 or later, see LICENSE.php
* LimeSurvey is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* See COPYRIGHT.php for copyright notices and details.
*
* $Id$
*/

// no direct access
if (!isset($dbprefix) || isset($_REQUEST['dbprefix'])) {die("Cannot run this script directly");}
?>

LimeSurvey derives from copyrighted works licensed under the GNU General
Public License. This version has been modified pursuant to the GNU
General Public License as of August 5, 2007, and as distributed, it
includes or is derivative of works licensed under the GNU General Public
License or other free or open source software licenses, including works
copyrighted by any or all of the following, from 2003 through 2010:
Jason Cleeland, Carsten Schmitz, Thibault Le Meur, Josef Prandstetter,
Tony Partner, David Olivier, Gustavo San Roman, S�bastien Gaugry,
Esteban Adri�n P�rez, Gasper Koren, Yeung Kai Sun, Shawn Wales, Ronald
Leenes, Mario Marani, Darrel O'Pry, Marco Ermini, Patrick McKnight,
Chris Wessells, Johannes Kutsam, Livio Finos, Karyl Stein, Arjen
Gideonse, Nikolay Tsanov, Thomas Lee, Liang Zhao, Katarina Pavic, Mikkel
Skovgaard S�rensen, Rolf Njor Jensen, Johan Geertsma, Ronald Leenes,
Peter De Berdt, Patrick Drews, Peter Sereinigg, Artemis Mendrinos, David
Selmeczi, Gabriele Carioli, Masaru Ryumae, Odd-Jarle Kristoffersen,
Eirik Sunde, Rosaura Gazzola, Job Vieira L�cio, Bogdan Anastasiei,
Alexei G. Tchernov, Alexander Shilov, Gasper Koren, Luis M. Martinez,
Juan Rafael Fern�ndez, Jose Luis Ramirez, Bj�rn Mildh, Niklas Andersson,
Vinh Ngo and Mitchell Butler. LimeSurvey also includes or is derivative
of works distributed under the following copyright notices: PHPSurveyor
---- Copyright: Jason Cleeland, 2003 License: GNU General Public License
(GPL V2 or later) ADOdb ---- Copyright: John Lim, 2004 License: GNU
Lesser General Public License (LGPL) PHP-gettext ---- Copyright: Danilo
Segan, 2003, 2006 License: GNU General Public License (GPL V2 or later)

DHTML Calendar Widget ---- Copyright: Mihai Bazon, 2002-2005 License:
GNU Lesser General Public License (LGPL) Slider ---- Copyright: Erik
Arvidsson, 1999 - 2002 License: GNU General Public License SHA256 static
class ---- Copyright: Developer's Network (2005) Author: feyd _at_
devnetwork .dot. net License: GNU Lesser General Public License (LGPL)

tabPANE ---- Copyright: Emil A Eklund (2004) http://webfx.eae.net
License: Apache Software License 2.0 PEAR ---- Copyright: 1997-2004 The
PHP Group License: PHP license phpMailer ---- Copyright: 2001 - 2003
Brent R. Matzelle License: GNU Lesser General Public License (LGPL)

Sanitize Library ---- Copyright: 2002,2003 Free Software Foundation
License: GNU General Public License (GPL) TCPDF Class ---- Copyright:
2006 Nicola Asuni License: GNU Lesser General Public License (LGPL)

mint_idea Template ---- Copyright: David Kohout
http://www.davidkohout.cz License: GNU General Public License (GPL)

arPHP Class ---- Copyright: 2009 Khaled Al-Shamaa http://www.ar-php.org
License: GNU Lesser General Public License (LGPL)

<?php
/**
* LimeSurvey
* Copyright (C) 2010 The LimeSurvey Project Team / Carsten Schmitz
* All rights reserved.
* License: GNU/GPL License v2 or later, see LICENSE.php
* LimeSurvey is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
* other free or open source software licenses.
* See COPYRIGHT.php for copyright notices and details.
*
* $Id: COPYRIGHT.php 8540 2010-03-31 11:37:19Z texens $
*/

// no direct access
if (!isset($dbprefix) || isset($_REQUEST['dbprefix'])) {die("Cannot run this script directly");}
?>

LimeSurvey derives from copyrighted works licensed under the GNU General
Public License. This version has been modified pursuant to the GNU
General Public License as of August 5, 2007, and as distributed, it
includes or is derivative of works licensed under the GNU General Public
License or other free or open source software licenses, including works
copyrighted by any or all of the following, from 2003 through 2010:
Jason Cleeland, Carsten Schmitz, Thibault Le Meur, Josef Prandstetter,
Tony Partner, David Olivier, Gustavo San Roman, S�bastien Gaugry,
Esteban Adri�n P�rez, Gasper Koren, Yeung Kai Sun, Shawn Wales, Ronald
Leenes, Mario Marani, Darrel O'Pry, Marco Ermini, Patrick McKnight,
Chris Wessells, Johannes Kutsam, Livio Finos, Karyl Stein, Arjen
Gideonse, Nikolay Tsanov, Thomas Lee, Liang Zhao, Katarina Pavic, Mikkel
Skovgaard S�rensen, Rolf Njor Jensen, Johan Geertsma, Ronald Leenes,
Peter De Berdt, Patrick Drews, Peter Sereinigg, Artemis Mendrinos, David
Selmeczi, Gabriele Carioli, Masaru Ryumae, Odd-Jarle Kristoffersen,
Eirik Sunde, Rosaura Gazzola, Job Vieira L�cio, Bogdan Anastasiei,
Alexei G. Tchernov, Alexander Shilov, Gasper Koren, Luis M. Martinez,
Juan Rafael Fern�ndez, Jose Luis Ramirez, Bj�rn Mildh, Niklas Andersson,
Vinh Ngo and Mitchell Butler. LimeSurvey also includes or is derivative
of works distributed under the following copyright notices: PHPSurveyor
---- Copyright: Jason Cleeland, 2003 License: GNU General Public License
(GPL V2 or later) ADOdb ---- Copyright: John Lim, 2004 License: GNU
Lesser General Public License (LGPL) PHP-gettext ---- Copyright: Danilo
Segan, 2003, 2006 License: GNU General Public License (GPL V2 or later)

DHTML Calendar Widget ---- Copyright: Mihai Bazon, 2002-2005 License:
GNU Lesser General Public License (LGPL) Slider ---- Copyright: Erik
Arvidsson, 1999 - 2002 License: GNU General Public License SHA256 static
class ---- Copyright: Developer's Network (2005) Author: feyd _at_
devnetwork .dot. net License: GNU Lesser General Public License (LGPL)

tabPANE ---- Copyright: Emil A Eklund (2004) http://webfx.eae.net
License: Apache Software License 2.0 PEAR ---- Copyright: 1997-2004 The
PHP Group License: PHP license phpMailer ---- Copyright: 2001 - 2003
Brent R. Matzelle License: GNU Lesser General Public License (LGPL)

Sanitize Library ---- Copyright: 2002,2003 Free Software Foundation
License: GNU General Public License (GPL) TCPDF Class ---- Copyright:
2006 Nicola Asuni License: GNU Lesser General Public License (LGPL)

mint_idea Template ---- Copyright: David Kohout
http://www.davidkohout.cz License: GNU General Public License (GPL)

arPHP Class ---- Copyright: 2009 Khaled Al-Shamaa http://www.ar-php.org
License: GNU Lesser General Public License (LGPL)

2 comments on commit fa7fc0a

@kcivey
Copy link

@kcivey kcivey commented on fa7fc0a Feb 29, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line endings were changed in lots of files (config-defaults.php, for one) with this commit, so it's hard to see what the real changes are. Also makes it a pain to integrate changes from branches people created before this, since lines no longer match.

@c-schmitz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunate, but hey, we are all doing our first steps in Git ;).

Please sign in to comment.