Changesets: LimeSurvey

Search Browse Back to Index

develop b4a0b4ca

2016-11-11 12:33:26

DenisChenu

Details Diff 		Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop

# Conflicts:
# application/config/version.php
Attach Issues:
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

c_schmitz

Details Diff 		Release 2.55.3 Build 161111
Attach Issues:
mod - docs/release_notes.txt Diff File

master 32d85fdd

2016-11-11 12:18:00

c_schmitz

Details Diff 		Release 2.55.3 Build 161111
Attach Issues:
mod - application/config/version.php Diff File
mod - docs/release_notes.txt Diff File

master 079f26cf

2016-11-11 12:14:54

markusfluer

Details Diff 		Dev: removed scrutinizerd errors
Attach Issues:
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
Attach Issues:
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

markusfluer

Details Diff 		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

markusfluer

Details Diff 		Dev: Styling for manual width of sidebar
Attach Issues:
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

markusfluer

Details Diff 		Dev: Styling for manual width of sidebar
Attach Issues:
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

DenisChenu

Details Diff 		Dev: ... parse /compile before merging
Attach Issues:
mod - application/config/internal.php Diff File

develop 1888b37c

2016-11-10 20:10:26

DenisChenu

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

DenisChenu

Details Diff 		Dev: warning for hidden question
Dev: https://github.com/LimeSurvey/LimeSurvey/commit/6c7c30d13a9cb45aee498cf4d3eb0a5c8b06ed19 child
Attach Issues:
mod - application/helpers/expressions/em_manager_helper.php Diff File

master 6472c37f

2016-11-10 18:50:46

DenisChenu

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
Attach Issues:
mod - application/config/internal.php Diff File

develop 35ffb35b

2016-11-10 18:36:51

DenisChenu

Details Diff 		Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into develop
Attach Issues:
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

DenisChenu

Details Diff 		Dev: must create rand ....
Attach Issues:
mod - application/models/Question.php Diff File

master 0ef62b4c

2016-11-10 17:54:40

DenisChenu

Details Diff 		Dev: use $index : prepare survey import
Attach Issues:
mod - application/models/Question.php Diff File

master 3fbe4b27

2016-11-10 17:39:48

DenisChenu

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

2.06lts 866d6bcf

2016-11-10 16:30:00

DenisChenu

Details Diff 		[doc] Better tag + version number
Attach Issues:
mod - CHANGELOG.md Diff File
mod - application/config/version.php Diff File

2.06lts a20d6f7a

2016-11-10 15:40:37

DenisChenu

Details Diff 		[feature] Set secure cookies by default is connexion is secure
Attach Issues:
mod - CHANGELOG.md Diff File
mod - application/config/internal.php Diff File

2.06lts d310b60c

2016-11-10 14:58:36

DenisChenu

Details Diff 		[release] self signed smtp server
Attach Issues:
mod - CHANGELOG.md Diff File
mod - application/config/version.php Diff File

2.06lts 79b84f13

2016-11-10 14:55:08

DenisChenu

Details Diff 		[feature]llow self signed or invalid TLS/SSL smtp server (with ssl_allow_self_signed in config)
Attach Issues:
mod - CHANGELOG.md Diff File
mod - application/helpers/common_helper.php Diff File

2.06lts d0f56745

2016-11-10 14:47:41

DenisChenu

Details Diff 		[fix] Readonly for readonly attribute
Attach Issues:
mod - application/views/admin/survey/Question/advanced_settings_view.php Diff File

develop 4eb8912b

2016-11-10 10:00:43

DenisChenu

Details Diff 		Dev 11882: Mobile view: short free text with prefic and suffix
Dev: Add .suffix-prefix-force class for force display at right/left		 Affected Issues
11882
mod - application/core/packages/limesurvey/survey.css Diff File

develop ca1a59df

2016-11-10 09:51:35

DenisChenu

Details Diff 		Dev 11882: Mobile view: short free text with prefic and suffix Affected Issues
11882
mod - application/core/packages/limesurvey/survey.css Diff File
mod - application/views/survey/questions/multiplenumeric/rows/dynamic.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/input/answer_row.php Diff File
mod - application/views/survey/questions/multipleshorttext/rows/answer_row_inputtext.php Diff File
mod - application/views/survey/questions/multipleshorttext/rows/answer_row_textarea.php Diff File
mod - application/views/survey/questions/numerical/answer.php Diff File
mod - application/views/survey/questions/shortfreetext/text/item.php Diff File
mod - application/views/survey/questions/shortfreetext/textarea/item.php Diff File
mod - templates/default/css/template-core.css Diff File
mod - templates/default/css/template.css Diff File

fancytree_new 429c065d

2016-11-09 18:19:47

markusfluer

Details Diff 		Dev: fixed some issues and refactored the sidemenu code
Attach Issues:
mod - application/views/admin/super/sidemenu.php Diff File
mod - scripts/admin/jquery.fancytree.bsbuttonbar.js Diff File
mod - styles/Apple_Blossom/css/lime-admin-common.css Diff File
mod - styles/Sea_Green/css/lime-admin-common.css Diff File
mod - styles/Sea_Green/scripts/sidemenu.js Diff File

fancytree_new a430dce4

2016-11-09 18:19:47

markusfluer

Details Diff 		Dev: fixed some issues and refactored the sidemenu code
Attach Issues:
mod - application/views/admin/super/sidemenu.php Diff File
mod - scripts/admin/jquery.fancytree.bsbuttonbar.js Diff File
mod - styles/Apple_Blossom/css/lime-admin-common.css Diff File
mod - styles/Sea_Green/css/lime-admin-common.css Diff File
mod - styles/Sea_Green/scripts/sidemenu.js Diff File
 First  Prev  1 2 3 ... 150 ... 300 ... 450 ... 597 598 599 600 601 602 603 ... 750 ... 900 ... 1050 ... 1200 ... 1350 ... 1457 1458 1459  Next  Last