Changesets: LimeSurvey

2.5 1569ef5f

2015-12-22 10:07

LouisGac


Details Diff
Fixed issue 10106: save advancedsettings while copying question Affected Issues
10106
mod - application/controllers/admin/database.php Diff File
mod - application/views/admin/survey/Question/questionbar_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/nquestiongroupbar_view.php Diff File
mod - scripts/admin/admin_core.js Diff File
mod - styles/Sea_Green/css/.sass-cache/b8ed5539e8363b254e7afde4b3c4cf41319c881d/lime-admin.scssc Diff File
mod - styles/Sea_Green/css/lime-admin.css.map Diff File

master 5c452758

2015-12-22 08:58

mdekker


Details Diff
Update internal.php

Console was broken due to clientScript
Affected Issues
10176, 10199
mod - application/config/internal.php Diff File

2.5 85abd6cd

2015-12-21 17:51

LouisGac


Details Diff
Dev: auto open configuration menu
mod - scripts/admin/admin_core.js Diff File

2.5 65ccaca3

2015-12-21 17:35

LouisGac


Details Diff
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5
mod - application/helpers/frontend_helper.php Diff File

master 149f9ae7

2015-12-21 17:17

DenisChenu


Details Diff
Merge pull request #364 from weberhofer/error_on_update_fixKCFinder184

Fixed issue : Problem in update deletable files are not present
mod - application/helpers/update/updatedb_helper.php Diff File

2.5 7eae70d2

2015-12-21 17:04

LouisGac


Details Diff
Dev: legend
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/views/admin/export/generatestats/_statisticsoutput_graphs.php Diff File

master 960b25ea

2015-12-21 16:27

ollehar


Details Diff
Fixed issue 10174: Only create reloadurl if survey holdpass is set Affected Issues
10174
mod - application/helpers/frontend_helper.php Diff File

2.5 a015d58b

2015-12-21 16:27

ollehar


Details Diff
Fixed issue 10174: Only create reloadurl if survey holdpass is set Affected Issues
10174
mod - application/helpers/frontend_helper.php Diff File

2.5 777adb3d

2015-12-21 16:04

LouisGac


Details Diff
Dev: statistics_helper cleaning
mod - application/helpers/admin/statistics_helper.php Diff File

2.5 0cccb092

2015-12-21 15:52

LouisGac


Details Diff
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5
mod - application/controllers/admin/assessments.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/views/admin/assessments_view.php Diff File
mod - application/views/admin/participants/viewAttribute_view.php Diff File
mod - scripts/admin/viewAttribute.js Diff File

2.5 1969dc73

2015-12-21 15:52

LouisGac


Details Diff
Dev : moved all html to view, and all js to scripts for stat
mod - application/helpers/admin/statistics_helper.php Diff File
add - application/views/admin/export/generatestats/_statisticsoutput_arithmetic.php Diff File
add - application/views/admin/export/generatestats/_statisticsoutput_graphs.php Diff File
mod - scripts/admin/statistics.js Diff File
add - third_party/chartjs/--Chart.min.js Diff File
mod - third_party/chartjs/Chart.min.js Diff File

2.5 0a6e48ce

2015-12-21 15:46

ollehar


Details Diff
Fixed issue 10151: Rename save button to save instead of load Affected Issues
10151
mod - application/helpers/replacements_helper.php Diff File

2.5 30c2db90

2015-12-21 15:11

ollehar


Details Diff
Fixed issue 10098: Don't hide save-button at page bottom, and hide save-button at bar Affected Issues
10098
mod - application/controllers/admin/assessments.php Diff File
mod - application/views/admin/assessments_view.php Diff File

2.5 892e3add

2015-12-21 14:19

ollehar


Details Diff
Dev: Hide cancel-button when not editing attribute value (CPDB)
mod - application/views/admin/participants/viewAttribute_view.php Diff File
mod - scripts/admin/viewAttribute.js Diff File

master 55b85756

2015-12-21 12:55

jweberhofer


Details Diff
Merge error_on_update_fixKCFinder184
mod - application/commands/InstallCommand.php Diff File
mod - application/config/config-defaults.php Diff File
mod - application/config/internal.php Diff File
mod - application/config/third_party.php Diff File
mod - application/config/updater_version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/PluginsController.php Diff File
mod - application/controllers/SurveysController.php Diff File
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/ExpressionValidate.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
add - application/controllers/admin/databaseupdate.php Diff File
mod - application/controllers/admin/dataentry.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/limereplacementfields.php Diff File
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/controllers/admin/printablesurvey.php Diff File
mod - application/controllers/admin/questions.php Diff File
mod - application/controllers/admin/remotecontrol.php Diff File
mod - application/controllers/admin/responses.php Diff File
mod - application/controllers/admin/saved.php Diff File
mod - application/controllers/admin/surveyadmin.php Diff File
mod - application/controllers/admin/templates.php Diff File
mod - application/controllers/admin/tokens.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/core/ConsoleApplication.php Diff File
mod - application/core/LSYii_Application.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/core/db/MysqlSchema.php Diff File
mod - application/core/db/PgsqlSchema.php Diff File
mod - application/core/plugins/AuthLDAP/AuthLDAP.php Diff File
mod - application/core/plugins/Authdb/Authdb.php Diff File
mod - application/core/plugins/Authwebserver/Authwebserver.php Diff File
mod - application/core/plugins/ExportSTATAxml/ExportSTATAxml.php Diff File
rm - application/extensions/ExtendedClientScript/ExtendedClientScript.php Diff
rm - application/extensions/ExtendedClientScript/cssmin/cssmin.php Diff
rm - application/extensions/ExtendedClientScript/jsmin/JSMin.php Diff
mod - application/extensions/Menu/MenuWidget.php Diff File
mod - application/extensions/bootstrap/assets/css/bootstrap.css Diff File
mod - application/helpers/SurveyRuntimeHelper.php Diff File
mod - application/helpers/admin/activate_helper.php Diff File
mod - application/helpers/admin/export/Writer.php Diff File
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/admin/import_helper.php Diff File
mod - application/helpers/admin/token_helper.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/helpers/expressions/em_core_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
mod - application/helpers/frontend_helper.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/remotecontrol/remotecontrol_handle.php Diff File
mod - application/helpers/replacements_helper.php Diff File
mod - application/helpers/update/update_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/libraries/LSjsonRPCServer.php Diff File
mod - application/libraries/PluginManager/AuthPluginBase.php Diff File
mod - application/libraries/PluginManager/Question/QuestionBase.php Diff File
mod - application/models/Condition.php Diff File
mod - application/models/LSActiveRecord.php Diff File
mod - application/models/Participant.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/ParticipantAttributeNameLang.php Diff File
mod - application/models/Permission.php Diff File
mod - application/models/Response.php Diff File
mod - application/models/Survey.php Diff File
mod - application/models/Token.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/views/admin/assessments_view.php Diff File
mod - application/views/admin/dataentry/caption_view.php Diff File
mod - application/views/admin/global_settings/_presentation.php Diff File
mod - application/views/admin/global_settings/_security.php Diff File
mod - application/views/admin/htmleditor/pop_editor_view.php Diff File
mod - application/views/admin/htmleditor/pop_nofields_view.php Diff File
mod - application/views/admin/labels/editlabel_view.php Diff File
mod - application/views/admin/labels/labelview_view.php Diff File
mod - application/views/admin/participants/displayParticipants_view.php Diff File
mod - application/views/admin/participants/importCSV_view.php Diff File
mod - application/views/admin/participants/viewAttribute_view.php Diff File
mod - application/views/admin/quotas/viewquotasrow_view.php Diff File
mod - application/views/admin/super/adminmenu.php Diff File
mod - application/views/admin/super/header.php Diff File
mod - application/views/admin/survey/subview/tabGeneralEditSurvey_view.php Diff File
mod - application/views/admin/survey/subview/tabNotification_view.php Diff File
mod - application/views/admin/survey/subview/tabPresentation_view.php Diff File
mod - application/views/admin/token/bounce.php Diff File
mod - application/views/admin/token/emailwarning.php Diff File
mod - application/views/admin/token/invite.php Diff File
mod - application/views/admin/token/remind.php Diff File
mod - application/views/admin/token/tokenbar.php Diff File
mod - application/views/admin/token/tokenform.php Diff File
mod - application/views/admin/token/tokenwarning.php Diff File
mod - application/views/admin/update/_ajaxVariables.php Diff File
mod - application/views/admin/update/_updateContainer.php Diff File
mod - application/views/admin/update/_update_notification.php Diff File
mod - application/views/admin/update/check_updates/_checkButtons.php Diff File
mod - application/views/admin/update/updater/_error.php Diff File
mod - application/views/admin/update/updater/steps/_backup.php Diff File
mod - application/views/admin/update/updater/steps/_change_log.php Diff File
mod - application/views/admin/update/updater/steps/_check_local_errors.php Diff File
mod - application/views/admin/update/updater/steps/textaeras/_existingfiles.php Diff File
mod - application/views/admin/update/updater/steps/textaeras/_modifiedfiles.php Diff File
mod - application/views/admin/update/updater/welcome/_error.php Diff File
mod - application/views/admin/update/updater/welcome/_key_updated.php Diff File
mod - application/views/admin/update/updater/welcome/_subscribe.php Diff File
mod - application/views/admin/update/updater/welcome/_welcome.php Diff File
mod - application/views/installer/precheck_view.php Diff File
mod - application/views/plugins/index.php Diff File
mod - docs/demosurveys/ls205_sample_survey_multilingual.lss Diff File
mod - docs/release_notes.txt Diff File
rm - framework/CHANGELOG Diff
rm - framework/LICENSE Diff
rm - framework/README Diff
rm - framework/UPGRADE Diff
mod - framework/YiiBase.php Diff File
mod - framework/base/CApplication.php Diff File
mod - framework/base/CComponent.php Diff File
mod - framework/base/CErrorHandler.php Diff File
mod - framework/base/CModel.php Diff File
mod - framework/base/CModule.php Diff File
mod - framework/base/CSecurityManager.php Diff File

2.5 cd2031f2

2015-12-21 12:31

ollehar


Details Diff
Dev: Set active-class on tab when adding new attribute translation
mod - scripts/admin/viewAttribute.js Diff File

2.5 964105d7

2015-12-21 12:23

ollehar


Details Diff
Dev: More Bootstrap for attribute settings (CPDB)
mod - scripts/admin/viewAttribute.js Diff File

2.5 03f4f0fb

2015-12-21 12:09

ollehar


Details Diff
Dev: Adapt attribute settings to Bootstrap
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/views/admin/participants/viewAttribute_view.php Diff File
mod - scripts/admin/viewAttribute.js Diff File

2.5 4d2653f8

2015-12-18 18:24

LouisGac


Details Diff
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5
mod - application/views/admin/participants/viewAttribute_view.php Diff File
mod - scripts/admin/viewAttribute.js Diff File

2.5 30b1e779

2015-12-18 18:24

LouisGac


Details Diff
Dev: added views for statistic rendering
mod - application/helpers/admin/statistics_helper.php Diff File
mod - application/views/admin/export/generatestats/_header.php Diff File
add - application/views/admin/export/generatestats/_statisticsoutput_answer.php Diff File
add - application/views/admin/export/generatestats/_statisticsoutput_header.php Diff File

master eaacf42b

2015-12-18 17:11

ollehar


Details Diff
Dev: Tabs 'add' function is deprecated, replace with new code
mod - application/views/admin/participants/viewAttribute_view.php Diff File
mod - scripts/admin/viewAttribute.js Diff File

2.5 bbcdc0c8

2015-12-18 17:11

ollehar


Details Diff
Dev: Tabs 'add' function is deprecated, replace with new code

Conflicts:
application/views/admin/participants/viewAttribute_view.php
scripts/admin/viewAttribute.js
mod - application/views/admin/participants/viewAttribute_view.php Diff File
mod - scripts/admin/viewAttribute.js Diff File

2.5 24740cd3

2015-12-18 15:51

LouisGac


Details Diff
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/models/ParticipantAttributeNameLang.php Diff File
mod - application/views/admin/participants/viewAttribute_view.php Diff File

2.5 703f0b57

2015-12-18 15:49

LouisGac


Details Diff
Dev: create views for statitcs output header
mod - application/controllers/admin/statistics.php Diff File
mod - application/helpers/admin/statistics_helper.php Diff File
add - application/views/admin/export/generatestats/_header.php Diff File
mod - application/views/admin/export/statistics_subviews/_question.php Diff File

master e856c36f

2015-12-18 15:11

ollehar


Details Diff
Dev: Remake how attribute translations are send to server, to support languages which have no two-letter representation
mod - application/controllers/admin/participantsaction.php Diff File
mod - application/models/ParticipantAttributeName.php Diff File
mod - application/views/admin/participants/viewAttribute_view.php Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 600 ... 750 ... 803 804 805 806 807 808 809 ... 900 ... 1050 ... 1200 ... 1350 ... 1471 1472 1473  Next  Last