Changesets: LimeSurvey

master eabff364

2012-11-22 15:11

c_schmitz


Details Diff
Fixed issue 06886: Admin password re-set after language changed and using Postgres Affected Issues
06886
mod - application/core/UserIdentity.php Diff File
mod - application/models/User.php Diff File

2.1 abad9fa1

2012-11-22 15:11

c_schmitz


Details Diff
Fixed issue 06886: Admin password re-set after language changed and using Postgres Affected Issues
06886
mod - application/core/UserIdentity.php Diff File
mod - application/models/User.php Diff File

master 18100d10

2012-11-22 14:38

c_schmitz


Details Diff
Fixed issue 06909: Incorrect group order while copying question Affected Issues
06909
mod - application/helpers/common_helper.php Diff File
mod - application/views/admin/token/browse.php Diff File

2.1 2dbc8018

2012-11-22 14:38

c_schmitz


Details Diff
Fixed issue 06909: Incorrect group order while copying question Affected Issues
06909
mod - application/helpers/common_helper.php Diff File
mod - application/views/admin/token/browse.php Diff File

master d0985662

2012-11-22 14:30

c_schmitz


Details Diff
Fixed issue 06905: Additional token attributes are displayed by fieldname when browsing tokens Affected Issues
06905
mod - application/views/admin/token/browse.php Diff File

2.1 c7ce9249

2012-11-22 14:30

c_schmitz


Details Diff
Fixed issue 06905: Additional token attributes are displayed by fieldname when browsing tokens Affected Issues
06905
mod - application/views/admin/token/browse.php Diff File

2.1 10747ba1

2012-11-22 11:38

jcleeland


Details Diff
Merge branch '2.1' of https://github.com/LimeSurvey/LimeSurvey into 2.1
mod - application/config/config-defaults.php Diff File
add - application/config/config-sample-pgsql.php Diff File
add - application/config/config-sample-sqlsrv.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/VerificationController.php Diff File
mod - application/controllers/admin/authentication.php Diff File
mod - application/controllers/admin/checkintegrity.php Diff File
mod - application/controllers/admin/conditionsaction.php Diff File
mod - application/controllers/admin/database.php Diff File
mod - application/controllers/admin/dumpdb.php Diff File
mod - application/controllers/admin/expressions.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/questiongroup.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/translate.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/UserIdentity.php Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/htmleditor_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
mod - application/helpers/globalsettings_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/Save.php Diff File
mod - application/libraries/admin/pear/OLE/OLE.php Diff File
mod - application/libraries/admin/pear/OLE/PPS.php Diff File
mod - application/libraries/admin/pear/OLE/PPS/File.php Diff File
mod - application/libraries/admin/pear/OLE/PPS/Root.php Diff File
mod - application/libraries/admin/pear/Spreadsheet/Excel/Writer/BIFFwriter.php Diff File
mod - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Format.php Diff File
mod - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Parser.php Diff File
mod - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Workbook.php Diff File
mod - application/libraries/admin/pear/Spreadsheet/Excel/Writer/Worksheet.php Diff File
mod - application/libraries/jsonRPCClient.php Diff File
mod - application/models/Failed_login_attempts.php Diff File
mod - application/models/Participants.php Diff File
mod - application/models/User.php Diff File
mod - application/modules/CheckQuestion.php Diff File
mod - application/modules/CommentCheckQuestion.php Diff File
mod - application/modules/CommentListQuestion.php Diff File
mod - application/modules/ListQuestion.php Diff File
mod - application/modules/NumericalQuestion.php Diff File
mod - application/modules/QuestionModule.php Diff File
mod - application/modules/SelectQuestion.php Diff File
mod - application/modules/ShortTextQuestion.php Diff File
mod - application/modules/TextQuestion.php Diff File
mod - application/views/admin/globalSettings_view.php Diff File
mod - application/views/admin/participants/blacklist_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/survey/Question/editQuestion_view.php Diff File
mod - application/views/admin/survey/Question/editdefaultvalues_view.php Diff File
mod - application/views/admin/token/ldapform.php Diff File
mod - application/views/admin/token/ldappost.php Diff File
mod - scripts/admin/admin_core.js Diff File
mod - scripts/admin/globalsettings.js Diff File
mod - scripts/admin/subquestions.js Diff File
mod - scripts/admin/updateset.js Diff File
mod - styles/gringegreen/adminstyle.css Diff File
mod - templates/citronade/startpage.pstpl Diff File
mod - templates/citronade/template.css Diff File

2.1 141fab9a

2012-11-22 11:37

jcleeland


Details Diff
Fixed issue 06615 - Browsing text answer results with the browse button does nothing. Fixed filtering for text browsing Affected Issues
06615
mod - application/controllers/admin/statistics.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File

2.1 fbb5eaf5

2012-11-22 10:57

mdekker


Details Diff
Fixed 06920: CDbException when checking data integrity Affected Issues
06920
mod - application/controllers/admin/checkintegrity.php Diff File

master 5bb63b29

2012-11-22 10:55

mdekker


Details Diff
Fixed 06920: CDbException when checking data integrity Affected Issues
06920
mod - application/controllers/admin/checkintegrity.php Diff File

master 75bd833e

2012-11-22 00:06

LimeSurvey Translations Bot


Details Diff
Updated translation: Catalan by valdomir
Updated translation: Czech by slansky, pavelwil
Updated translation: Spanish (Spain) by valdomir, larjona
Updated translation: Lithuanian by serzas, simasj
Updated translation: Polish by elisa
mod - locale/_template/limesurvey.pot Diff File
mod - locale/ca/LC_MESSAGES/ca.mo Diff File
mod - locale/cs/LC_MESSAGES/cs.mo Diff File
mod - locale/es/LC_MESSAGES/es.mo Diff File
mod - locale/lt/LC_MESSAGES/lt.mo Diff File
mod - locale/pl/LC_MESSAGES/pl.mo Diff File

2.1 66a99947

2012-11-21 22:10

c_schmitz


Details Diff
Merge remote-tracking branch 'origin/2.1' into 2.1
mod - application/controllers/admin/expressions.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/modules/CheckQuestion.php Diff File
mod - application/modules/CommentCheckQuestion.php Diff File
mod - application/modules/NumericalQuestion.php Diff File
mod - application/modules/QuestionModule.php Diff File
mod - templates/citronade/startpage.pstpl Diff File
mod - templates/citronade/template.css Diff File

master 51851c50

2012-11-21 19:54

DenisChenu


Details Diff
Fixed issue #6754: column style for citronade template
Dev: reworked completely
mod - templates/citronade/startpage.pstpl Diff File
mod - templates/citronade/template.css Diff File

2.1 ad161f12

2012-11-21 19:54

DenisChenu


Details Diff
Fixed issue #6754: column style for citronade template
Dev: reworked completely
mod - templates/citronade/startpage.pstpl Diff File
mod - templates/citronade/template.css Diff File

2.1 065a9d09

2012-11-21 18:31

DenisChenu


Details Diff
Dev: Be sure is set sq (needed ?)
mod - application/modules/CheckQuestion.php Diff File

2.1 1b47394f

2012-11-21 17:51

DenisChenu


Details Diff
Fixed issue 06854: INSERTANS or .shown not working for comment on Multiple options with comments
Fixed issue: EM return code for single choice question .shown
Affected Issues
06854
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/modules/CheckQuestion.php Diff File
mod - application/modules/CommentCheckQuestion.php Diff File
mod - application/modules/QuestionModule.php Diff File

2.1 7a7e31eb

2012-11-21 17:06

c_schmitz


Details Diff
Dev Refactoring variable names and adding preliminary phpdoc function headers
mod - application/controllers/Statistics_userController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/VerificationController.php Diff File
mod - application/controllers/survey/index.php Diff File

2.1 4b3fb4d7

2012-11-21 16:03

DenisChenu


Details Diff
Dev : not needed
mod - application/helpers/common_helper.php Diff File

2.1 8c119124

2012-11-21 16:01

DenisChenu


Details Diff
Merge branch '2.1' of github.com:LimeSurvey/LimeSurvey into 2.1
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File

2.1 a7018f1a

2012-11-21 16:00

DenisChenu


Details Diff
Fixed issue 06859: Integer values displayed as floating point numbers
Fixed issue: Can add dot on integer only numerci question type
Dev: remove all ending 0 to numeric question type, and remove the . if it's at ending
Dev: TODO : move control of numeric/integer in clean external js
Affected Issues
06859
mod - application/helpers/common_helper.php Diff File
mod - application/modules/NumericalQuestion.php Diff File

2.1 0c8fc79f

2012-11-21 15:40

c_schmitz


Details Diff
Merge remote-tracking branch 'origin/2.1' into 2.1
mod - application/config/config-sample-mysql.php Diff File
mod - application/config/config-sample-pgsql.php Diff File
mod - application/config/config-sample-sqlsrv.php Diff File
mod - application/modules/NumericalQuestion.php Diff File

2.1 ed01b497

2012-11-21 15:21

DenisChenu


Details Diff
Fixed issue 06859: Integer values displayed as floating point numbers
Dev: rework on getExtendedAnswer of questionModule
Affected Issues
06859
mod - application/modules/NumericalQuestion.php Diff File

master fffc49a4

2012-11-21 14:27

DenisChenu


Details Diff
Fixed issue 06854: INSERTANS or .shown not working for comment on Multiple options with comments
Dev: old SESSION system (from 1.92), replace with $code like text question type
Dev: have another issue with THIS survey
Affected Issues
06854
mod - application/helpers/expressions/em_manager_helper.php Diff File

2.1 403d515e

2012-11-21 14:02

c_schmitz


Details Diff
Dev Refactoring variable names and adding preliminary phpdoc function headers
mod - application/controllers/InstallerController.php Diff File
mod - application/controllers/OptinController.php Diff File
mod - application/controllers/OptoutController.php Diff File
mod - application/controllers/PrintanswersController.php Diff File
mod - application/controllers/RegisterController.php Diff File

master a3fd824b

2012-11-21 13:13

DenisChenu


Details Diff
Dev: survey_logic_file need jquery-ui.js (some console error log else)
mod - application/controllers/admin/expressions.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 900 ... 1043 1044 1045 1046 1047 1048 1049 1050 ... 1200 ... 1350 ... 1465 1466 1467  Next  Last