Changesets: LimeSurvey
|
2.5 2af53898 2015-12-15 16:25:30
|
Fixed issue 10140 : replaced gT by eT |
Affected Issues 10140 |
|
| mod - application/views/admin/token/bounce.php | Diff File | ||
|
2.5 d89cca58 2015-12-15 16:21:39
|
Fixed issue 10136: disable button when no participants |
Affected Issues 10136 |
|
| mod - application/views/admin/participants/participantsPanel_view.php | Diff File | ||
|
2.5 0bba6db7 2015-12-15 16:08:37
|
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
|
2.5 4fc88df3 2015-12-15 16:08:32
|
Fixed issue 10139: remove trash string |
Affected Issues 10139 |
|
| mod - application/views/admin/token/exportdialog.php | Diff File | ||
|
2.5 bf8db294 2015-12-15 15:55:43 Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/views/admin/labels/labelview_view.php | Diff File | ||
| mod - scripts/admin/labels.js | Diff File | ||
| add - styles/Sea_Green/css/.sass-cache/b8ed5539e8363b254e7afde4b3c4cf41319c881d/lime-admin.scssc | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.css | Diff File | ||
| add - styles/Sea_Green/css/lime-admin.css.map | Diff File | ||
| add - styles/Sea_Green/css/lime-admin.scss | Diff File | ||
|
2.5 5d6cf1d2 2015-12-15 15:55:38 Details Diff |
Fixed issue 10121: Add 'Resume later' and 'Exit and clear survey' buttons |
Affected Issues 10121 |
|
| mod - application/controllers/admin/templates.php | Diff File | ||
|
2.5 5aa7c87a 2015-12-15 15:41:07
|
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
| rm - application/views/admin/templates/templateeditor_footer.php | Diff File | ||
|
2.5 3fe10511 2015-12-15 15:40:52
|
Fixed issue 10120: redesigned labels |
Affected Issues 10120 |
|
| mod - application/views/admin/labels/labelview_view.php | Diff File | ||
| mod - scripts/admin/labels.js | Diff File | ||
| mod - styles/Sea_Green/css/.sass-cache/b8ed5539e8363b254e7afde4b3c4cf41319c881d/lime-admin.scssc | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.css | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.css.map | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.scss | Diff File | ||
|
2.5 2d65c2e5 2015-12-15 15:19:34 Details Diff |
Dev: Fixed issue 10101: Unable to test a survey or to see survey listing Dev: PHP 5.4 compatibility Dev: we trim, then we have a string |
Affected Issues 10101 |
|
| mod - application/helpers/SurveyRuntimeHelper.php | Diff File | ||
|
2.5 b1ecee28 2015-12-15 15:11:31 Details Diff |
Fixed issue 10121: Remove extra footer and add next/prev buttons as replace MOVENEXTBUTTON/MOVEPREVBUTTON |
Affected Issues 10121 |
|
| mod - application/controllers/admin/templates.php | Diff File | ||
| rm - application/views/admin/templates/templateeditor_footer.php | Diff File | ||
|
2.5 cafbb39d 2015-12-15 15:03:22
|
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/controllers/admin/usergroups.php | Diff File | ||
| mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
| mod - application/helpers/admin/token_helper.php | Diff File | ||
| mod - application/views/admin/htmleditor/pop_nofields_view.php | Diff File | ||
| add - application/views/admin/templates/templateeditor_footer.php | Diff File | ||
| mod - application/views/admin/templates/templateeditor_question_answer_view.php | Diff File | ||
| mod - docs/demosurveys/ls205_sample_survey_multilingual.lss | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/es/es.mo | Diff File | ||
| mod - locale/fi/fi.mo | Diff File | ||
| mod - locale/th/th.mo | Diff File | ||
| mod - scripts/expressions/em_javascript.js | Diff File | ||
| mod - scripts/map.js | Diff File | ||
|
2.5 0fcb965c 2015-12-15 15:03:10
|
Dev: template editor enhancements | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/views/admin/labels/labelview_view.php | Diff File | ||
| add - styles/Sea_Green/css/.sass-cache/b8ed5539e8363b254e7afde4b3c4cf41319c881d/lime-admin.scssc | Diff File | ||
| mod - styles/Sea_Green/css/lime-admin.css | Diff File | ||
| add - styles/Sea_Green/css/lime-admin.css.map | Diff File | ||
| add - styles/Sea_Green/css/lime-admin.scss | Diff File | ||
|
2.5 4f32a5a3 2015-12-15 14:57:29 Details Diff |
Fixed issue 10121: Add 'Previous' button to question page |
Affected Issues 10121 |
|
| mod - application/views/admin/templates/templateeditor_footer.php | Diff File | ||
|
2.5 3a59f4d2 2015-12-15 14:51:12 Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/controllers/admin/usergroups.php | Diff File | ||
|
2.5 fecec3fe 2015-12-15 14:50:57 Details Diff |
Fixed issue 10121: Add 'Next' button to question page |
Affected Issues 10121 |
|
| mod - application/controllers/admin/templates.php | Diff File | ||
| add - application/views/admin/templates/templateeditor_footer.php | Diff File | ||
|
2.5 02a0b65d 2015-12-15 14:28:26 Details Diff |
Dev Fixed button text | ||
| mod - application/controllers/admin/usergroups.php | Diff File | ||
|
2.5 4f420bd3 2015-12-15 14:18:59 Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/controllers/admin/usergroups.php | Diff File | ||
| mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
| mod - application/helpers/admin/token_helper.php | Diff File | ||
| mod - application/views/admin/htmleditor/pop_nofields_view.php | Diff File | ||
| mod - application/views/admin/templates/templateeditorbar_view.php | Diff File | ||
| mod - application/views/admin/templates/templatesummary_view.php | Diff File | ||
| mod - application/views/admin/user/personalsettings.php | Diff File | ||
| mod - application/views/admin/usergroup/viewUserGroup_view.php | Diff File | ||
| mod - docs/demosurveys/ls205_sample_survey_multilingual.lss | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/es/es.mo | Diff File | ||
| mod - locale/fi/fi.mo | Diff File | ||
| mod - locale/th/th.mo | Diff File | ||
| mod - scripts/expressions/em_javascript.js | Diff File | ||
| mod - scripts/map.js | Diff File | ||
|
2.5 081299f2 2015-12-15 14:18:48 Details Diff |
Fixed issue 10121: Replaced hard-coded HTML with new Bootstrap div:s for question page |
Affected Issues 10121 |
|
| mod - application/views/admin/templates/templateeditor_question_answer_view.php | Diff File | ||
|
2.5 3a495918 2015-12-15 14:03:54 Details Diff |
Merge remote-tracking branch 'origin/2.5' into 2.5 | ||
| mod - application/views/admin/templates/templatesummary_view.php | Diff File | ||
|
2.5 e5585957 2015-12-15 14:03:32 Details Diff |
Merge branch 'master' into 2.5 # Conflicts: # application/helpers/admin/token_helper.php |
||
| mod - application/controllers/admin/tokens.php | Diff File | ||
| mod - application/controllers/admin/usergroups.php | Diff File | ||
| mod - application/helpers/admin/htmleditor_helper.php | Diff File | ||
| mod - application/helpers/admin/token_helper.php | Diff File | ||
| mod - application/views/admin/htmleditor/pop_nofields_view.php | Diff File | ||
| mod - docs/demosurveys/ls205_sample_survey_multilingual.lss | Diff File | ||
| mod - docs/release_notes.txt | Diff File | ||
| mod - locale/_template/limesurvey.pot | Diff File | ||
| mod - locale/es/es.mo | Diff File | ||
| mod - locale/fi/fi.mo | Diff File | ||
| mod - locale/th/th.mo | Diff File | ||
| mod - scripts/expressions/em_javascript.js | Diff File | ||
| mod - scripts/map.js | Diff File | ||
|
2.5 7b7dce42 2015-12-15 14:03:11
|
Fixed issue 10122: added bootstrap class to select box |
Affected Issues 10122 |
|
| mod - application/views/admin/templates/templatesummary_view.php | Diff File | ||
|
2.5 75032c23 2015-12-15 13:58:57
|
Fixed issue 10123: added return button in template editor |
Affected Issues 10123 |
|
| mod - application/controllers/admin/templates.php | Diff File | ||
| mod - application/views/admin/templates/templateeditorbar_view.php | Diff File | ||
|
develop b00881b5 2015-12-15 13:56:42 Details Diff |
Dev Implemented enabling / disabling of authentication methods via console. | ||
| mod - protected/commands/PluginCommand.php | Diff File | ||
| mod - protected/components/PluginIdentity.php | Diff File | ||
| mod - protected/components/WebUser.php | Diff File | ||
| mod - protected/controllers/UsersController.php | Diff File | ||
| mod - protected/core/plugins/AuthLDAP/AuthLDAP.php | Diff File | ||
| mod - protected/core/plugins/Authdb/AuthDb.php | Diff File | ||
| mod - protected/core/plugins/Authwebserver/AuthWebServer.php | Diff File | ||
| mod - protected/core/plugins/DemoAuth/DemoAuth.php | Diff File | ||
| mod - protected/libraries/PluginManager/PluginEventBehavior.php | Diff File | ||
| mod - protected/libraries/PluginManager/PluginManager.php | Diff File | ||
| mod - protected/libraries/PluginManager/iUser.php | Diff File | ||
| mod - protected/models/User.php | Diff File | ||
| mod - protected/views/users/index.php | Diff File | ||
|
2.5 ce4a0a68 2015-12-15 13:50:29
|
Fixed issue 10125: select boxes shortened by 50%. |
Affected Issues 10125 |
|
| mod - application/views/admin/user/personalsettings.php | Diff File | ||
|
2.5 d636ff8b 2015-12-15 13:46:41
|
Fixed issue 10132: don't show delete button for admin user |
Affected Issues 10132 |
|
| mod - application/views/admin/usergroup/viewUserGroup_view.php | Diff File | ||
