Changesets: LimeSurvey
|
2.5 c50c74f8 2015-09-29 11:46 Olle Haerstedt Details Diff |
Dev: Fix bug where side-menu text won't switch back to black after collapse | ||
| mod - styles/limebootstrap/assets/css/sidemenu.css | Diff File | ||
|
2.5 c384ca0f 2015-09-29 11:19 Olle Haerstedt Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/config/third_party.php | Diff File | ||
| mod - application/controllers/admin/authentication.php | Diff File | ||
| mod - application/views/admin/super/_configuration_menu.php | Diff File | ||
| mod - application/views/admin/super/header.php | Diff File | ||
|
2.5 2c2ebee4 2015-09-29 11:19 Olle Haerstedt Details Diff |
Dev: Use Bootstrap for Edit question group | ||
| mod - application/views/admin/survey/QuestionGroups/editGroup_view.php | Diff File | ||
|
2.5 9831cc50 2015-09-29 11:18 Olle Haerstedt Details Diff |
Dev: Add todo about wrong hungarian notation (string variable, not array) | ||
| mod - application/controllers/admin/questiongroups.php | Diff File | ||
|
2.5 8cff04a8 2015-09-29 11:01
Details Diff |
Dev: mainmenu z-index | ||
| mod - application/views/admin/super/_configuration_menu.php | Diff File | ||
| mod - styles/limebootstrap/assets/css/lime-admin.css | Diff File | ||
|
2.5 412ce307 2015-09-29 11:00
Details Diff |
Dev : authentication load animation | ||
| mod - application/controllers/admin/authentication.php | Diff File | ||
| mod - application/views/admin/super/header.php | Diff File | ||
|
master 2892688a 2015-09-29 10:53 kairavesloot Details Diff |
Fixed issue 09926: Can't save dropdown values in CPD Error causes becasue the table has 2 primary key |
Affected Issues 09926 |
|
| mod - application/models/ParticipantAttributeName.php | Diff File | ||
|
2.5 cf57e6da 2015-09-29 10:35
Details Diff |
Dev: use asset manager to publish new js/css | ||
| mod - application/config/third_party.php | Diff File | ||
| mod - application/views/admin/super/header.php | Diff File | ||
|
2.5 80b673db 2015-09-29 10:16 Olle Haerstedt Details Diff |
Dev: Use Bootstrap for Add question group form | ||
| mod - application/views/admin/survey/QuestionGroups/addGroup_view.php | Diff File | ||
|
master 83eb591e 2015-09-28 18:42 Details Diff |
Fixed issue 09917: Error when updating a label set name containing a simple quote Dev; Chtml fix the issue |
Affected Issues 09917 |
|
| mod - application/views/admin/labels/editlabel_view.php | Diff File | ||
|
2.5 47632606 2015-09-28 18:24
Details Diff |
Dev : moving the last js/css to the right place | ||
| mod - application/config/third_party.php | Diff File | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/views/admin/super/header.php | Diff File | ||
| mod - scripts/admin/admin_core.js | Diff File | ||
| add - scripts/admin/panelclickable.js | Diff File | ||
| add - scripts/admin/panelsanimation.js | Diff File | ||
| mod - scripts/admin/questions.js | Diff File | ||
| mod - scripts/admin/surveysettings.js | Diff File | ||
| mod - styles/limebootstrap/application/sidemenu.css | Diff File | ||
| mod - styles/limebootstrap/lime-admin.css | Diff File | ||
|
2.5 bc99b4f8 2015-09-28 16:49
Details Diff |
Dev: question explorer bootstrap overwrite | ||
| mod - styles/limebootstrap/application/sidemenu.css | Diff File | ||
|
2.5 746d7d72 2015-09-28 16:32
Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/extensions/yiiwheels/widgets/ace/assets/js/mode-diff.js | Diff File | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/newQuestion_subviews/_tabs.php | Diff File | ||
| mod - application/views/admin/survey/Question/newQuestion_view.php | Diff File | ||
| mod - application/views/admin/survey/Question/question_subviews/_tabs.php | Diff File | ||
|
2.5 877442a6 2015-09-28 16:31
Details Diff |
Dev: Message box | ||
| mod - application/views/admin/super/header.php | Diff File | ||
|
2.5 084a3d4a 2015-09-28 16:31
Details Diff |
Dev: general CSS, bootsrap overwritten classes | ||
| mod - application/views/admin/super/header.php | Diff File | ||
| mod - styles/limebootstrap/application/sidemenu.css | Diff File | ||
| mod - styles/limebootstrap/lime-admin.css | Diff File | ||
|
2.5 503aac67 2015-09-28 16:16 Olle Haerstedt Details Diff |
Dev: Load mandatory field when edit a question | ||
| mod - application/views/admin/survey/Question/editQuestion_view.php | Diff File | ||
|
2.5 b941df54 2015-09-28 15:59 Olle Haerstedt Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/config/third_party.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/views/admin/super/header.php | Diff File | ||
| mod - application/views/admin/super/sidemenu.php | Diff File | ||
| add - scripts/admin/sidemenu.js | Diff File | ||
| add - styles/limebootstrap/application/sidemenu.css | Diff File | ||
| rm - styles/limebootstrap/lime-icons.css | Diff | ||
|
2.5 9c3ac190 2015-09-28 15:59 Olle Haerstedt Details Diff |
Dev: Style fixes for Edit question and Add question tabs | ||
| mod - application/views/admin/survey/Question/newQuestion_subviews/_tabs.php | Diff File | ||
| mod - application/views/admin/survey/Question/question_subviews/_tabs.php | Diff File | ||
|
2.5 6f83af82 2015-09-28 15:58 Olle Haerstedt Details Diff |
Dev: Remove \n\r at end of line | ||
| mod - application/extensions/yiiwheels/widgets/ace/assets/js/mode-diff.js | Diff File | ||
|
2.5 507aa3a9 2015-09-28 15:50
Details Diff |
Dev : side menu package | ||
| mod - application/config/third_party.php | Diff File | ||
| mod - application/core/Survey_Common_Action.php | Diff File | ||
| mod - application/views/admin/super/header.php | Diff File | ||
| mod - application/views/admin/super/sidemenu.php | Diff File | ||
| add - scripts/admin/sidemenu.js | Diff File | ||
| add - styles/limebootstrap/application/sidemenu.css | Diff File | ||
| rm - styles/limebootstrap/lime-icons.css | Diff | ||
|
2.5 1568bef6 2015-09-28 15:31 Olle Haerstedt Details Diff |
Dev: Apply Boostrap style to General Option in New question | ||
| mod - application/views/admin/survey/Question/newQuestion_view.php | Diff File | ||
|
2.5 13bdc554 2015-09-28 15:17 Olle Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/config/third_party.php | Diff File | ||
| mod - application/controllers/admin/statistics.php | Diff File | ||
| mod - application/views/admin/super/header.php | Diff File | ||
| add - styles/limebootstrap/application/statistics.css | Diff File | ||
| add - styles/limebootstrap/fonts.css | Diff File | ||
| add - styles/limebootstrap/fonts/FontAwesome.otf | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-100/LICENSE.txt | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-100/Roboto-100.eot | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-100/Roboto-100.svg | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-100/Roboto-100.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-100/Roboto-100.woff | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-100/Roboto-100.woff2 | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-100italic/LICENSE.txt | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-100italic/Roboto-100italic.eot | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-100italic/Roboto-100italic.svg | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-100italic/Roboto-100italic.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-100italic/Roboto-100italic.woff | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-100italic/Roboto-100italic.woff2 | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-300/LICENSE.txt | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-300/Roboto-300.eot | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-300/Roboto-300.svg | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-300/Roboto-300.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-300/Roboto-300.woff | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-300/Roboto-300.woff2 | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-300italic/LICENSE.txt | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-300italic/Roboto-300italic.eot | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-300italic/Roboto-300italic.svg | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-300italic/Roboto-300italic.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-300italic/Roboto-300italic.woff | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-300italic/Roboto-300italic.woff2 | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-500/LICENSE.txt | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-500/Roboto-500.eot | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-500/Roboto-500.svg | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-500/Roboto-500.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-500/Roboto-500.woff | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-500/Roboto-500.woff2 | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-500italic/LICENSE.txt | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-500italic/Roboto-500italic.eot | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-500italic/Roboto-500italic.svg | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-500italic/Roboto-500italic.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-500italic/Roboto-500italic.woff | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-500italic/Roboto-500italic.woff2 | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-700/LICENSE.txt | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-700/Roboto-700.eot | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-700/Roboto-700.svg | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-700/Roboto-700.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-700/Roboto-700.woff | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-700/Roboto-700.woff2 | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-700italic/LICENSE.txt | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-700italic/Roboto-700italic.eot | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-700italic/Roboto-700italic.svg | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-700italic/Roboto-700italic.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-700italic/Roboto-700italic.woff | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-700italic/Roboto-700italic.woff2 | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-900/LICENSE.txt | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-900/Roboto-900.eot | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-900/Roboto-900.svg | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-900/Roboto-900.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-900/Roboto-900.woff | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-900/Roboto-900.woff2 | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-900italic/LICENSE.txt | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-900italic/Roboto-900italic.eot | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-900italic/Roboto-900italic.svg | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-900italic/Roboto-900italic.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-900italic/Roboto-900italic.woff | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-900italic/Roboto-900italic.woff2 | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-italic/LICENSE.txt | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-italic/Roboto-italic.eot | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-italic/Roboto-italic.svg | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-italic/Roboto-italic.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-italic/Roboto-italic.woff | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-italic/Roboto-italic.woff2 | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-regular/LICENSE.txt | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-regular/Roboto-regular.eot | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-regular/Roboto-regular.svg | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-regular/Roboto-regular.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-regular/Roboto-regular.woff | Diff File | ||
| add - styles/limebootstrap/fonts/Roboto-regular/Roboto-regular.woff2 | Diff File | ||
| add - styles/limebootstrap/fonts/fontawesome-webfont.eot | Diff File | ||
| add - styles/limebootstrap/fonts/fontawesome-webfont.svg | Diff File | ||
| add - styles/limebootstrap/fonts/fontawesome-webfont.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/fontawesome-webfont.woff | Diff File | ||
| add - styles/limebootstrap/fonts/fontawesome-webfont.woff2 | Diff File | ||
|
2.5 502d8c7d 2015-09-28 15:02 Olle Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
| mod - application/config/third_party.php | Diff File | ||
| mod - application/controllers/InstallerController.php | Diff File | ||
| mod - application/controllers/admin/emailtemplates.php | Diff File | ||
| mod - application/controllers/admin/export.php | Diff File | ||
| mod - application/controllers/admin/expressions.php | Diff File | ||
| mod - application/controllers/admin/participantsaction.php | Diff File | ||
| mod - application/controllers/admin/printablesurvey.php | Diff File | ||
| mod - application/controllers/admin/questiongroups.php | Diff File | ||
| mod - application/controllers/admin/questions.php | Diff File | ||
| mod - application/controllers/admin/quotas.php | Diff File | ||
| mod - application/controllers/admin/responses.php | Diff File | ||
| mod - application/controllers/admin/surveyadmin.php | Diff File | ||
| mod - application/controllers/admin/surveypermission.php | Diff File | ||
| 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/core/Survey_Common_Action.php | Diff File | ||
| mod - application/views/admin/super/header.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 - scripts/admin/admin_core.js | Diff File | ||
| mod - scripts/admin/browse.js | Diff File | ||
| add - styles/limebootstrap/adminstyle-rtl.css | Diff File | ||
| add - styles/limebootstrap/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css | Diff File | ||
| add - styles/limebootstrap/awesome-bootstrap-checkbox/build.css | Diff File | ||
| add - styles/limebootstrap/displayParticipants.css | Diff File | ||
| add - styles/limebootstrap/font-awesome/font-awesome-43.min.css | Diff File | ||
| add - styles/limebootstrap/printablestyle.css | Diff File | ||
| add - third_party/jqueryui/css/jquery-ui.css | Diff File | ||
|
2.5 e8bceb6d 2015-09-28 15:02 Olle Details Diff |
Dev: Style fixes for Edit question tabs | ||
| mod - application/views/admin/survey/Question/question_subviews/_tabs.php | Diff File | ||
|
2.5 df3724d1 2015-09-28 14:27
Details Diff |
Dev: font awesome package | ||
| add - styles/limebootstrap/application/statistics.css | Diff File | ||
| add - styles/limebootstrap/fonts/FontAwesome.otf | Diff File | ||
| add - styles/limebootstrap/fonts/fontawesome-webfont.eot | Diff File | ||
| add - styles/limebootstrap/fonts/fontawesome-webfont.svg | Diff File | ||
| add - styles/limebootstrap/fonts/fontawesome-webfont.ttf | Diff File | ||
| add - styles/limebootstrap/fonts/fontawesome-webfont.woff | Diff File | ||
| add - styles/limebootstrap/fonts/fontawesome-webfont.woff2 | Diff File | ||
