Changesets: LimeSurvey
answers_html 04f8af95 2016-10-15 19:12:43 Details Diff |
Merge branch 'answers_html' of https://github.com/LimeSurvey/LimeSurvey into answers_html | ||
mod - application/views/survey/questions/list_dropdown/answer.php | Diff File | ||
answers_html 9cad06b4 2016-10-15 19:09:32 Details Diff |
New feature 11797: Allow template to use some class in default core message: message.pstpl Dev: move some message to this new pstpl file Dev: surely some more todo |
Affected Issues 11797 |
|
mod - application/controllers/SurveyController.php | Diff File | ||
mod - application/controllers/survey/index.php | Diff File | ||
mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
add - application/views/survey/system/error.php | Diff File | ||
mod - application/views/survey/system/loadForm/error.php | Diff File | ||
add - application/views/survey/system/message.php | Diff File | ||
add - application/views/survey/system/url.php | Diff File | ||
mod - templates/basic/pstpl/completed.pstpl | Diff File | ||
add - templates/basic/pstpl/message.pstpl | Diff File | ||
add - templates/default/views/message.pstpl | Diff File | ||
add - templates/test/pstpl/message.pstpl | Diff File | ||
answers_html 41fe9ae9 2016-10-15 16:13:25 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html | ||
mod - application/views/survey/questions/list_dropdown/answer.php | Diff File | ||
master 1fef50b7 2016-10-15 16:12:51 Details Diff |
Dev: bad merging : close the select | ||
mod - application/views/survey/questions/list_dropdown/answer.php | Diff File | ||
answers_html 95937585 2016-10-15 16:10:49 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html # Conflicts: # application/views/survey/questions/list_dropdown/answer.php |
||
mod - application/views/survey/questions/list_dropdown/answer.php | Diff File | ||
answers_html e69e1732 2016-10-15 16:08:05 Details Diff |
Merge branch 'answers_html' of github.com:LimeSurvey/LimeSurvey into answers_html | ||
mod - application/controllers/SurveyController.php | Diff File | ||
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - application/helpers/questionHelper.php | Diff File | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
mod - application/libraries/Load_answers.php | Diff File | ||
mod - application/libraries/Save.php | Diff File | ||
mod - application/views/layouts/survey.php | Diff File | ||
mod - application/views/survey/questions/list_dropdown/answer.php | Diff File | ||
mod - application/views/survey/questions/ranking/answer.php | Diff File | ||
mod - application/views/survey/system/display.php | Diff File | ||
mod - scripts/expressions/em_javascript.js | Diff File | ||
mod - scripts/ranking.js | Diff File | ||
mod - styles-public/ranking.css | Diff File | ||
mod - templates/basic/config.xml | Diff File | ||
mod - templates/test/config.xml | Diff File | ||
master 646ecdac 2016-10-15 16:07:38 Details Diff |
Fixed issue 11702: Dropdown question : 2 'no answer' if value selected is 0 # Conflicts: # application/views/survey/questions/list_dropdown/answer.php |
Affected Issues 11702 |
|
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - application/views/survey/questions/list_dropdown/answer.php | Diff File | ||
answers_html a027f11a 2016-10-15 16:00:16 Details Diff |
Fixed issue 11702: Dropdown question : 2 'no answer' if value selected is 0 |
Affected Issues 11702 |
|
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - application/views/survey/questions/list_dropdown/answer.php | Diff File | ||
answers_html c6ccf7b5 2016-10-15 15:38:03 Details Diff |
Fixed issue 11779: Ranking question different styling Dev: height are really hard to fix : We need a margin bottom Dev: set the height fix the issue with border-box Dev: BUT border-box is not apply when using min-height Dec: We CAN NOT use height : some element can be hidden : then the list can be bigger with array filtering after |
Affected Issues 11779 |
|
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - application/views/survey/questions/ranking/answer.php | Diff File | ||
mod - scripts/ranking.js | Diff File | ||
mod - styles-public/ranking.css | Diff File | ||
answers_html 2879302c 2016-10-15 14:49:22 Details Diff |
New feature 11798: Wrapper to end url and othe url (then can add it directly) |
Affected Issues 11798 |
|
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
answers_html 1ea9bac8 2016-10-15 14:22:40 Details Diff |
Dev: #11801: Move views/survey/system/display.php to layout Dev: remove usage of common_helper Dev: remove Basic CMS Integration support (depecated : see https://manual.limesurvey.org/The_template_editor#Basic_CMS_Integration_support) |
Affected Issues 11801 |
|
mod - application/controllers/SurveyController.php | Diff File | ||
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/helpers/questionHelper.php | Diff File | ||
mod - application/helpers/replacements_helper.php | Diff File | ||
mod - application/libraries/Load_answers.php | Diff File | ||
mod - application/libraries/Save.php | Diff File | ||
mod - application/views/layouts/survey.php | Diff File | ||
mod - application/views/survey/system/display.php | Diff File | ||
mod - scripts/expressions/em_javascript.js | Diff File | ||
mod - templates/basic/config.xml | Diff File | ||
mod - templates/test/config.xml | Diff File | ||
answers_html 4d0107e8 2016-10-15 11:07:08 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html | ||
mod - scripts/array-totalsum.js | Diff File | ||
mod - scripts/expressions/em_javascript.js | Diff File | ||
master 56dc3fe9 2016-10-15 11:06:40 Details Diff |
Fixed issue 11740: Decimal throwerreor with negative value Dev: Put a try everywhere using Decimal(value), unsure we need it everywhere, but don't seem to be an issue Dev: Didn't update anything else |
Affected Issues 11740 |
|
mod - scripts/array-totalsum.js | Diff File | ||
mod - scripts/expressions/em_javascript.js | Diff File | ||
answers_html 33a1dd42 2016-10-15 11:00:42 Details Diff |
Fixed issue 11740: Decimal throwerreor with negative value Dev: Put a try everywhere using Decimal(value), unsure we need it everywhere |
Affected Issues 11740 |
|
mod - scripts/array-totalsum.js | Diff File | ||
mod - scripts/expressions/em_javascript.js | Diff File | ||
answers_html 84c13e7e 2016-10-15 10:44:24 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html # Conflicts: # scripts/expressions/em_javascript.js |
||
mod - application/controllers/InstallerController.php | Diff File | ||
mod - application/models/Token.php | Diff File | ||
mod - application/views/admin/token/tokenwarning.php | Diff File | ||
mod - scripts/expressions/em_javascript.js | Diff File | ||
master 8341e9fe 2016-10-14 17:17:55 Committer: GitHub Details Diff |
Merge pull request #440 from BertHankes/patch-5 Update Token.php |
||
mod - application/models/Token.php | Diff File | ||
master 2748c259 2016-10-14 16:38:38 Details Diff |
Fixed issue 11731: Regexp validation for short-text question |
Affected Issues 11731 |
|
mod - scripts/expressions/em_javascript.js | Diff File | ||
master 9d18c35f 2016-10-14 15:05:37 Details Diff |
Dev: Silently check some default PHP extensions at install | ||
mod - application/controllers/InstallerController.php | Diff File | ||
master f694f914 2016-10-14 13:00:00 Details Diff |
Fixed issue 11768: Window for old token tables too small |
Affected Issues 11768 |
|
mod - application/views/admin/token/tokenwarning.php | Diff File | ||
answers_html 5b45926c 2016-10-14 12:34:42 Details Diff |
Merge branch 'answers_html' of https://github.com/LimeSurvey/LimeSurvey into answers_html | ||
mod - application/config/version.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/de-informal/de-informal.mo | Diff File | ||
mod - locale/es/es.mo | Diff File | ||
mod - locale/fr/fr.mo | Diff File | ||
answers_html 34e234a4 2016-10-14 12:33:40 Details Diff |
Dev: remove error/success class for emtip Dev: new class : le-em-tip + use event in core/survey.js |
||
mod - application/core/packages/limesurvey/survey.js | Diff File | ||
mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
mod - application/views/survey/questions/multiplenumeric/answer_input.php | Diff File | ||
mod - application/views/survey/questions/multiplenumeric/rows/dynamic.php | Diff File | ||
mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php | Diff File | ||
mod - templates/basic/pstpl/endpage.pstpl | Diff File | ||
mod - templates/basic/pstpl/startpage.pstpl | Diff File | ||
mod - templates/default/scripts/template.js | Diff File | ||
master 0ef881cf 2016-10-14 11:41:50 Details Diff |
Fixed issue 11753: Date validation issues |
Affected Issues 11753 |
|
mod - scripts/expressions/em_javascript.js | Diff File | ||
answers_html eb89ed22 2016-10-14 10:56:56 Details Diff |
Dev : add (answers_html) to version number (more clear in admin GUI) | ||
mod - application/config/version.php | Diff File | ||
answers_html ada5d2f8 2016-10-14 10:55:08 Details Diff |
Merge branch 'master' of git@github.com:LimeSurvey/LimeSurvey.git into answers_html # Conflicts: # application/config/version.php |
||
mod - application/config/version.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/de-informal/de-informal.mo | Diff File | ||
mod - locale/es/es.mo | Diff File | ||
mod - locale/fr/fr.mo | Diff File | ||
answers_html cc3775f1 2016-10-14 10:51:19 Details Diff |
Dev: readd border in default | ||
mod - templates/default/css/template.css | Diff File |