Changesets: LimeSurvey

master ab54c15e

2016-04-25 08:57:25

ollehar

Details Diff
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

Conflicts:
application/views/survey/questions/date/selector/answer.php
Attach Issues:
mod - application/config/third_party.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/views/admin/super/header.php Diff File
mod - application/views/layouts/installer.php Diff File
mod - application/views/survey/questions/arrays/dualscale/answer.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File
mod - application/views/survey/system/questionhelp/mandatory_tip.php Diff File
mod - application/views/survey/system/questionhelp/questionhelp.php Diff File
mod - application/views/survey/system/questionhelp/tips.php Diff File
mod - application/views/surveys/publicSurveyList.php Diff File
rm - installer/css/font-awesome.css Diff File
rm - installer/fonts/DejaVuSans - CREDITS Diff File
rm - installer/fonts/DejaVuSans.ttf Diff File
rm - installer/fonts/FontAwesome.otf Diff File
rm - installer/fonts/FreeSans - CREDITS Diff File
rm - installer/fonts/FreeSans.ttf Diff File
rm - installer/fonts/TlwgTypist - Thai.ttf.txt Diff File
rm - installer/fonts/UnBatang - Korean.ttf.txt Diff File
rm - installer/fonts/fireflysung - Chinese.ttf.txt Diff File
rm - installer/fonts/fontawesome-webfont.eot Diff File
rm - installer/fonts/fontawesome-webfont.svg Diff File
rm - installer/fonts/fontawesome-webfont.ttf Diff File
rm - installer/fonts/fontawesome-webfont.woff Diff File
rm - installer/fonts/fontawesome-webfont.woff2 Diff File
rm - installer/fonts/glyphicons-halflings-regular.svg Diff File
rm - installer/fonts/glyphicons-halflings-regular.ttf Diff File
rm - installer/fonts/glyphicons-halflings-regular.woff Diff File
rm - installer/fonts/glyphicons-halflings-regular.woff2 Diff File
rm - installer/fonts/migmix-1p-regular - Japanese.ttf.txt Diff File
mod - templates/default/config.xml Diff File
rm - templates/default/fonts/FontAwesome.otf Diff File
rm - templates/default/fonts/fontawesome-webfont.eot Diff File
rm - templates/default/fonts/fontawesome-webfont.svg Diff File
rm - templates/default/fonts/fontawesome-webfont.ttf Diff File
rm - templates/default/fonts/fontawesome-webfont.woff Diff File
mod - templates/news_paper/config.xml Diff File
rm - templates/news_paper/css/font-awesome.css Diff File
rm - templates/news_paper/fonts/fontawesome-webfont.eot Diff File
rm - templates/news_paper/fonts/fontawesome-webfont.ttf Diff File
rm - templates/news_paper/fonts/fontawesome-webfont.woff Diff File
rm - templates/news_paper/fonts/fontawesome-webfont.woff2 Diff File
mod - templates/ubuntu_orange/config.xml Diff File
rm - templates/ubuntu_orange/fonts/FontAwesome.otf Diff File
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.eot Diff File
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.svg Diff File
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.woff Diff File
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.woff2 Diff File
rm - third_party/font-awesome/css/font-awesome.css Diff File
rm - third_party/font-awesome/css/font-awesome.min.css Diff File
rm - third_party/font-awesome/fonts/FontAwesome.otf Diff File
rm - third_party/font-awesome/fonts/fontawesome-webfont.eot Diff File
rm - third_party/font-awesome/fonts/fontawesome-webfont.svg Diff File
rm - third_party/font-awesome/fonts/fontawesome-webfont.ttf Diff File
rm - third_party/font-awesome/fonts/fontawesome-webfont.woff Diff File
rm - third_party/font-awesome/less/mixins.less Diff File
rm - third_party/font-awesome/scss/_mixins.scss Diff File
add - third_party/fontawesome/.gitignore Diff File
add - third_party/fontawesome/.npmignore Diff File
add - third_party/fontawesome/HELP-US-OUT.txt Diff File
add - third_party/fontawesome/bower.json Diff File
add - third_party/fontawesome/css/font-awesome.css.map Diff File
add - third_party/fontawesome/css/font-awesome.min.css Diff File
add - third_party/fontawesome/fonts/4.4.0/index.html Diff File
add - third_party/fontawesome/fonts/fontawesome-webfont.eot Diff File
add - third_party/fontawesome/fonts/fontawesome-webfont.woff Diff File
add - third_party/fontawesome/fonts/fontawesome-webfont.woff2 Diff File
add - third_party/fontawesome/less/mixins.less Diff File
add - third_party/fontawesome/less/screen-reader.less Diff File
add - third_party/fontawesome/scss/_mixins.scss Diff File
add - third_party/fontawesome/scss/_screen-reader.scss Diff File

master 84e4ac68

2016-04-24 16:15:02

DenisChenu

Details Diff
Merge pull request #478 from Shnoulle/master_fontawesome

New feature 10954 : always add font-awesome in public and admin
Affected Issues
10954
mod - application/config/third_party.php Diff File
mod - application/controllers/survey/index.php Diff File
mod - application/helpers/common_helper.php Diff File
mod - application/views/admin/super/header.php Diff File
mod - application/views/layouts/installer.php Diff File
mod - application/views/survey/questions/arrays/dualscale/answer.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File
mod - application/views/survey/system/questionhelp/mandatory_tip.php Diff File
mod - application/views/survey/system/questionhelp/questionhelp.php Diff File
mod - application/views/survey/system/questionhelp/tips.php Diff File
mod - application/views/surveys/publicSurveyList.php Diff File
rm - installer/css/font-awesome.css Diff File
rm - installer/fonts/DejaVuSans - CREDITS Diff File
rm - installer/fonts/DejaVuSans.ttf Diff File
rm - installer/fonts/FontAwesome.otf Diff File
rm - installer/fonts/FreeSans - CREDITS Diff File
rm - installer/fonts/FreeSans.ttf Diff File
rm - installer/fonts/TlwgTypist - Thai.ttf.txt Diff File
rm - installer/fonts/UnBatang - Korean.ttf.txt Diff File
rm - installer/fonts/fireflysung - Chinese.ttf.txt Diff File
rm - installer/fonts/fontawesome-webfont.eot Diff File
rm - installer/fonts/fontawesome-webfont.svg Diff File
rm - installer/fonts/fontawesome-webfont.ttf Diff File
rm - installer/fonts/fontawesome-webfont.woff Diff File
rm - installer/fonts/fontawesome-webfont.woff2 Diff File
rm - installer/fonts/glyphicons-halflings-regular.svg Diff File
rm - installer/fonts/glyphicons-halflings-regular.ttf Diff File
rm - installer/fonts/glyphicons-halflings-regular.woff Diff File
rm - installer/fonts/glyphicons-halflings-regular.woff2 Diff File
rm - installer/fonts/migmix-1p-regular - Japanese.ttf.txt Diff File
mod - templates/default/config.xml Diff File
rm - templates/default/fonts/FontAwesome.otf Diff File
rm - templates/default/fonts/fontawesome-webfont.eot Diff File
rm - templates/default/fonts/fontawesome-webfont.svg Diff File
rm - templates/default/fonts/fontawesome-webfont.ttf Diff File
rm - templates/default/fonts/fontawesome-webfont.woff Diff File
mod - templates/news_paper/config.xml Diff File
rm - templates/news_paper/css/font-awesome.css Diff File
rm - templates/news_paper/fonts/fontawesome-webfont.eot Diff File
rm - templates/news_paper/fonts/fontawesome-webfont.ttf Diff File
rm - templates/news_paper/fonts/fontawesome-webfont.woff Diff File
rm - templates/news_paper/fonts/fontawesome-webfont.woff2 Diff File
mod - templates/ubuntu_orange/config.xml Diff File
rm - templates/ubuntu_orange/fonts/FontAwesome.otf Diff File
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.eot Diff File
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.svg Diff File
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.woff Diff File
rm - templates/ubuntu_orange/fonts/fontawesome-webfont.woff2 Diff File
rm - third_party/font-awesome/css/font-awesome.css Diff File
rm - third_party/font-awesome/css/font-awesome.min.css Diff File
rm - third_party/font-awesome/fonts/FontAwesome.otf Diff File
rm - third_party/font-awesome/fonts/fontawesome-webfont.eot Diff File
rm - third_party/font-awesome/fonts/fontawesome-webfont.svg Diff File
rm - third_party/font-awesome/fonts/fontawesome-webfont.ttf Diff File
rm - third_party/font-awesome/fonts/fontawesome-webfont.woff Diff File
rm - third_party/font-awesome/less/mixins.less Diff File
rm - third_party/font-awesome/scss/_mixins.scss Diff File
add - third_party/fontawesome/.gitignore Diff File
add - third_party/fontawesome/.npmignore Diff File
add - third_party/fontawesome/HELP-US-OUT.txt Diff File
add - third_party/fontawesome/bower.json Diff File
add - third_party/fontawesome/css/font-awesome.css.map Diff File
add - third_party/fontawesome/css/font-awesome.min.css Diff File
add - third_party/fontawesome/fonts/4.4.0/index.html Diff File
add - third_party/fontawesome/fonts/fontawesome-webfont.eot Diff File
add - third_party/fontawesome/fonts/fontawesome-webfont.woff Diff File
add - third_party/fontawesome/fonts/fontawesome-webfont.woff2 Diff File
add - third_party/fontawesome/less/mixins.less Diff File
add - third_party/fontawesome/less/screen-reader.less Diff File
add - third_party/fontawesome/scss/_mixins.scss Diff File
add - third_party/fontawesome/scss/_screen-reader.scss Diff File

master 237af255

2016-04-24 16:08:11

DenisChenu

Details Diff
Dev: lost third_party file
Attach Issues:
mod - application/config/third_party.php Diff File

master c773ec68

2016-04-22 16:02:47

ollehar

Details Diff
Dev: Revert jsdate to old state
Attach Issues:
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/surveytranslator_helper.php Diff File
mod - scripts/date.js Diff File

master 755d74e4

2016-04-22 15:58:56

ollehar

Details Diff
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
Attach Issues:
mod - application/views/survey/questions/multiplenumeric/rows/input/answer_row.php Diff File
mod - templates/default/css/template.css Diff File
mod - templates/news_paper/css/template.css Diff File
mod - templates/ubuntu_orange/css/template.css Diff File

master dbf9ffe8

2016-04-22 15:24:32

LouisGac

Details Diff
Fixed issue 11014: Multiple numeric input with narrow colum is aligned too right Affected Issues
11014
mod - application/views/survey/questions/multiplenumeric/rows/input/answer_row.php Diff File
mod - templates/default/css/template.css Diff File
mod - templates/news_paper/css/template.css Diff File
mod - templates/ubuntu_orange/css/template.css Diff File

master 849a61ca

2016-04-22 15:07:21

ollehar

Details Diff
Dev: Include Bootstrap DateTimePicker as third-party library
Attach Issues:
mod - application/config/third_party.php Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/README.md Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/bower.json Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/daterangepicker.css Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/daterangepicker.js Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/daterangepicker.scss Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/demo.html Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/drp.png Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/moment.js Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/moment.min.js Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/package.js Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/package.json Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/website/index.html Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/website/website.css Diff File
add - third_party/bootstrap-daterangepicker-2.1.19/website/website.js Diff File

master 7e2b9a43

2016-04-22 14:59:57

ollehar

Details Diff
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
Attach Issues:
mod - application/controllers/UploaderController.php Diff File
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/homepagesettings.php Diff File
mod - application/controllers/admin/usergroups.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/models/QuestionGroup.php Diff File
mod - application/models/Survey.php Diff File
mod - application/views/admin/survey/subview/tabNotification_view.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php Diff File

master 53d1507b

2016-04-22 14:59:52

ollehar

Details Diff
Dev: Replace datepicker in frontend with bootstrap datetimepicker
Attach Issues:
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/date/selector/answer.php Diff File

master 240dd5a1

2016-04-22 14:58:46

LouisGac

Details Diff
Fixed issue 11000: Slider question rendered too small Affected Issues
11000
mod - application/helpers/qanda_helper.php Diff File
mod - application/views/survey/questions/multiplenumeric/rows/sliders/answer_row.php Diff File

master 58b23fcf

2016-04-22 14:30:58

DenisChenu

Details Diff
Fixed issue 11018: User with only statistics access can see survey in list
Dev: test only model entitity + entity_id for listing
Dev: tested with nonly stat access : seems OK (no preview, can see some part : but can already see it in statistic)
Affected Issues
11018
mod - application/models/Survey.php Diff File

master f28ff155

2016-04-22 14:08:51

c_schmitz

Details Diff
Fixed #11004: [security] Unauthorized access to certain admin pages by restricted admins Affected Issues
11004
mod - application/controllers/admin/globalsettings.php Diff File
mod - application/controllers/admin/homepagesettings.php Diff File
mod - application/controllers/admin/usergroups.php Diff File

master 14002a64

2016-04-22 12:52:21

c_schmitz

Details Diff
Dev Some minor fixes
Attach Issues:
mod - application/models/QuestionGroup.php Diff File
mod - application/views/admin/survey/subview/tabNotification_view.php Diff File

master 9d0e8785

2016-04-22 12:39:21

LouisGac

Details Diff
Fixed issue: template.js path forced in uploader controller
Attach Issues:
mod - application/controllers/UploaderController.php Diff File

master bfc857ab

2016-04-22 12:19:01

ollehar

Details Diff
Fixed issue 11012: Delete Group button in group list view Affected Issues
11012
mod - application/models/QuestionGroup.php Diff File

master a9227a58

2016-04-22 12:00:59

LouisGac

Details Diff
Fixed issue 10946: design issue when entering answer options on double matrix question Affected Issues
10946
mod - scripts/admin/answers.js Diff File

master 548d7465

2016-04-22 11:55:03

LouisGac

Details Diff
Fixed issue 10949: numbering of sub questions The first subquestion is numbered with leading 0, like SQ001, while the following is numbered SQ2, SQ3 etc. Affected Issues
10949
mod - scripts/admin/answers.js Diff File

master 8d05392e

2016-04-22 11:53:23

LouisGac

Details Diff
Fixed issue 10949: numbering of sub questions The first subquestion is numbered with leading 0, like SQ001, while the following is numbered SQ2, SQ3 etc. Affected Issues
10949
mod - scripts/admin/subquestions.js Diff File

master dec58744

2016-04-22 11:25:30

c_schmitz

Details Diff
Fixed issue 11013: Small editor when adding/editing a question group Affected Issues
11013
mod - application/views/admin/survey/QuestionGroups/addGroup_view.php Diff File
mod - application/views/admin/survey/QuestionGroups/editGroup_view.php Diff File

master 32aa2e8d

2016-04-22 10:39:19

c_schmitz

Details Diff
Fixed issue 11001: Selecting a screen in the template editor fails Affected Issues
11001
mod - application/controllers/admin/templates.php Diff File
mod - application/views/admin/templates/templateeditorbar_view.php Diff File

master 6f23b64e

2016-04-22 10:35:29

ollehar

Details Diff
Fixed issue 11011: Blank screen after adding new group Affected Issues
11011
mod - application/controllers/admin/questiongroups.php Diff File
mod - application/core/Survey_Common_Action.php Diff File

master 14c88ad1

2016-04-22 10:18:41

ollehar

Details Diff
Fixed issue 11010: PHP notice when create a new survey Affected Issues
11010
mod - application/controllers/admin/surveyadmin.php Diff File

master 786a6bcd

2016-04-22 10:13:03

c_schmitz

Details Diff
Fixed issue 11005: Button link error Affected Issues
11005
mod - application/views/admin/survey/importSurvey_view.php Diff File

master 88924013

2016-04-22 10:01:23

LouisGac

Details Diff
Fixed issue 10939: Public Survey List (root of app) includes a different set of CSS files from the Survey itself, and in the wrong order Affected Issues
10939
mod - application/controllers/SurveysController.php Diff File

master bb4475a2

2016-04-22 09:46:22

ollehar

Details Diff
Fixed issue 10274: bad layout of mini calendar in statistics

Dev: DatePicker in data entry view.
Affected Issues
10274
mod - application/controllers/admin/dataentry.php Diff File
mod - application/views/admin/dataentry/content_view.php Diff File
 First  Prev  1 2 3 ... 130 ... 260 ... 390 ... 518 519 520 521 522 523 524 ... 650 ... 780 ... 910 ... 1040 ... 1170 ... 1268 1269 1270  Next  Last