LimeSurvey: 2.06lts 6c9f5b6d

Diff Back to Repository
Author Committer Branch Timestamp Parent
DenisChenu DenisChenu 2.06lts 2016-04-22 10:26 2.06lts 3279a102
Changeset

Merge branch '2.06lts' of git@git.framasoft.org:Shnoulle/LimeSurvey.git into 2.06_SondagesPro

Conflicts:

application/config/version.php

application/models/UpdateForm.php
mod - application/config/updater_version.php Diff File
mod - application/config/version.php Diff File
mod - application/controllers/AdminController.php Diff File
mod - application/controllers/admin/update.php Diff File
mod - application/core/Survey_Common_Action.php Diff File
mod - application/helpers/qanda_helper.php Diff File
mod - application/helpers/update/updatedb_helper.php Diff File
mod - application/models/UpdateForm.php Diff File
mod - application/views/admin/update/check_updates/update_buttons/_updatesavailable_error.php Diff File
mod - application/views/admin/update/updater/steps/_check_local_errors.php Diff File
mod - application/views/admin/update/updater/steps/_final.php Diff File
mod - application/views/admin/update/updater/steps/_updater_updated.php Diff File
mod - application/views/admin/update/updater/welcome/_subscribe.php Diff File
mod - docs/release_notes.txt Diff File
mod - images/emoticons/1.png Diff File
mod - images/emoticons/2.png Diff File
mod - images/emoticons/3.png Diff File
mod - images/emoticons/4.png Diff File
mod - images/emoticons/5.png Diff File
mod - scripts/admin/attributeMapCSV.js Diff File
mod - scripts/admin/comfortupdate/displayComfortStep.js Diff File
add - tmp/.gitignore Diff File
mod - upload/images/smiley/msn/angel_smile.gif Diff File
mod - upload/images/smiley/msn/angry_smile.gif Diff File
mod - upload/images/smiley/msn/broken_heart.gif Diff File
mod - upload/images/smiley/msn/cake.gif Diff File
mod - upload/images/smiley/msn/confused_smile.gif Diff File
mod - upload/images/smiley/msn/cry_smile.gif Diff File
mod - upload/images/smiley/msn/devil_smile.gif Diff File
mod - upload/images/smiley/msn/embaressed_smile.gif Diff File
mod - upload/images/smiley/msn/envelope.gif Diff File
mod - upload/images/smiley/msn/heart.gif Diff File
mod - upload/images/smiley/msn/kiss.gif Diff File
mod - upload/images/smiley/msn/lightbulb.gif Diff File
mod - upload/images/smiley/msn/omg_smile.gif Diff File
mod - upload/images/smiley/msn/regular_smile.gif Diff File
mod - upload/images/smiley/msn/sad_smile.gif Diff File
mod - upload/images/smiley/msn/shades_smile.gif Diff File
mod - upload/images/smiley/msn/teeth_smile.gif Diff File
mod - upload/images/smiley/msn/thumbs_down.gif Diff File
mod - upload/images/smiley/msn/thumbs_up.gif Diff File
mod - upload/images/smiley/msn/tounge_smile.gif Diff File
mod - upload/images/smiley/msn/whatchutalkingabout_smile.gif Diff File
mod - upload/images/smiley/msn/wink_smile.gif Diff File