LimeSurvey: cint df24756d

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar cint 2016-08-04 14:52:00 cint dc76f80a
Changeset

Merge remote-tracking branch 'origin/master' into cint

Conflicts:
application/views/admin/super/footer.php
mod - .gitignore 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/statistics.php Diff File
mod - application/controllers/admin/tokens.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/common_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/models/AdminTheme.php Diff File
add - application/models/Notification.php Diff File
mod - application/models/User.php Diff File
add - application/views/admin/notification/index.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/register/registerForm.php Diff File
add - application/views/survey/frontpage/enterCaptcha.php Diff File
add - application/views/survey/frontpage/enterToken.php Diff File
rm - application/views/surveys/enterToken.php Diff File
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/nl-informal/nl-informal.mo Diff File
mod - locale/nl/nl.mo Diff File
mod - locale/pl/pl.mo Diff File
add - scripts/admin/notifications.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/template-rtl.css Diff File
mod - templates/default/css/template.css Diff File
mod - templates/default/views/register.pstpl 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/views/register.pstpl 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/views/register.pstpl Diff File
add - third_party/moment/moment-with-locales.min.js Diff File