Changesets: LimeSurvey
|
develop 46d46eb4 2016-11-13 18:36:21 Details Diff |
Dev: review dynamic with slider HTML |
Affected Issues 11883 |
|
| mod - application/core/packages/limesurvey/survey.css | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/survey/questions/multiplenumeric/answer.php | Diff File | ||
| add - application/views/survey/questions/multiplenumeric/rows/dynamic_slider.php | Diff File | ||
| mod - templates/default/css/template-core.css | Diff File | ||
|
develop 1378bac5 2016-11-13 10:37:59 Details Diff |
Dev: Remove some uneeded var, review some var | ||
| mod - application/controllers/admin/printablesurvey.php | Diff File | ||
|
develop 9b6d7ba8 2016-11-12 19:42:08 Details Diff |
Dev: print template reviewing | ||
| mod - application/controllers/admin/printablesurvey.php | Diff File | ||
| mod - styles-public/printable.css | Diff File | ||
| rm - templates/default/css/print_template-rtl.css | Diff File | ||
| mod - templates/default/css/print_template.css | Diff File | ||
| mod - templates/default/views/print_question.pstpl | Diff File | ||
| mod - templates/default/views/print_survey.pstpl | Diff File | ||
|
develop 74fe595d 2016-11-12 12:08:41 Details Diff |
Merge branch 'develop' of https://github.com/LimeSurvey/LimeSurvey into develop | ||
| mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
|
develop e22b9819 2016-11-12 12:06:15 Details Diff |
Dev issue #11885: Review "print survey" Dev: This we must use qanda-helper for all question here (select/option must be reset to list) Dev: or Question Object must return a printview when we have one |
Affected Issues 11885 |
|
| mod - application/controllers/admin/printablesurvey.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| add - styles-public/printable.css | Diff File | ||
| mod - templates/default/config.xml | Diff File | ||
| mod - templates/default/css/print_template.css | Diff File | ||
| mod - templates/default/views/print_group.pstpl | Diff File | ||
| mod - templates/default/views/print_question.pstpl | Diff File | ||
| mod - templates/default/views/print_survey.pstpl | Diff File | ||
|
fancytree_new b6b66523 2016-11-11 14:29:42
|
Merge remote-tracking branch 'refs/remotes/origin/fancytree_new' Conflicts: application/config/version.php application/models/Question.php docs/release_notes.txt locale/_template/limesurvey.pot locale/pt-BR/pt-BR.mo |
||
|
develop e12c9319 2016-11-11 13:31:42 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop | ||
| mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
|
master d811cb2c 2016-11-11 13:30:12 Details Diff |
Dev: notice when init KC finder | ||
| mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
|
develop 3de1ed7f 2016-11-11 13:08:52 Details Diff |
Dev: 11808 : show warning for survey manager when using a 'old' template Dev: API is an integer (3 actually) Dev: move apiVersion to private : don't think a plugin must be allowed to update it ? |
Affected Issues 11808 |
|
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
| mod - application/views/admin/survey/surveySummary_view.php | Diff File | ||
| mod - application/views/admin/templates/templateeditorbar_view.php | Diff File | ||
|
develop b4a0b4ca 2016-11-11 12:33:26 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop # Conflicts: # application/config/version.php |
||
| mod - application/config/internal.php | Diff File | ||
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/admin/pluginmanager.php | Diff File | ||
| mod - application/views/admin/pluginmanager/index.php | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/ca/ca.mo | Diff File | ||
| mod - locale/cs/cs.mo | Diff File | ||
| mod - locale/es/es.mo | Diff File | ||
| mod - locale/fr/fr.mo | Diff File | ||
| mod - locale/it-informal/it-informal.mo | Diff File | ||
| mod - locale/it/it.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 - locale/pt-BR/pt-BR.mo | Diff File | ||
| mod - locale/sv/sv.mo | Diff File | ||
|
master 99ba9302 2016-11-11 12:18:00 Details Diff |
Release 2.55.3 Build 161111 | ||
| mod - docs/release_notes.txt | Diff File | ||
|
master 32d85fdd 2016-11-11 12:18:00 Details Diff |
Release 2.55.3 Build 161111 | ||
| mod - application/config/version.php | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
|
master 079f26cf 2016-11-11 12:14:54
|
Dev: removed scrutinizerd errors | ||
| mod - application/controllers/admin/pluginmanager.php | Diff File | ||
|
master 61c121fe 2016-11-11 12:14:40 LimeSurvey Translations Bot Details Diff |
Updated translation: Catalan by qualitatuvic Updated translation: Czech by c_schmitz, jelen1, VBraun Updated translation: Spanish (Spain) by aesteban Updated translation: French (France) by arnaud21 Updated translation: Italian by lfanfoni Updated translation: Norwegian (Bokmål) by pmonstad Updated translation: Dutch by Han Updated translation: Norwegian (Nynorsk) by pmonstad Updated translation: Polish by elissa Updated translation: Portuguese (Brazil) by holch Updated translation: Swedish by maxzomborszki Updated translation: Italian (Informal) by lfanfoni Updated translation: Dutch (Informal) by Han Updated translation: Polish (Informal) by elissa |
||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/ca/ca.mo | Diff File | ||
| mod - locale/cs/cs.mo | Diff File | ||
| mod - locale/es/es.mo | Diff File | ||
| mod - locale/fr/fr.mo | Diff File | ||
| mod - locale/it-informal/it-informal.mo | Diff File | ||
| mod - locale/it/it.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 - locale/pt-BR/pt-BR.mo | Diff File | ||
| mod - locale/sv/sv.mo | Diff File | ||
|
master 2262ddc6 2016-11-11 12:00:39
|
Fixed issue #11875: Added a form and csrf to the plugin activation/deactivation |
Affected Issues 11875 |
|
| mod - application/controllers/admin/pluginmanager.php | Diff File | ||
| mod - application/views/admin/pluginmanager/index.php | Diff File | ||
|
fancytree_new 393816c2 2016-11-11 09:52:41
|
Dev: Styling for manual width of sidebar | ||
| mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
| mod - styles/Sea_Green/scripts/sidemenu.js | Diff File | ||
|
fancytree_new a798d986 2016-11-11 09:52:41
|
Dev: Styling for manual width of sidebar | ||
| mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
| mod - styles/Sea_Green/scripts/sidemenu.js | Diff File | ||
|
master 44c7e935 2016-11-10 20:19:19 Details Diff |
Dev: ... parse /compile before merging | ||
| mod - application/config/internal.php | Diff File | ||
|
develop 1888b37c 2016-11-10 20:10:26 Details Diff |
New feature 11808: add template apiVersion and fix old template Dev: Start with api version 3 : follow LS version. Dev: fix template according to API : for old : add needed pstpl file Dev: add survey +fontawesome to template package (and add it if api < 3) Dev: Todo : add an alert / log for admin user |
Affected Issues 11808 |
|
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/models/TemplateConfiguration.php | Diff File | ||
| mod - application/views/layouts/public.php | Diff File | ||
| mod - templates/default/config.xml | Diff File | ||
| mod - templates/minimal-config.xml | Diff File | ||
|
develop 40eb07db 2016-11-10 19:34:45 Details Diff |
Dev: warning for hidden question Dev: https://github.com/LimeSurvey/LimeSurvey/commit/6c7c30d13a9cb45aee498cf4d3eb0a5c8b06ed19 child |
||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
master 6472c37f 2016-11-10 18:50:46 Details Diff |
[security] If SSL is used CRSF cookies did not have secure flag Dev: https://github.com/LimeSurvey/LimeSurvey/commit/ebd86f2d3cc7f90e00723f3ee6fad6f110ff703f Dev: empty===isset && !="" && count((if array))>0 |
||
| mod - application/config/internal.php | Diff File | ||
|
develop 35ffb35b 2016-11-10 18:36:51 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/helpers/admin/import_helper.php | Diff File | ||
| mod - application/models/Question.php | Diff File | ||
| mod - application/views/admin/authentication/forgotpassword.php | Diff File | ||
| mod - application/views/admin/survey/Question/import_view.php | Diff File | ||
|
master bf80188f 2016-11-10 17:57:34 Details Diff |
Dev: must create rand .... | ||
| mod - application/models/Question.php | Diff File | ||
|
master 0ef62b4c 2016-11-10 17:54:40 Details Diff |
Dev: use $index : prepare survey import | ||
| mod - application/models/Question.php | Diff File | ||
|
master 3fbe4b27 2016-11-10 17:39:48 Details Diff |
Fixed issue 11886: lsq file bug import Dev: validate('title') and get the new title for another row Dev: create a model function (to be used in survey and group import too |
Affected Issues 11886 |
|
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/helpers/admin/import_helper.php | Diff File | ||
| mod - application/models/Question.php | Diff File | ||
| mod - application/views/admin/survey/Question/import_view.php | Diff File | ||
