Changesets: LimeSurvey
2.5 4ac02319 2015-12-16 17:22 Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
mod - application/controllers/admin/labels.php | Diff File | ||
mod - application/views/admin/labels/_labelviewtabcontent_view.php | Diff File | ||
mod - application/views/admin/labels/labelsetsbar_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.scss | Diff File | ||
2.5 29c90eb1 2015-12-16 17:22 Details Diff |
Dev: More styling for activation screen | ||
mod - application/views/admin/survey/activateSurvey_view.php | Diff File | ||
2.5 d53290e1 2015-12-16 16:36
Details Diff |
Dev: pencil position | ||
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.scss | Diff File | ||
2.5 283e8da1 2015-12-16 16:34
Details Diff |
Fixed issue 10155: edit / export single label set buttons |
Affected Issues 10155 |
|
mod - application/controllers/admin/labels.php | Diff File | ||
mod - application/views/admin/labels/labelsetsbar_view.php | Diff File | ||
2.5 2635a41b 2015-12-16 16:24
Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
mod - application/views/admin/survey/activateSurvey_view.php | Diff File | ||
2.5 643b429a 2015-12-16 16:23
Details Diff |
Dev: label set assessment input forced to number | ||
mod - application/views/admin/labels/_labelviewtabcontent_view.php | Diff File | ||
mod - scripts/admin/labels.js | Diff File | ||
2.5 23fd13a5 2015-12-16 16:11 Details Diff |
Merge branch 'master' into 2.5 | ||
mod - application/helpers/qanda_helper.php | Diff File | ||
2.5 6e13155f 2015-12-16 16:09 Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
mod - application/views/admin/labels/_labelviewrightcontent_view.php | Diff File | ||
mod - application/views/admin/labels/importlabelresources_view.php | Diff File | ||
add - upload/labels/18/.htaccess | Diff File | ||
add - upload/labels/18/.thumbs/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG | Diff File | ||
add - upload/labels/18/.thumbs/images/footer-meta.png | Diff File | ||
add - upload/labels/18/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG | Diff File | ||
add - upload/labels/18/images/footer-meta.png | Diff File | ||
add - upload/labels/19/.htaccess | Diff File | ||
add - upload/labels/19/.thumbs/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG | Diff File | ||
add - upload/labels/19/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG | Diff File | ||
add - upload/labels/20/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG | Diff File | ||
2.5 320b7069 2015-12-16 16:09 Details Diff |
Dev: Add Bootstrap to survey activation screen | ||
mod - application/views/admin/survey/activateSurvey_view.php | Diff File | ||
2.5 4cd995b7 2015-12-16 16:02
Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
mod - application/views/admin/user/editusers.php | Diff File | ||
2.5 21523e8e 2015-12-16 16:02
Details Diff |
Dev: import label ressources result page | ||
mod - application/views/admin/labels/_labelviewrightcontent_view.php | Diff File | ||
mod - application/views/admin/labels/importlabelresources_view.php | Diff File | ||
add - upload/labels/18/.htaccess | Diff File | ||
add - upload/labels/18/.thumbs/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG | Diff File | ||
add - upload/labels/18/.thumbs/images/footer-meta.png | Diff File | ||
add - upload/labels/18/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG | Diff File | ||
add - upload/labels/18/images/footer-meta.png | Diff File | ||
add - upload/labels/19/.htaccess | Diff File | ||
add - upload/labels/19/.thumbs/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG | Diff File | ||
add - upload/labels/19/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG | Diff File | ||
add - upload/labels/20/images/Original_Nintendo_Seal_of_Quality_(European)_(Custom).JPG | Diff File | ||
2.5 d18c52cc 2015-12-16 15:45 Details Diff |
Fixed issue 10128: Add HTML5 email and required |
Affected Issues 10128 |
|
mod - application/views/admin/user/editusers.php | Diff File | ||
2.5 df192651 2015-12-16 15:31 Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
mod - application/views/admin/participants/participantsPanel_view.php | 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 b3ccefd4 2015-12-16 15:31 Details Diff |
Dev: Show survey name in register form | ||
mod - application/controllers/admin/templates.php | Diff File | ||
2.5 cf328d79 2015-12-16 15:26
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 | ||
add - application/views/admin/templates/templateeditor_register_view.php | Diff File | ||
mod - application/views/register/registerForm.php | Diff File | ||
mod - templates/default/register.pstpl | Diff File | ||
mod - templates/default/save.pstpl | Diff File | ||
2.5 150ed471 2015-12-16 15:25
Details Diff |
Fixed issue 10136: tooltip to explain why export is disabled |
Affected Issues 10136 |
|
mod - application/views/admin/participants/participantsPanel_view.php | 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 fbaafbd3 2015-12-16 15:24 Details Diff |
Merge branch '2.5' of https://github.com/LimeSurvey/LimeSurvey into 2.5 | ||
mod - application/controllers/admin/labels.php | Diff File | ||
mod - application/views/admin/labels/_labelviewrightcontent_view.php | Diff File | ||
mod - application/views/admin/labels/_labelviewtabcontent_view.php | Diff File | ||
mod - application/views/admin/labels/editlabel_view.php | Diff File | ||
mod - application/views/admin/labels/import_view.php | Diff File | ||
mod - application/views/admin/labels/labelsetsbar_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 7f741de3 2015-12-16 15:24 Details Diff |
Fixed issue 10121: Fix register form in template editor |
Affected Issues 10121 |
|
mod - application/controllers/admin/templates.php | Diff File | ||
add - application/views/admin/templates/templateeditor_register_view.php | Diff File | ||
mod - application/views/register/registerForm.php | Diff File | ||
mod - templates/default/save.pstpl | Diff File | ||
2.5 af5e15a2 2015-12-16 15:18
Details Diff |
Fixed issue 10119: import result bootstraped |
Affected Issues 10119 |
|
mod - application/views/admin/labels/import_view.php | Diff File | ||
2.5 d9b7ce17 2015-12-16 15:03
Details Diff |
Dev: delete button in edition mode | ||
mod - application/controllers/admin/labels.php | 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 cc72bd39 2015-12-16 15:01
Details Diff |
Dev: removed large definition for input/buttons in labels | ||
mod - application/views/admin/labels/_labelviewrightcontent_view.php | Diff File | ||
mod - application/views/admin/labels/_labelviewtabcontent_view.php | Diff File | ||
mod - scripts/admin/labels.js | Diff File | ||
2.5 ca1bb690 2015-12-16 14:57
Details Diff |
Dev: pencil position in answer tables | ||
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 079dcca3 2015-12-16 14:54
Details Diff |
Dev: removed debug alerts | ||
mod - scripts/admin/labels.js | Diff File | ||
2.5 1a780ade 2015-12-16 14:52
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/core/plugins/AuthLDAP/AuthLDAP.php | Diff File | ||
mod - application/extensions/SettingsWidget/SettingsWidget.php | Diff File | ||
mod - application/views/admin/pluginmanager/configure.php | Diff File | ||
mod - application/views/admin/templates/templateeditor_question_answer_view.php | Diff File | ||
2.5 a89d4cd7 2015-12-16 14:51
Details Diff |
Dev: Create/Import labelset display | ||
mod - application/views/admin/labels/editlabel_view.php | Diff File |