Changesets: LimeSurvey
|
2.5 02166ea0 2015-12-11 11:58
Details Diff |
Fixed issue 10080: column system for Multiple short text |
Affected Issues 10080 |
|
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
2.5 c7a11820 2015-12-11 11:01
Details Diff |
Dev : column control for multiplechoice | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
2.5 1980a239 2015-12-11 10:01
Details Diff |
Dev: stretch accordion, second part | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/newQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/question_subviews/_accordion_container.php | Diff File | ||
| mod - styles/Sea_Green/scripts/sidemenu.js | Diff File | ||
|
2.5 ea258dfd 2015-12-10 17:02 Details Diff |
enforce the mandatory token field + show warning if the import csv file contains ignored columns | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/views/admin/token/csvpost.php | Diff File | ||
| mod - application/views/admin/token/csvupload.php | Diff File | ||
|
2.5 f09c0ac8 2015-12-10 16:47
Details Diff |
Dev : stretch accordion, first part |
Affected Issues 10099 |
|
| mod - application/config/version.php | Diff File | ||
| mod - application/views/admin/survey/editLocalSettings_main_view.php | Diff File | ||
| mod - application/views/admin/survey/subview/accordion/_accordion_container.php | Diff File | ||
| mod - styles/Sea_Green/scripts/sidemenu.js | Diff File | ||
| mod - tmp/comfort_updater_cookie.txt | Diff File | ||
|
2.5 2141fbe3 2015-12-10 14:50
Details Diff |
Dev: added the possibility to stretch side menu | ||
| mod - application/views/admin/htmleditor/pop_editor_view.php | Diff File | ||
| mod - application/views/admin/super/sidemenu.php | Diff File | ||
| mod - styles/Sea_Green/scripts/sidemenu.js | Diff File | ||
| add - tmp/comfort_updater_cookie.txt | Diff File | ||
|
master 323bcba8 2015-12-10 11:55 Details Diff |
reset the session of the survey when deactivating it | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/helpers/admin/activate_helper.php | Diff File | ||
|
master cb707d61 2015-12-09 18:15 Details Diff |
Fixed issue 09856: kcfinder not working with symlinked /upload Dev: best is surely to put the realpath in config |
Affected Issues 09856 |
|
| mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
|
master e30ac928 2015-12-09 17:26 Details Diff |
New feature 09904 : allow to use EXPIRY in expression when sending email Dev: Think SURVEYNAME/ADMINNAM etc ... don't have to be used Dev: maybe adding it when have same function for GUI and for RC |
Affected Issues 09904 |
|
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/helpers/admin/token_helper.php | Diff File | ||
|
master 7e3b798e 2015-12-09 17:03 Details Diff |
Dev: Fixed issue remove script from demo survey | ||
| mod - docs/demosurveys/ls205_sample_survey_multilingual.lss | Diff File | ||
|
master 1e653828 2015-12-09 16:44 Details Diff |
Fixed issue: lack the full name of the sender in the " from" field when using JSON-PRC Dev: the bfore fix don't fix issue Dev: use $oSurvey, not $aSurvey Dev: we need same function for GUI and RC... |
||
| mod - application/helpers/admin/token_helper.php | Diff File | ||
|
master f1e0bc93 2015-12-09 15:52 Details Diff |
Fixed issue : Unable to open HTML editor in popup Dev: Don't know when exactly pop_nofields_view but call is done in /controllers/admin/htmleditor_pop |
||
| mod - application/views/admin/htmleditor/pop_editor_view.php | Diff File | ||
| mod - application/views/admin/htmleditor/pop_nofields_view.php | Diff File | ||
|
2.5 fba77c36 2015-12-09 15:36
Details Diff |
Fixed issue 10074: body has a new class 'bootstrap-engine' |
Affected Issues 10074 |
|
| mod - application/helpers/replacements_helper.php | Diff File | ||
|
2.5 e212ae2a 2015-12-09 15:22
Details Diff |
Fixed issue 10094: redesign 'other' checkbox |
Affected Issues 10094 |
|
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
2.5 9ea6949f 2015-12-09 14:54
Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
|
2.5 799dd961 2015-12-09 14:53
Details Diff |
Fixed issue #9762: rewrote the engine to calculate cols | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/admin/super/header.php | Diff File | ||
| mod - application/views/layouts/main.php | Diff File | ||
|
master 6d9c2c9b 2015-12-09 14:53 Details Diff |
10083: Condition on Mapping Service Question seems to apply to all following questions Dev Added a listener to reset the map tiles when question is shown |
||
| mod - scripts/map.js | Diff File | ||
|
master ebd056b5 2015-12-09 14:48 Details Diff |
Dev Fixed typo | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
|
2.5 f8ded040 2015-12-09 14:46 Details Diff |
Dev Fixed typo | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
|
master 897c77f4 2015-12-09 13:01 Details Diff |
Merge pull request #390 from gabrieljenik/patch-23 Fixed Issue 10062: SuperAdmin can't add users to not-owned UserGroups |
Affected Issues 10062 |
|
| mod - application/controllers/admin/usergroups.php | Diff File | ||
|
master 1d4307b8 2015-12-09 12:55 Details Diff |
Fixed Issue 10062: SuperAdmin can't add users to not-owned UserGroups If statement uses its own {} block |
Affected Issues 10062 |
|
| mod - application/controllers/admin/usergroups.php | Diff File | ||
|
2.5 7ab13bd0 2015-12-09 12:54
Details Diff |
Dev: added trim to check if groupdesc is empty | ||
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
|
2.5 4f0689ba 2015-12-09 12:47
Details Diff |
Fixed issue 10091: don't load groupdescription.pstl if no group desc |
Affected Issues 10091 |
|
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
2.5 7944236b 2015-12-09 12:32 Details Diff |
Merge remote-tracking branch 'origin/2.5' into 2.5 | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
|
2.5 3225a6ef 2015-12-09 12:31 Details Diff |
Merge branch 'master' into 2.5 # Conflicts: # application/config/internal.php # application/views/admin/super/adminmenu.php # application/views/admin/survey/subview/tabNotification_view.php # application/views/admin/token/tokenform.php # application/views/plugins/index.php # locale/de-informal/de-informal.mo # locale/el/el.mo # locale/ru/ru.mo # locale/th/th.mo |
||
| mod - application/config/internal.php | Diff File | ||
| mod - application/controllers/PluginsController.php | Diff File | ||
| mod - application/controllers/SurveysController.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/core/LSYii_Application.php | Diff File | ||
| rm - application/extensions/ExtendedClientScript/ExtendedClientScript.php | Diff | ||
| rm - application/extensions/ExtendedClientScript/cssmin/cssmin.php | Diff | ||
| rm - application/extensions/ExtendedClientScript/jsmin/JSMin.php | Diff | ||
| mod - application/helpers/admin/import_helper.php | Diff File | ||
| mod - application/helpers/expressions/em_manager_helper.php | Diff File | ||
| mod - application/helpers/qanda_helper.php | Diff File | ||
| mod - application/views/admin/survey/subview/tabNotification_view.php | Diff File | ||
| mod - application/views/admin/token/tokenform.php | Diff File | ||
| mod - application/views/installer/precheck_view.php | Diff File | ||
| mod - application/views/plugins/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/de-informal/de-informal.mo | Diff File | ||
| mod - locale/de/de.mo | Diff File | ||
| mod - locale/el/el.mo | Diff File | ||
| mod - locale/en/en.mo | Diff File | ||
| mod - locale/et/et.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/pl/pl.mo | Diff File | ||
| mod - locale/pt-BR/pt-BR.mo | Diff File | ||
| mod - locale/pt/pt.mo | Diff File | ||
| mod - locale/ru/ru.mo | Diff File | ||
| mod - locale/sq/sq.mo | Diff File | ||
| mod - locale/sv/sv.mo | Diff File | ||
| mod - locale/th/th.mo | Diff File | ||
| mod - locale/tr/tr.mo | Diff File | ||
| mod - locale/vi/vi.mo | Diff File | ||
| mod - locale/zh-Hant-HK/zh-Hant-HK.mo | Diff File | ||
| mod - locale/zh-Hant-TW/zh-Hant-TW.mo | Diff File | ||
