Changesets: LimeSurvey
master 186c1ad4 2016-07-28 10:05
Details Diff |
Fixed issue: QuickAdd subquestions are not saved | ||
mod - scripts/admin/subquestions.js | Diff File | ||
master 436c7c91 2016-07-28 09:05 Committer: GitHub Details Diff |
Merge pull request #525 from tomasgvivo/master Fix RPC method: import_survey always throws error |
||
mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
master 1ec585c0 2016-07-27 22:20 Tomas Gonzalez Vivo Committer: GitHub Details Diff |
Fix RPC method: import_survey always throws error | ||
mod - application/helpers/remotecontrol/remotecontrol_handle.php | Diff File | ||
master 1acdcf98 2016-07-27 17:47 Details Diff |
Dev: oups on database ... review getQuestionAttributesSettings | ||
mod - application/controllers/admin/database.php | Diff File | ||
mod - application/models/QuestionAttribute.php | Diff File | ||
cint 299b034a 2016-07-27 17:41 Details Diff |
Dev: Work on grid view (CintLink) | ||
mod - application/core/plugins/CintLink/CintLink.php | Diff File | ||
mod - application/core/plugins/CintLink/js/cintlink.js | Diff File | ||
mod - application/core/plugins/CintLink/model/CintLinkOrder.php | Diff File | ||
cint 6af10733 2016-07-27 17:40 Details Diff |
Dev: Add ajax method to PluginHelper and set/getPlugin() to LS app | ||
mod - application/controllers/admin/PluginHelper.php | Diff File | ||
mod - application/core/LSYii_Application.php | Diff File | ||
master ca0aad90 2016-07-27 17:32 Details Diff |
Fixed issue : All question attribute is not included in TSV export (cssclass) Dev: now : all existing attribute in this installation was exported (future and/or plugin) |
||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
mod - application/models/QuestionAttribute.php | Diff File | ||
master 64bd20d3 2016-07-27 16:56 Details Diff |
Dev: move questionAttributes from commom_helper to QuestionAttribute model (static) Dev: use same system to extend QuestionAttribute by plugins |
||
mod - application/controllers/admin/database.php | Diff File | ||
mod - application/controllers/admin/questions.php | Diff File | ||
mod - application/helpers/admin/import_helper.php | Diff File | ||
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/models/Question.php | Diff File | ||
mod - application/models/QuestionAttribute.php | Diff File | ||
master 1c797ff2 2016-07-27 16:26 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git into master_QuestionAttributeForPlugin_2 | ||
mod - .gitignore | Diff File | ||
mod - application/config/config-sample-mysql.php | Diff File | ||
mod - application/config/internal.php | Diff File | ||
mod - application/config/third_party.php | Diff File | ||
mod - application/config/version.php | Diff File | ||
mod - application/controllers/AdminController.php | Diff File | ||
mod - application/controllers/InstallerController.php | Diff File | ||
mod - application/controllers/admin/database.php | Diff File | ||
mod - application/controllers/admin/dataentry.php | Diff File | ||
mod - application/controllers/admin/export.php | Diff File | ||
mod - application/controllers/admin/globalsettings.php | Diff File | ||
mod - application/controllers/admin/homepagesettings.php | Diff File | ||
mod - application/controllers/admin/labels.php | Diff File | ||
mod - application/controllers/admin/questions.php | Diff File | ||
mod - application/controllers/admin/responses.php | Diff File | ||
mod - application/controllers/admin/statistics.php | Diff File | ||
mod - application/controllers/admin/surveyadmin.php | Diff File | ||
mod - application/controllers/admin/tokens.php | Diff File | ||
mod - application/controllers/admin/useraction.php | Diff File | ||
mod - application/controllers/admin/usergroups.php | Diff File | ||
mod - application/core/LSHttpRequest.php | Diff File | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/extensions/questionTypes/listRadio/listRadio.php | Diff File | ||
mod - application/extensions/yiiwheels/widgets/buttongroup/WhButtonGroup.php | Diff File | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
mod - application/helpers/admin/import_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/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/PluginManager/PluginBase.php | Diff File | ||
mod - application/models/AdminTheme.php | Diff File | ||
mod - application/models/Participant.php | Diff File | ||
mod - application/models/ParticipantShare.php | Diff File | ||
mod - application/models/Question.php | Diff File | ||
mod - application/models/Survey.php | Diff File | ||
mod - application/models/SurveyDynamic.php | Diff File | ||
mod - application/models/TemplateConfiguration.php | Diff File | ||
mod - application/models/TokenDynamic.php | Diff File | ||
mod - application/third_party/ar-php/Arabic/Date.php | Diff File | ||
mod - application/views/admin/export/statistics_subviews/_dataselection.php | Diff File | ||
mod - application/views/admin/export/statistics_user_view.php | Diff File | ||
mod - application/views/admin/responses/listResponses_view.php | Diff File | ||
mod - application/views/admin/responses/massive_actions/_selector.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/Question/answerOptions_view.php | Diff File | ||
mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
mod - application/views/admin/survey/Question/massive_actions/_selector.php | Diff File | ||
mod - application/views/admin/survey/deleteSurvey_view.php | Diff File | ||
mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | ||
mod - application/views/admin/survey/subview/accordion/_notification_panel.php | Diff File | ||
mod - application/views/admin/templates/templateeditor_question_answer_view.php | Diff File | ||
mod - application/views/admin/token/managetokenattributes.php | Diff File | ||
mod - application/views/admin/user/personalsettings.php | Diff File | ||
mod - application/views/survey/questions/listradio/rows/answer_row_noanswer.php | Diff File | ||
mod - docs/release_notes.txt | Diff File | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/af/af.mo | Diff File | ||
mod - locale/ca/ca.mo | Diff File | ||
mod - locale/de-informal/de-informal.mo | Diff File | ||
mod - locale/de/de.mo | Diff File | ||
mod - locale/el/el.mo | Diff File | ||
mod - locale/fr/fr.mo | Diff File | ||
mod - locale/id/id.mo | Diff File | ||
mod - locale/ja/ja.mo | Diff File | ||
mod - locale/nb/nb.mo | Diff File | ||
mod - locale/nl-informal/nl-informal.mo | Diff File | ||
mod - locale/nl/nl.mo | Diff File | ||
mod - locale/nn/nn.mo | Diff File | ||
mod - locale/pl/pl.mo | Diff File | ||
mod - plugins/AuditLog/AuditLog.php | Diff File | ||
mod - scripts/admin/answers.js | Diff File | ||
mod - scripts/admin/listresponse.js | Diff File | ||
mod - scripts/admin/statistics.js | Diff File | ||
mod - scripts/admin/subquestions.js | Diff File | ||
add - scripts/admin/survey_edit_notificationpanel.js | Diff File | ||
mod - scripts/admin/tokens.js | Diff File | ||
mod - scripts/array-totalsum.js | Diff File | ||
add - scripts/deactivatedebug.js | Diff File | ||
mod - scripts/expressions/em_javascript.js | Diff File | ||
mod - scripts/map.js | Diff File | ||
mod - scripts/survey_runtime.js | Diff File | ||
mod - styles/Apple_Blossom/css/lime-admin-colors.css | Diff File | ||
mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Apple_Blossom/css/lime-admin-common.css | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-colors.css | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-common.css | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-colors.css | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-common.css | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-colors.css | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-common.css | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-colors.css | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-common.css | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-colors.css | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-common.css | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-colors.css | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-common.css | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-colors.css | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-colors.css | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-common.css | Diff File | ||
mod - templates/minimal-config.xml | Diff File | ||
mod - third_party/jquery-blockui/jquery.blockUI.js | Diff File | ||
cint edd1ac9d 2016-07-27 15:01 Details Diff |
Merge remote-tracking branch 'origin/master' into cint | ||
mod - application/config/third_party.php | Diff File | ||
master 202177a4 2016-07-27 15:00 Details Diff |
Fixed issue: Token import breaking if wrong character set is used for the file | ||
mod - application/config/config-sample-mysql.php | Diff File | ||
mod - application/controllers/InstallerController.php | Diff File | ||
cint 38eedf29 2016-07-27 15:00 Details Diff |
Dev: First try with gridview in dashboard (CintLink) | ||
mod - application/core/plugins/CintLink/CintLink.php | Diff File | ||
mod - application/core/plugins/CintLink/model/CintLinkOrder.php | Diff File | ||
master c85241d3 2016-07-27 15:00
Details Diff |
Dev: check if called via ajax before including jQuery (jquery package) | ||
mod - application/config/third_party.php | Diff File | ||
cint 696180d1 2016-07-27 14:44 Details Diff |
Merge remote-tracking branch 'origin/master' into cint | ||
mod - application/models/AdminTheme.php | Diff File | ||
master a10bd8b0 2016-07-27 14:42
Details Diff |
Dev: check if called via ajax before including jQuery (custom url param) | ||
mod - application/models/AdminTheme.php | Diff File | ||
cint aeae6a71 2016-07-27 14:34 Details Diff |
Merge remote-tracking branch 'origin/master' into cint | ||
mod - application/controllers/admin/useraction.php | Diff File | ||
mod - application/models/AdminTheme.php | Diff File | ||
mod - application/views/admin/super/adminmenu.php | Diff File | ||
mod - application/views/admin/user/personalsettings.php | Diff File | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/af/af.mo | Diff File | ||
mod - locale/de-informal/de-informal.mo | Diff File | ||
mod - locale/de/de.mo | Diff File | ||
master cf0c793d 2016-07-27 14:33
Details Diff |
Dev: check if called via ajax before including jQuery | ||
mod - application/models/AdminTheme.php | Diff File | ||
master 58e70486 2016-07-27 14:09 LimeSurvey Translations Bot Details Diff |
Updated translation: Afrikaans by geebee100 Updated translation: German by c_schmitz Updated translation: German (Informal) by c_schmitz |
||
mod - locale/af/af.mo | Diff File | ||
mod - locale/de-informal/de-informal.mo | Diff File | ||
mod - locale/de/de.mo | Diff File | ||
master 053574df 2016-07-27 13:59 LimeSurvey Translations Bot Details Diff |
Dev Automatic translation update | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
master 5d763ca3 2016-07-27 13:13 Details Diff |
Fixed issue 11501: Profile dialog not properly styled - now merged with user preferences |
Affected Issues 11501 |
|
mod - application/controllers/admin/useraction.php | Diff File | ||
mod - application/views/admin/user/personalsettings.php | Diff File | ||
cint dc66298e 2016-07-27 12:52 Details Diff |
Dev: Remove unused code (CintLink) | ||
mod - application/core/plugins/CintLink/CintLink.php | Diff File | ||
cint 01b51040 2016-07-27 12:49 Details Diff |
Dev: Show tooltip for disabled pay button (CintLink) | ||
mod - application/core/plugins/CintLink/CintLink.php | Diff File | ||
mod - application/core/plugins/CintLink/js/cintlink.js | Diff File | ||
mod - application/core/plugins/CintLink/views/common.php | Diff File | ||
mod - application/core/plugins/CintLink/views/dashboard.php | Diff File | ||
master ecb21be7 2016-07-27 12:34 Details Diff |
Fixed issue 11501: Profile dialog not properly styled - now merged with user preferences |
Affected Issues 11501 |
|
mod - application/views/admin/super/adminmenu.php | Diff File | ||
cint ac8eb14b 2016-07-27 12:26 Details Diff |
Merge remote-tracking branch 'origin/master' into cint | ||
mod - application/controllers/admin/useraction.php | Diff File | ||
mod - application/views/admin/super/adminmenu.php | Diff File | ||
mod - application/views/admin/user/personalsettings.php | Diff File | ||
mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Apple_Blossom/css/lime-admin-common.css | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-common.css | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-common.css | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-common.css | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-common.css | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-common.css | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-common.css | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-common.css | Diff File | ||
master 12bced7c 2016-07-27 12:24 Details Diff |
Dev: Remove 4px padding for inputs (use Bootstrap default instead) | ||
mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Apple_Blossom/css/lime-admin-common.css | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-common.css | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-common.css | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-common.css | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-common.css | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-common.css | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-common.css | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-common.css | Diff File |