Changesets: LimeSurvey
|
answers_html 097c1759 2016-11-08 01:39:15 Details Diff |
Dev: fixed issue 11881: Mobile view: array questions, label centered Dev: fixed issue 11880: Mobile view: multiple paddings in collapsed arrays |
Affected Issues 11880, 11881 |
|
| mod - templates/default/css/template-core.css | Diff File | ||
| mod - templates/default/css/template.css | Diff File | ||
|
answers_html 9ce7063b 2016-11-08 01:07:05 Details Diff |
Dev: add ls-group-dynamic class Dev: add same padding and border-width to form-control-static inside such group |
||
| mod - application/views/survey/questions/multiplenumeric/rows/dynamic.php | Diff File | ||
| mod - templates/default/css/template-core.css | Diff File | ||
| mod - templates/default/css/template.css | Diff File | ||
|
answers_html 28e3ddb9 2016-11-08 00:31:43 Details Diff |
Dev: Fixed issue 11879: Mobile view: top of header overlaps title Dev: height() VS height Dev: some other js in default |
Affected Issues 11879 |
|
| mod - templates/default/config.xml | Diff File | ||
| mod - templates/default/css/template.css | Diff File | ||
| mod - templates/default/scripts/template.js | Diff File | ||
| mod - templates/default/views/endpage.pstpl | Diff File | ||
| mod - templates/default/views/question.pstpl | Diff File | ||
|
answers_html 86b140f6 2016-11-07 19:26:03 Committer: GitHub Details Diff |
Merge pull request #582 from Shnoulle/answershtml_EMevent_relevance Expression Manager relevance event |
Affected Issues 11692 |
|
| mod - application/core/packages/limesurvey/survey.css | Diff File | ||
| mod - application/core/packages/limesurvey/survey.js | Diff File | ||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - scripts/expressions/em_javascript.js | Diff File | ||
|
answers_html 03ec7d03 2016-11-07 19:23:01 Details Diff |
Dev: Final for 11692: Em relevance event Dev: Add updateLineClass and updateRepeatHeading in survey package |
||
| mod - application/core/packages/limesurvey/survey.js | Diff File | ||
| mod - scripts/expressions/em_javascript.js | Diff File | ||
|
answers_html aa861cb1 2016-11-07 18:25:24 Details Diff |
Dec: remove relevanceOff/relevanceOn system : trigger event directly | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - scripts/expressions/em_javascript.js | Diff File | ||
|
answers_html 31264744 2016-11-07 18:20:18 Details Diff |
Dev: less action in question event if possible | ||
| mod - application/core/packages/limesurvey/survey.js | Diff File | ||
|
answers_html b3ac22a2 2016-11-07 18:14:38 Details Diff |
Dev: separate triggerEmRelevance in 3 function (but launch one) Dev: some rework on event Dev: use :on/:off see https://learn.jquery.com/events/introduction-to-custom-events/#naming-custom-events |
Affected Issues 11874 |
|
| mod - application/core/packages/limesurvey/survey.js | Diff File | ||
| mod - scripts/expressions/em_javascript.js | Diff File | ||
|
answers_html 61d109ae 2016-11-07 16:37:28 Details Diff |
Dev: one event for relevance style : 'disabled' Dev: remove the 2 js function from EM : updateColors and updateHeading |
||
| mod - application/core/packages/limesurvey/survey.js | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
|
answers_html b43afcaa 2016-11-07 13:00:33 Details Diff |
Merge branch 'answers_html' of https://github.com/LimeSurvey/LimeSurvey into answers_html | ||
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
| mod - application/controllers/admin/update.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/models/UpdateForm.php | Diff File | ||
| mod - application/views/admin/homepagesettings/update.php | Diff File | ||
| mod - application/views/admin/templates/templatesummary_view.php | Diff File | ||
| mod - application/views/admin/update/_ajaxVariables.php | Diff File | ||
| mod - application/views/admin/update/updater/steps/_backup.php | Diff File | ||
| mod - application/views/admin/update/updater/welcome/_subscribe.php | Diff File | ||
| mod - docs/license.txt | Diff File | ||
|
answers_html 70228750 2016-11-07 12:49:44 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html | ||
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
| mod - application/controllers/admin/update.php | Diff File | ||
| mod - application/helpers/common_helper.php | Diff File | ||
| mod - application/models/UpdateForm.php | Diff File | ||
| mod - application/views/admin/homepagesettings/update.php | Diff File | ||
| mod - application/views/admin/templates/templatesummary_view.php | Diff File | ||
| mod - application/views/admin/update/_ajaxVariables.php | Diff File | ||
| mod - application/views/admin/update/updater/steps/_backup.php | Diff File | ||
| mod - application/views/admin/update/updater/welcome/_subscribe.php | Diff File | ||
| mod - docs/license.txt | Diff File | ||
|
master 1d41e6e4 2016-11-07 11:57:09 Details Diff |
Fixed issue #11875: XSS & SQL injection vulnerabilities in administration |
Affected Issues 11875 |
|
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/controllers/admin/update.php | Diff File | ||
| mod - application/models/UpdateForm.php | Diff File | ||
| mod - application/views/admin/homepagesettings/update.php | Diff File | ||
| mod - application/views/admin/templates/templatesummary_view.php | Diff File | ||
| mod - application/views/admin/update/_ajaxVariables.php | Diff File | ||
| mod - application/views/admin/update/updater/steps/_backup.php | Diff File | ||
| mod - application/views/admin/update/updater/welcome/_subscribe.php | Diff File | ||
| mod - docs/license.txt | Diff File | ||
|
fancytree_new 4ff6fcfd 2016-11-07 11:57:09 Committer: |
Fixed issue #11875: XSS & SQL injection vulnerabilities in administration |
Affected Issues 11875 |
|
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/controllers/admin/update.php | Diff File | ||
| mod - application/models/UpdateForm.php | Diff File | ||
| mod - application/views/admin/homepagesettings/update.php | Diff File | ||
| mod - application/views/admin/templates/templatesummary_view.php | Diff File | ||
| mod - application/views/admin/update/_ajaxVariables.php | Diff File | ||
| mod - application/views/admin/update/updater/steps/_backup.php | Diff File | ||
| mod - application/views/admin/update/updater/welcome/_subscribe.php | Diff File | ||
| mod - docs/license.txt | Diff File | ||
|
answers_html 5fd9a9a0 2016-11-07 11:48:33 Details Diff |
Revert "Dev: proposal for new remaining/total box" This reverts commit 290b4a8ff6a9cffa26355ad5d559f9b45d426222. |
||
| mod - application/views/survey/questions/multiplenumeric/rows/dynamic.php | Diff File | ||
|
master 548f125f 2016-11-07 10:53:44 Details Diff |
Dev: update LimeSurvey.sourceforge.net to LimeSurvey.org when send email Dev: we don't use sf.net since some year now |
||
| mod - application/helpers/common_helper.php | Diff File | ||
|
fancytree_new 4660db3a 2016-11-07 10:53:44 Committer: |
Dev: update LimeSurvey.sourceforge.net to LimeSurvey.org when send email Dev: we don't use sf.net since some year now |
||
| mod - application/helpers/common_helper.php | Diff File | ||
|
master d9d9df9d 2016-11-07 10:15:20 Details Diff |
Fixed issue 11872: Opening Central Participant Database returns 500 error for PHP 5.3 |
Affected Issues 11872 |
|
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
|
fancytree_new ad0b7c61 2016-11-07 10:15:20 Committer: |
Fixed issue 11872: Opening Central Participant Database returns 500 error for PHP 5.3 |
Affected Issues 11872 |
|
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
|
answers_html ef1d3de0 2016-11-06 19:29:57 Details Diff |
Fixed issue 11874: All in one survey : group hidden at start are not shown Dev: usage of event : more easy |
Affected Issues 11874 |
|
| mod - application/core/packages/limesurvey/survey.js | Diff File | ||
|
answers_html 57161904 2016-11-06 19:23:51 Details Diff |
New feature 11692: Remove the display:none for EM filter (and condition) : use hidden, ls-hidden Dev: Actually : just use ls-hidden ls-unrelevant ls-disabled Dev: Question : what is the easiest for user : replace triggerEmRelevance or update !important css Dev: javascript dev : replace triggerEmRelevance or add new function Dev: other user ? Dev: have some idea for 'core plugin' : hide/show slowly | add border for testing (survey not active) Dev: etc ... |
Affected Issues 11692 |
|
| mod - application/core/packages/limesurvey/survey.css | Diff File | ||
| mod - application/core/packages/limesurvey/survey.js | Diff File | ||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - scripts/expressions/em_javascript.js | Diff File | ||
|
logging-responses-modifications-plus-import-log 8054ca6b 2016-11-05 18:13:09 Details Diff |
log import action | ||
| mod - application/controllers/admin/dataentry.php | Diff File | ||
| mod - application/helpers/admin/import_helper.php | Diff File | ||
| mod - plugins/AuditLog/AuditLog.php | Diff File | ||
|
answers_html 290b4a8f 2016-11-05 16:34:13 Details Diff |
Dev: proposal for new remaining/total box | ||
| mod - application/views/survey/questions/multiplenumeric/rows/dynamic.php | Diff File | ||
|
answers_html 2012e88f 2016-11-05 14:42:23 Details Diff |
Dev: fix merging of master Dev: Ouf ... it's not a big change |
||
| mod - application/controllers/admin/database.php | Diff File | ||
|
answers_html 71ae6622 2016-11-05 14:38:20 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html Dev: ... merge before update function # Conflicts: # application/config/version.php # application/controllers/admin/database.php |
||
| mod - application/config/version.php | Diff File | ||
| mod - application/controllers/admin/database.php | Diff File | ||
| mod - application/controllers/admin/questiongroups.php | Diff File | ||
| mod - application/models/QuestionGroup.php | Diff File | ||
| mod - application/views/admin/survey/Question/yesNo_defaultvalue_widget.php | Diff File | ||
| mod - application/views/admin/survey/QuestionGroups/addGroup_view.php | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/de-informal/de-informal.mo | Diff File | ||
| mod - locale/el/el.mo | Diff File | ||
| mod - locale/pt-BR/pt-BR.mo | Diff File | ||
| mod - scripts/admin/questiongroup.js | Diff File | ||
|
answers_html b36b50aa 2016-11-05 14:26:00 Details Diff |
Dev: database.php functions separation 2nd step | ||
| mod - application/controllers/admin/database.php | Diff File | ||
