Changesets: LimeSurvey
develop 1eb82b2e 2017-07-05 16:23:37
|
Merge branch 'develop' of github.com:LimeSurvey/LimeSurvey into develop | ||
mod - application/core/LSYii_ClientScript.php | Diff File | ||
develop 38e36849 2017-07-05 16:23:09
|
Dev: changed from timestamp to datetime UPDATE DATABASE MANUALLY! |
||
mod - application/helpers/update/updatedb_helper.php | Diff File | ||
mod - installer/sql/create-mssql.sql | Diff File | ||
mod - installer/sql/create-mysql.sql | Diff File | ||
develop 6b19c5f4 2017-07-05 16:19:12
|
Dev: updated LSYii_ClientScript::convertDevBaseUrl() to take in account the new package params for adminpanel Dev: markus added a position system for individual packages |
||
mod - application/core/LSYii_ClientScript.php | Diff File | ||
develop bdc5d67a 2017-07-05 16:04:17
|
Dev: added devbaseurl for updating by asset manager | ||
mod - application/config/packages.php | Diff File | ||
develop 011a60db 2017-07-05 15:55:02
|
Dev: database fix | ||
mod - application/helpers/update/updatedb_helper.php | Diff File | ||
develop_adminpanel ad5e48dd 2017-07-05 15:53:27
|
Dev: small css change | ||
mod - assets/packages/adminpanel/build/lsadminpanel.css | Diff File | ||
mod - assets/packages/adminpanel/scss/custom.scss | Diff File | ||
develop 7fd45f14 2017-07-05 15:39:58
|
Dev: updated views to use flexbox Fixed more issues with the new survey creation |
||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - application/views/admin/super/sidemenu.php | Diff File | ||
mod - application/views/admin/survey/editLocalSettings_main_view.php | Diff File | ||
mod - application/views/admin/survey/subview/_create_survey_text.php | Diff File | ||
mod - application/views/admin/survey/subview/accordion/_accordion_container.php | Diff File | ||
mod - application/views/admin/survey/subview/tabCreate_view.php | Diff File | ||
mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
mod - assets/packages/adminpanel/build/lsadminpanel.css | Diff File | ||
mod - assets/packages/adminpanel/build/lsadminpanel.js | Diff File | ||
mod - assets/packages/adminpanel/scss/bootstrapadditions.scss | Diff File | ||
mod - assets/packages/adminpanel/scss/custom.scss | Diff File | ||
mod - assets/packages/adminpanel/src/components/questionsgroups.vue | Diff File | ||
mod - assets/packages/adminpanel/src/main.js | Diff File | ||
mod - assets/styles-admin/Apple_Blossom/scripts/sidemenu.js | Diff File | ||
mod - assets/styles-admin/Sea_Green/config.xml | Diff File | ||
mod - assets/styles-admin/Sea_Green/css/lime-admin-common.css | Diff File | ||
mod - assets/styles-admin/Sea_Green/scripts/sidemenu.js | Diff File | ||
develop f85851db 2017-07-05 15:34:08
|
Dev: removed double alerts | ||
mod - templates/default/views/subviews/warnings.twig | Diff File | ||
develop 439799b6 2017-07-05 15:26:54
|
Dev: added animation for warnings | ||
mod - templates/default/config.xml | Diff File | ||
mod - templates/default/views/subviews/warnings.twig | Diff File | ||
develop 5dbe2f40 2017-07-05 15:26:31
|
Dev: added animation options for questions | ||
mod - templates/default/config.xml | Diff File | ||
mod - templates/default/views/subviews/survey/question.twig | Diff File | ||
develop da664d88 2017-07-05 15:25:32
|
Dev: renamed animate to bodyanimate | ||
mod - templates/default/config.xml | Diff File | ||
mod - templates/default/views/layout_global.twig | Diff File | ||
develop a0bda349 2017-07-05 14:46:36
Committer: |
DEV: remove deprecated getQuestionAttributeValues() and replace all instances (#747) | ||
mod - application/controllers/UploaderController.php | Diff File | ||
mod - application/controllers/admin/conditionsaction.php | Diff File | ||
mod - application/controllers/admin/dataentry.php | Diff File | ||
mod - application/controllers/admin/printablesurvey.php | Diff File | ||
mod - application/controllers/admin/responses.php | Diff File | ||
mod - application/controllers/admin/statistics.php | Diff File | ||
mod - application/extensions/questionTypes/listRadio/listRadio.php | Diff File | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
mod - application/helpers/admin/export/SurveyObj.php | Diff File | ||
mod - application/helpers/admin/statistics_helper.php | Diff File | ||
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/helpers/export_helper.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - application/helpers/userstatistics_helper.php | Diff File | ||
mod - application/models/SurveyDynamic.php | Diff File | ||
mod - application/views/admin/dataentry/content_view.php | Diff File | ||
mod - application/views/admin/export/statistics_subviews/_question.php | Diff File | ||
develop a5b84816 2017-07-05 14:24:55
Committer: |
DEV: Code inspection app/contollers: (#746) DEV: Code inspection app/contollers: remove deprecated & unused _printTemplateContent DEV: Code inspection app/contollers: various fixes |
||
mod - application/controllers/admin/conditionsaction.php | Diff File | ||
mod - application/controllers/admin/dataentry.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/surveyadmin.php | Diff File | ||
mod - application/controllers/admin/templates.php | Diff File | ||
mod - application/controllers/admin/tokens.php | Diff File | ||
mod - application/controllers/admin/translate.php | Diff File | ||
mod - application/controllers/admin/useraction.php | Diff File | ||
mod - application/controllers/admin/usergroups.php | Diff File | ||
mod - application/controllers/survey/index.php | Diff File | ||
develop 4a631994 2017-07-05 14:01:31
Committer: |
DEV: code inspect application/core (#745) DEV: Code inspection app/core - unused local variables DEV: Code inspection app/core - missing $currentadminlang DEV: Code inspection app/core - duplicate key DEV: Code inspection app/core - fix missing @return tags DEV: Code inspection app/core - fix argument phpDocs DEV: Code inspection app/core - fix missing return statements DEV: Code inspection app/core - fix inconsistent parameters DEV: Code inspection app/commands |
||
mod - application/commands/InstallCommand.php | Diff File | ||
mod - application/commands/PluginCommand.php | Diff File | ||
mod - application/commands/ResetPasswordCommand.php | Diff File | ||
mod - application/commands/UpdateDbCommand.php | Diff File | ||
mod - application/core/ConsoleApplication.php | Diff File | ||
mod - application/core/LSETwigViewRenderer.php | Diff File | ||
mod - application/core/LSUserIdentity.php | Diff File | ||
mod - application/core/LSWebUser.php | Diff File | ||
mod - application/core/LSYii_Application.php | Diff File | ||
mod - application/core/LSYii_CaseValidator.php | Diff File | ||
mod - application/core/LSYii_ClientScript.php | Diff File | ||
mod - application/core/LSYii_Controller.php | Diff File | ||
mod - application/core/LSYii_Validators.php | Diff File | ||
mod - application/core/LS_Twig_Extension.php | Diff File | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/core/UserIdentity.php | Diff File | ||
mod - application/core/db/DbConnection.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/ExportR/RDataWriter.php | Diff File | ||
mod - application/core/plugins/ExportSTATAxml/STATAxmlWriter.php | Diff File | ||
mod - application/core/plugins/QuickMenu/QuickMenu.php | Diff File | ||
develop 486ff362 2017-07-05 13:56:24
|
Dev: remove "newtest=Y" from url in ajax mode | ||
mod - templates/default/views/subviews/head.twig | Diff File | ||
develop 7883b3a0 2017-07-05 13:31:07
Committer: |
DEV: Model DB property phpDoc descriptions VOL2 (#744) DEV: Model DB property phpDoc descriptions for SurveyLanguageSetting DEV: Model DB property phpDoc descriptions for Template DEV: Model DB property phpDoc descriptions for Token |
||
mod - application/models/SurveyLanguageSetting.php | Diff File | ||
mod - application/models/Template.php | Diff File | ||
mod - application/models/Token.php | Diff File | ||
develop 5e3aefc2 2017-07-05 12:57:57
|
Dev: added animation options for ajax load | ||
mod - templates/default/config.xml | Diff File | ||
add - templates/default/css/animate.css | Diff File | ||
mod - templates/default/views/layout_global.twig | Diff File | ||
develop c0537e21 2017-07-05 12:27:46
|
Dev: added background-image option | ||
mod - templates/default/config.xml | Diff File | ||
add - templates/default/css/background-image.css | Diff File | ||
add - templates/default/files/pattern.png | Diff File | ||
mod - templates/default/views/layout_global.twig | Diff File | ||
develop 9a0bf7b0 2017-07-05 12:27:16
|
Dev: quick fix | ||
mod - application/core/LS_Twig_Extension.php | Diff File | ||
develop b96be29c 2017-07-05 10:36:03
|
Dev: added option "logo" for brand | ||
mod - templates/default/config.xml | Diff File | ||
mod - templates/default/css/template.css | Diff File | ||
add - templates/default/files/logo_w_s.png | Diff File | ||
mod - templates/default/views/subviews/nav_bar.twig | Diff File | ||
develop 885f651c 2017-07-05 10:35:19
|
Dev: removed old logo settings (now function image() provide the necessary logic) | ||
mod - application/models/TemplateConfiguration.php | Diff File | ||
mod - templates/default/config.xml | Diff File | ||
develop dd2caa63 2017-07-05 10:29:32
Committer: |
DEV: remove depricated Question->getSubQuestions() (#734) | ||
mod - application/controllers/admin/database.php | Diff File | ||
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/models/Question.php | Diff File | ||
develop 9f65a684 2017-07-04 18:29:28
|
Dev: Recreated create new survey. Did a Wizard like styling. Not final but working solution. Still to be redesigned. |
||
mod - application/config/packages.php | Diff File | ||
mod - application/controllers/admin/surveyadmin.php | Diff File | ||
mod - application/views/admin/survey/editLocalSettings_view.php | Diff File | ||
add - application/views/admin/survey/subview/_create_survey_text.php | Diff File | ||
mod - application/views/admin/survey/subview/accordion/_generaloptions_panel.php | Diff File | ||
mod - application/views/admin/survey/subview/tabCreate_view.php | Diff File | ||
mod - application/views/admin/survey/subview/tab_edit_view.php | Diff File | ||
mod - assets/packages/adminpanel/build/lsadminpanel.css | Diff File | ||
mod - assets/packages/adminpanel/build/lsadminpanel.js | Diff File | ||
mod - assets/packages/adminpanel/gulpfile.js | Diff File | ||
mod - assets/packages/adminpanel/scss/lsflex.scss | Diff File | ||
add - assets/packages/adminpanel/scss/lsspaces.scss | Diff File | ||
mod - assets/packages/adminpanel/scss/main.scss | Diff File | ||
mod - assets/packages/adminpanel/webpack.config.js | Diff File | ||
develop d1512dc4 2017-07-04 16:36:39 Details Diff |
Dev: No symlinks in assets (breaks installer writable checks) | ||
mod - framework/web/CAssetManager.php | Diff File | ||
develop e5573f14 2017-07-04 16:27:53 Details Diff |
Dev: Remove duplicate hash column | ||
mod - installer/sql/create-mysql.sql | Diff File | ||
mod - installer/sql/create-pgsql.sql | Diff File |