Changesets: LimeSurvey
answers_html 8d0379b1 2016-08-09 18:31 Details Diff |
Dev: 5 point choice : inlined form, maybe add some margin ? | ||
mod - application/views/survey/questions/5pointchoice/answer.php | Diff File | ||
mod - application/views/survey/questions/5pointchoice/rows/item_row.php | Diff File | ||
answers_html 0594977f 2016-08-09 18:04 Details Diff |
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey.git into answers_html | ||
mod - .gitignore | Diff File | ||
mod - application/config/config-defaults.php | Diff File | ||
mod - application/config/third_party.php | Diff File | ||
mod - application/config/version.php | Diff File | ||
mod - application/controllers/AdminController.php | Diff File | ||
mod - application/controllers/RegisterController.php | Diff File | ||
mod - application/controllers/SurveyController.php | Diff File | ||
add - application/controllers/admin/NotificationController.php | Diff File | ||
mod - application/controllers/admin/PluginHelper.php | Diff File | ||
mod - application/controllers/admin/globalsettings.php | Diff File | ||
mod - application/controllers/admin/statistics.php | Diff File | ||
mod - application/controllers/admin/surveyadmin.php | Diff File | ||
mod - application/controllers/admin/tokens.php | Diff File | ||
mod - application/controllers/admin/useraction.php | Diff File | ||
mod - application/controllers/survey/index.php | Diff File | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/extensions/admin/survey/question/PositionWidget/PositionWidget.php | Diff File | ||
mod - application/extensions/yiiwheels/widgets/datetimepicker/WhDateTimePicker.php | Diff File | ||
mod - application/helpers/admin/export/DocWriter.php | Diff File | ||
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/helpers/expressions/em_core_helper.php | Diff File | ||
mod - application/helpers/frontend_helper.php | Diff File | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - application/helpers/update/updatedb_helper.php | Diff File | ||
mod - application/libraries/PluginManager/LimesurveyApi.php | Diff File | ||
mod - application/models/AdminTheme.php | Diff File | ||
add - application/models/Notification.php | Diff File | ||
mod - application/models/Token.php | Diff File | ||
mod - application/models/TokenDynamic.php | Diff File | ||
mod - application/models/User.php | Diff File | ||
add - application/views/admin/notification/index.php | Diff File | ||
mod - application/views/admin/notifications/notifications.php | Diff File | ||
add - application/views/admin/super/admin_notifications.php | Diff File | ||
mod - application/views/admin/super/adminmenu.php | Diff File | ||
mod - application/views/admin/super/footer.php | Diff File | ||
mod - application/views/admin/super/sidebody.php | Diff File | ||
mod - application/views/admin/survey/surveybar_view.php | Diff File | ||
mod - application/views/admin/token/addtokenpost.php | Diff File | ||
mod - application/views/admin/user/editusers.php | Diff File | ||
mod - application/views/register/registerForm.php | Diff File | ||
add - application/views/survey/frontpage/enterCaptcha.php | Diff File | ||
add - application/views/survey/frontpage/enterToken.php | Diff File | ||
mod - application/views/survey/questions/arrays/column/answer.php | Diff File | ||
mod - application/views/survey/questions/multiplenumeric/rows/input/answer_row.php | Diff File | ||
mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php | Diff File | ||
rm - application/views/surveys/enterToken.php | Diff | ||
mod - docs/release_notes.txt | Diff File | ||
mod - framework/web/widgets/captcha/CCaptcha.php | Diff File | ||
mod - installer/sql/create-mssql.sql | Diff File | ||
mod - installer/sql/create-mysql.sql | Diff File | ||
mod - installer/sql/create-pgsql.sql | Diff File | ||
mod - locale/_template/limesurvey.pot | Diff File | ||
mod - locale/de-informal/de-informal.mo | Diff File | ||
mod - locale/de/de.mo | Diff File | ||
mod - locale/es/es.mo | Diff File | ||
mod - locale/et/et.mo | Diff File | ||
mod - locale/fr/fr.mo | Diff File | ||
mod - locale/id/id.mo | Diff File | ||
mod - locale/it-informal/it-informal.mo | Diff File | ||
mod - locale/it/it.mo | Diff File | ||
mod - locale/ja/ja.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 - plugins/AuditLog/AuditLog.php | Diff File | ||
mod - scripts/admin/answers.js | Diff File | ||
add - scripts/admin/notifications.js | Diff File | ||
mod - scripts/admin/subquestions.js | Diff File | ||
mod - scripts/admin/users.js | Diff File | ||
mod - scripts/array-totalsum.js | Diff File | ||
mod - scripts/date.js | Diff File | ||
mod - scripts/expressions/em_javascript.js | Diff File | ||
mod - styles/Apple_Blossom/css/lime-admin-colors.css | Diff File | ||
mod - styles/Apple_Blossom/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Apple_Blossom/css/lime-admin-common.css | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-colors.css | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Bay_of_Many/css/lime-admin-common.css | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-colors.css | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Black_Pearl/css/lime-admin-common.css | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-colors.css | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Dark_Sky/css/lime-admin-common.css | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-colors.css | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Free_Magenta/css/lime-admin-common.css | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-colors.css | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Noto_All_Languages/css/lime-admin-common.css | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-colors.css | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Purple_Tentacle/css/lime-admin-common.css | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-colors.css | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Sea_Green/css/lime-admin-common.css | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-colors.css | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-common-rtl.css | Diff File | ||
mod - styles/Sunset_Orange/css/lime-admin-common.css | Diff File | ||
mod - templates/default/css/bootstrap-slider-rtl.css | Diff File | ||
mod - templates/default/css/bootstrap-slider.css | Diff File | ||
mod - templates/default/css/template-rtl.css | Diff File | ||
mod - templates/default/css/template.css | Diff File | ||
mod - templates/default/scripts/template.js | Diff File | ||
mod - templates/default/views/register.pstpl | Diff File | ||
mod - templates/news_paper/css/bootstrap-slider-rtl.css | Diff File | ||
mod - templates/news_paper/css/bootstrap-slider.css | Diff File | ||
mod - templates/news_paper/css/template-rtl.css | Diff File | ||
mod - templates/news_paper/css/template.css | Diff File | ||
mod - templates/news_paper/scripts/template.js | Diff File | ||
mod - templates/news_paper/views/register.pstpl | Diff File | ||
mod - templates/ubuntu_orange/css/bootstrap-slider-rtl.css | Diff File | ||
mod - templates/ubuntu_orange/css/bootstrap-slider.css | Diff File | ||
mod - templates/ubuntu_orange/css/template-rtl.css | Diff File | ||
mod - templates/ubuntu_orange/css/template.css | Diff File | ||
mod - templates/ubuntu_orange/scripts/template.js | Diff File | ||
mod - templates/ubuntu_orange/views/register.pstpl | Diff File | ||
mod - third_party/bootstrap-slider/bootstrap-slider.js | Diff File | ||
mod - third_party/bootstrap-slider/bootstrap-slider.min.js | Diff File | ||
add - third_party/decimal/CHANGELOG.md | Diff File | ||
add - third_party/decimal/LICENCE.md | Diff File | ||
add - third_party/decimal/README.md | Diff File | ||
add - third_party/decimal/decimal.js | Diff File | ||
add - third_party/decimal/decimal.min.js | Diff File | ||
add - third_party/moment/moment-with-locales.min.js | Diff File | ||
cint aba1bd1c 2016-08-09 14:51 Details Diff |
Dev: Fetch global variables from Cint at plugin activation | ||
mod - application/core/plugins/CintLink/CintLink.php | Diff File | ||
add - application/core/plugins/CintLink/CintXml.php | Diff File | ||
cint be9515e3 2016-08-09 13:39 Details Diff |
Merge remote-tracking branch 'origin/master' into cint | ||
mod - application/controllers/admin/useraction.php | Diff File | ||
mod - templates/default/css/bootstrap-slider-rtl.css | Diff File | ||
mod - templates/default/css/bootstrap-slider.css | Diff File | ||
mod - templates/news_paper/css/bootstrap-slider-rtl.css | Diff File | ||
mod - templates/news_paper/css/bootstrap-slider.css | Diff File | ||
mod - templates/ubuntu_orange/css/bootstrap-slider-rtl.css | Diff File | ||
mod - templates/ubuntu_orange/css/bootstrap-slider.css | Diff File | ||
mod - third_party/bootstrap-slider/bootstrap-slider.js | Diff File | ||
mod - third_party/bootstrap-slider/bootstrap-slider.min.js | Diff File | ||
cint 8357dead 2016-08-09 13:39 Details Diff |
Dev: Warn about token table at Cint dashboard | ||
mod - application/core/plugins/CintLink/CintLink.php | Diff File | ||
mod - application/core/plugins/CintLink/model/CintLinkOrder.php | Diff File | ||
mod - application/core/plugins/CintLink/views/dashboard.php | Diff File | ||
master 014022b4 2016-08-09 13:23
Details Diff |
Dev: Refactored deluser | ||
mod - application/controllers/admin/useraction.php | Diff File | ||
master 5fe8b845 2016-08-09 12:59
Details Diff |
Dev: Updated bootstrap-slider.css to newest version | ||
mod - templates/default/css/bootstrap-slider-rtl.css | Diff File | ||
mod - templates/default/css/bootstrap-slider.css | Diff File | ||
mod - templates/news_paper/css/bootstrap-slider-rtl.css | Diff File | ||
mod - templates/news_paper/css/bootstrap-slider.css | Diff File | ||
mod - templates/ubuntu_orange/css/bootstrap-slider-rtl.css | Diff File | ||
mod - templates/ubuntu_orange/css/bootstrap-slider.css | Diff File | ||
cint 1061813a 2016-08-09 11:16 Details Diff |
Dev: Disable participants if user has any Cint orders | ||
mod - application/core/plugins/CintLink/CintLink.php | Diff File | ||
mod - application/core/plugins/CintLink/model/CintLinkOrder.php | Diff File | ||
cint 72793a1d 2016-08-09 11:15 Details Diff |
Dev: Add function to get original url referrer | ||
mod - application/core/LSHttpRequest.php | Diff File | ||
master 627a3a4f 2016-08-09 11:03
Details Diff |
Dev: Update bootstrap-slider to latet Version | ||
mod - third_party/bootstrap-slider/bootstrap-slider.js | Diff File | ||
mod - third_party/bootstrap-slider/bootstrap-slider.min.js | Diff File | ||
cint ffd5b411 2016-08-09 10:47 Details Diff |
Dev: Include Javascript Cint settings in PHP instead of view | ||
mod - application/core/plugins/CintLink/CintLink.php | Diff File | ||
cint 0e983fb0 2016-08-09 10:46 Details Diff |
Dev: Removed unused function | ||
mod - application/controllers/AdminController.php | Diff File | ||
cint c0150303 2016-08-09 10:30 Details Diff |
Dev: Clearer indentation | ||
mod - application/controllers/AdminController.php | Diff File | ||
cint 7d36fcff 2016-08-09 10:27 Details Diff |
Dev: phpdoc | ||
mod - application/controllers/admin/PluginHelper.php | Diff File | ||
cint 9bcf00b9 2016-08-09 09:51 Details Diff |
Merge remote-tracking branch 'origin/master' into cint | ||
mod - application/config/config-defaults.php | Diff File | ||
mod - application/controllers/admin/globalsettings.php | Diff File | ||
mod - application/controllers/admin/useraction.php | Diff File | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/helpers/common_helper.php | Diff File | ||
mod - application/models/User.php | Diff File | ||
mod - application/views/admin/user/editusers.php | Diff File | ||
mod - scripts/admin/answers.js | Diff File | ||
mod - scripts/admin/subquestions.js | Diff File | ||
mod - scripts/admin/users.js | Diff File | ||
mod - templates/default/scripts/template.js | Diff File | ||
mod - templates/news_paper/scripts/template.js | Diff File | ||
mod - templates/ubuntu_orange/scripts/template.js | Diff File | ||
master 6e8e68c8 2016-08-09 09:05 Details Diff |
Dev Removed unused setting | ||
mod - application/config/config-defaults.php | Diff File | ||
mod - application/helpers/common_helper.php | Diff File | ||
master f717a825 2016-08-08 19:06
Details Diff |
Fixed issue 11525: Wrong JS at template.js breaks certain survey features |
Affected Issues 11525 |
|
mod - templates/default/scripts/template.js | Diff File | ||
mod - templates/news_paper/scripts/template.js | Diff File | ||
mod - templates/ubuntu_orange/scripts/template.js | Diff File | ||
master 2c69a2db 2016-08-08 18:58
Details Diff |
Fixed issue: Quick add using a single ajax for each row Dev: corrected to only catch the html once and then parse it through js |
||
mod - scripts/admin/answers.js | Diff File | ||
mod - scripts/admin/subquestions.js | Diff File | ||
master 4bfbbba7 2016-08-08 16:31
Details Diff |
Fixed issue 11498: Adding a new admin user is weird Dev: User Administration now a CGridView |
Affected Issues 11498 |
|
mod - application/controllers/admin/globalsettings.php | Diff File | ||
mod - application/controllers/admin/useraction.php | Diff File | ||
mod - application/core/Survey_Common_Action.php | Diff File | ||
mod - application/models/User.php | Diff File | ||
mod - application/views/admin/user/editusers.php | Diff File | ||
mod - scripts/admin/users.js | Diff File | ||
cint c385fab3 2016-08-08 15:17 Details Diff |
Dev: Add plus after age if only min-age (CintLink) | ||
mod - application/core/plugins/CintLink/CintLink.php | Diff File | ||
mod - application/core/plugins/CintLink/model/CintLinkOrder.php | Diff File | ||
cint d65bca09 2016-08-08 14:58 Details Diff |
Dev: Rename info to target group (CintLink) | ||
mod - application/core/plugins/CintLink/model/CintLinkOrder.php | Diff File | ||
mod - application/core/plugins/CintLink/views/dashboard.php | Diff File | ||
cint 0fb546d4 2016-08-08 14:51 Details Diff |
Dev: Add more columns in the Cint grid view | ||
mod - application/core/plugins/CintLink/css/cintlink.css | Diff File | ||
mod - application/core/plugins/CintLink/model/CintLinkOrder.php | Diff File | ||
mod - application/core/plugins/CintLink/views/dashboard.php | Diff File | ||
cint 98c83655 2016-08-08 14:26 Details Diff |
Dev: Only add string if not empty (CintLink) | ||
mod - application/core/plugins/CintLink/model/CintLinkOrder.php | Diff File | ||
cint 322b9ba3 2016-08-08 12:43 Details Diff |
Dev: Add Cint order info in grid view | ||
mod - application/core/plugins/CintLink/model/CintLinkOrder.php | Diff File | ||
mod - application/core/plugins/CintLink/views/dashboard.php | Diff File | ||
cint d2d91e06 2016-08-08 12:25 Details Diff |
Dev: Factor code in Cint dashboard view | ||
mod - application/core/plugins/CintLink/CintLink.php | Diff File | ||
mod - application/core/plugins/CintLink/views/dashboard.php | Diff File |