LimeSurvey: master 0598c4ad

Diff Back to Repository
Author Committer Branch Timestamp Parent
ollehar ollehar master 2016-03-14 10:29:32 master 9161832d
Changeset

Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
mod - application/helpers/admin/htmleditor_helper.php Diff File
mod - application/helpers/expressions/em_manager_helper.php Diff File
rm - images/Limesurvey_logo.png Diff File
rm - images/ajax-loader.gif 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
add - images/emoticons/texteditor/angel_smile.gif Diff File
add - images/emoticons/texteditor/angry_smile.gif Diff File
add - images/emoticons/texteditor/broken_heart.gif Diff File
add - images/emoticons/texteditor/cake.gif Diff File
add - images/emoticons/texteditor/confused_smile.gif Diff File
add - images/emoticons/texteditor/cry_smile.gif Diff File
add - images/emoticons/texteditor/devil_smile.gif Diff File
add - images/emoticons/texteditor/embaressed_smile.gif Diff File
add - images/emoticons/texteditor/envelope.gif Diff File
add - images/emoticons/texteditor/heart.gif Diff File
add - images/emoticons/texteditor/kiss.gif Diff File
add - images/emoticons/texteditor/lightbulb.gif Diff File
add - images/emoticons/texteditor/omg_smile.gif Diff File
add - images/emoticons/texteditor/regular_smile.gif Diff File
add - images/emoticons/texteditor/sad_smile.gif Diff File
add - images/emoticons/texteditor/shades_smile.gif Diff File
add - images/emoticons/texteditor/teeth_smile.gif Diff File
add - images/emoticons/texteditor/thumbs_down.gif Diff File
add - images/emoticons/texteditor/thumbs_up.gif Diff File
add - images/emoticons/texteditor/tounge_smile.gif Diff File
add - images/emoticons/texteditor/whatchutalkingabout_smile.gif Diff File
add - images/emoticons/texteditor/wink_smile.gif Diff File
rm - images/lenny face.jpg Diff File
rm - images/lime-icons/328637/activate.png Diff File
rm - images/lime-icons/328637/activate_deactivate.png Diff File
rm - images/lime-icons/328637/active.png Diff File
rm - images/lime-icons/328637/add.png Diff File
rm - images/lime-icons/328637/addanswer.png Diff File
rm - images/lime-icons/328637/answers.png Diff File
rm - images/lime-icons/328637/assessments.png Diff File
rm - images/lime-icons/328637/backup.png Diff File
rm - images/lime-icons/328637/bounce.png Diff File
rm - images/lime-icons/328637/bounce_settings.png Diff File
rm - images/lime-icons/328637/browse.png Diff File
rm - images/lime-icons/328637/chart_bar.png Diff File
rm - images/lime-icons/328637/chart_pie.png Diff File
rm - images/lime-icons/328637/close.png Diff File
rm - images/lime-icons/328637/conditions.png Diff File
rm - images/lime-icons/328637/conditions_add.png Diff File
rm - images/lime-icons/328637/conditions_copy.png Diff File
rm - images/lime-icons/328637/conditions_delete_all.png Diff File
rm - images/lime-icons/328637/copy.png Diff File
rm - images/lime-icons/328637/cpdb.png Diff File
rm - images/lime-icons/328637/create_dummy_token.png Diff File
rm - images/lime-icons/328637/databack.png Diff File
rm - images/lime-icons/328637/database.png Diff File
rm - images/lime-icons/328637/databegin.png Diff File
rm - images/lime-icons/328637/dataend.png Diff File
rm - images/lime-icons/328637/dataentry.png Diff File
rm - images/lime-icons/328637/dataforward.png Diff File
rm - images/lime-icons/328637/deactivate.png Diff File
rm - images/lime-icons/328637/defaultanswers.png Diff File
rm - images/lime-icons/328637/delete.png Diff File
rm - images/lime-icons/328637/display_export.png Diff File
rm - images/lime-icons/328637/do.png Diff File
rm - images/lime-icons/328637/document.png Diff File
rm - images/lime-icons/328637/down_all.png Diff File
rm - images/lime-icons/328637/download.png Diff File
rm - images/lime-icons/328637/dumpgroup.png Diff File
rm - images/lime-icons/328637/dumplabel.png Diff File
rm - images/lime-icons/328637/dumplabelmulti.png Diff File
rm - images/lime-icons/328637/dumpquestion.png Diff File
rm - images/lime-icons/328637/edit.png Diff File
rm - images/lime-icons/328637/emailtemplates.png Diff File
rm - images/lime-icons/328637/expired.png Diff File
rm - images/lime-icons/328637/export.png Diff File
rm - images/lime-icons/328637/exportcsv.png Diff File
rm - images/lime-icons/328637/exportr.png Diff File
rm - images/lime-icons/328637/exportspss.png Diff File
rm - images/lime-icons/328637/exportvv.png Diff File
rm - images/lime-icons/328637/expressionmanager.png Diff File
rm - images/lime-icons/328637/expressionmanagercheck.png Diff File
rm - images/lime-icons/328637/global.png Diff File
rm - images/lime-icons/328637/handle.png Diff File
rm - images/lime-icons/328637/help.png Diff File
rm - images/lime-icons/328637/home.png Diff File
rm - images/lime-icons/328637/import.png Diff File
rm - images/lime-icons/328637/importcsv.png Diff File
rm - images/lime-icons/328637/importldap.png Diff File
rm - images/lime-icons/328637/importold.png Diff File
rm - images/lime-icons/328637/importvv.png Diff File
rm - images/lime-icons/328637/inactive.png Diff File
rm - images/lime-icons/328637/invite.png Diff File
rm - images/lime-icons/328637/invitesmall.png Diff File
rm - images/lime-icons/328637/iterate.png Diff File
rm - images/lime-icons/328637/labels.png Diff File
rm - images/lime-icons/328637/logout.png Diff File
rm - images/lime-icons/328637/maximize.png Diff File
rm - images/lime-icons/328637/minimize.png Diff File
rm - images/lime-icons/328637/next.png Diff File
rm - images/lime-icons/328637/notyetstarted.png Diff File
rm - images/lime-icons/328637/organize.png Diff File
rm - images/lime-icons/328637/plugin.png Diff File
rm - images/lime-icons/328637/preview.png Diff File
rm - images/lime-icons/328637/previous.png Diff File
rm - images/lime-icons/328637/print.png Diff File
rm - images/lime-icons/328637/profileedit.png Diff File
rm - images/lime-icons/328637/quota.png Diff File
rm - images/lime-icons/328637/remind.png Diff File
rm - images/lime-icons/328637/resetsurveylogic.png Diff File
rm - images/lime-icons/328637/responses.png Diff File
rm - images/lime-icons/328637/saved.png Diff File
rm - images/lime-icons/328637/scenario_delete.png Diff File
rm - images/lime-icons/328637/scenario_edit.png Diff File
rm - images/lime-icons/328637/scenario_renumber.png Diff File
rm - images/lime-icons/328637/search.png Diff File
rm - images/lime-icons/328637/security.png Diff File
rm - images/lime-icons/328637/share.png Diff File
rm - images/lime-icons/328637/statistics.png Diff File
rm - images/lime-icons/328637/statistics_time.png Diff File
rm - images/lime-icons/328637/subquestions.png Diff File
rm - images/lime-icons/328637/success_notice.png Diff File
rm - images/lime-icons/328637/summary.png Diff File
rm - images/lime-icons/328637/superadmin.png Diff File
rm - images/lime-icons/328637/survey_security.png Diff File
rm - images/lime-icons/328637/surveylist.png Diff File
rm - images/lime-icons/328637/surveysettings.png Diff File
rm - images/lime-icons/328637/tag.png Diff File
rm - images/lime-icons/328637/takeownership.png Diff File
rm - images/lime-icons/328637/templatepermissions.png Diff File
rm - images/lime-icons/328637/templates.png Diff File
rm - images/lime-icons/328637/token_manage.png Diff File
rm - images/lime-icons/328637/token_viewanswer.png Diff File
rm - images/lime-icons/328637/tokens.png Diff File
rm - images/lime-icons/328637/tools.png Diff File
rm - images/lime-icons/328637/trafficred.png Diff File
rm - images/lime-icons/328637/translate.png Diff File
rm - images/lime-icons/328637/viewlast.png Diff File
rm - images/lime-icons/AA4340/Limesurvey_logo.png Diff File
rm - images/lime-icons/AA4340/activate.png Diff File
rm - images/lime-icons/AA4340/activate_deactivate.png Diff File
rm - images/lime-icons/AA4340/active.png Diff File
rm - images/lime-icons/AA4340/add.png Diff File
rm - images/lime-icons/AA4340/addanswer.png Diff File
rm - images/lime-icons/AA4340/answers.png Diff File
rm - images/lime-icons/AA4340/assessments.png Diff File
rm - images/lime-icons/AA4340/backup.png Diff File
rm - images/lime-icons/AA4340/bounce.png Diff File
rm - images/lime-icons/AA4340/bounce_settings.png Diff File
rm - images/lime-icons/AA4340/browse.png Diff File
rm - images/lime-icons/AA4340/browse_disabled.png Diff File
rm - images/lime-icons/AA4340/chart_bar.png Diff File
rm - images/lime-icons/AA4340/chart_pie.png Diff File
rm - images/lime-icons/AA4340/close.png Diff File
rm - images/lime-icons/AA4340/conditions.png Diff File
rm - images/lime-icons/AA4340/conditions_add.png Diff File
rm - images/lime-icons/AA4340/conditions_copy.png Diff File
rm - images/lime-icons/AA4340/conditions_delete_all.png Diff File
rm - images/lime-icons/AA4340/copy.png Diff File
rm - images/lime-icons/AA4340/copy_disabled.png Diff File
rm - images/lime-icons/AA4340/cpdb.png Diff File
rm - images/lime-icons/AA4340/create_dummy_token.png Diff File
rm - images/lime-icons/AA4340/databack.png Diff File
rm - images/lime-icons/AA4340/database.png Diff File
rm - images/lime-icons/AA4340/databegin.png Diff File
rm - images/lime-icons/AA4340/dataend.png Diff File
rm - images/lime-icons/AA4340/dataentry.png Diff File
rm - images/lime-icons/AA4340/dataentry_disabled.png Diff File
rm - images/lime-icons/AA4340/dataforward.png Diff File
rm - images/lime-icons/AA4340/deactivate.png Diff File
rm - images/lime-icons/AA4340/defaultanswers.png Diff File
rm - images/lime-icons/AA4340/delete.png Diff File
rm - images/lime-icons/AA4340/display_export.png Diff File
rm - images/lime-icons/AA4340/do.png Diff File
rm - images/lime-icons/AA4340/document.png Diff File
rm - images/lime-icons/AA4340/donate.png Diff File
rm - images/lime-icons/AA4340/down_all.png Diff File
rm - images/lime-icons/AA4340/download.png Diff File
rm - images/lime-icons/AA4340/dumpgroup.png Diff File
rm - images/lime-icons/AA4340/dumplabel.png Diff File
rm - images/lime-icons/AA4340/dumplabelmulti.png Diff File
rm - images/lime-icons/AA4340/dumpquestion.png Diff File
rm - images/lime-icons/AA4340/edit.png Diff File
rm - images/lime-icons/AA4340/emailtemplates.png Diff File
rm - images/lime-icons/AA4340/expired.png Diff File
rm - images/lime-icons/AA4340/export.png Diff File
rm - images/lime-icons/AA4340/export_disabled.png Diff File
rm - images/lime-icons/AA4340/exportcsv.png Diff File
rm - images/lime-icons/AA4340/exportr.png Diff File
rm - images/lime-icons/AA4340/exportspss.png Diff File
rm - images/lime-icons/AA4340/exportvv.png Diff File
rm - images/lime-icons/AA4340/expressionmanager.png Diff File
rm - images/lime-icons/AA4340/expressionmanagercheck.png Diff File
rm - images/lime-icons/AA4340/global.png Diff File
rm - images/lime-icons/AA4340/handle.png Diff File
rm - images/lime-icons/AA4340/help.png Diff File
rm - images/lime-icons/AA4340/home.png Diff File
rm - images/lime-icons/AA4340/import.png Diff File
rm - images/lime-icons/AA4340/import_disabled.png Diff File
rm - images/lime-icons/AA4340/importcsv.png Diff File
rm - images/lime-icons/AA4340/importldap.png Diff File
rm - images/lime-icons/AA4340/importold.png Diff File
rm - images/lime-icons/AA4340/importvv.png Diff File
rm - images/lime-icons/AA4340/inactive.png Diff File
rm - images/lime-icons/AA4340/invite.png Diff File
rm - images/lime-icons/AA4340/invitesmall.png Diff File
rm - images/lime-icons/AA4340/iterate.png Diff File
rm - images/lime-icons/AA4340/labels.png Diff File
rm - images/lime-icons/AA4340/logout.png Diff File
rm - images/lime-icons/AA4340/maximize.png Diff File
rm - images/lime-icons/AA4340/minimize.png Diff File
rm - images/lime-icons/AA4340/next.png Diff File
rm - images/lime-icons/AA4340/notyetstarted.png Diff File
rm - images/lime-icons/AA4340/organize.png Diff File
rm - images/lime-icons/AA4340/organize_disabled.png Diff File
rm - images/lime-icons/AA4340/plugin.png Diff File
rm - images/lime-icons/AA4340/preview.png Diff File
rm - images/lime-icons/AA4340/previous.png Diff File
rm - images/lime-icons/AA4340/print.png Diff File
rm - images/lime-icons/AA4340/profileedit.png Diff File
rm - images/lime-icons/AA4340/quota.png Diff File
rm - images/lime-icons/AA4340/remind.png Diff File
rm - images/lime-icons/AA4340/resetsurveylogic.png Diff File
rm - images/lime-icons/AA4340/resetsurveylogic_disabled.png Diff File
rm - images/lime-icons/AA4340/responses.png Diff File
rm - images/lime-icons/AA4340/saved.png Diff File
rm - images/lime-icons/AA4340/saved_disabled.png Diff File
rm - images/lime-icons/AA4340/scenario_delete.png Diff File
rm - images/lime-icons/AA4340/scenario_edit.png Diff File
rm - images/lime-icons/AA4340/scenario_renumber.png Diff File
rm - images/lime-icons/AA4340/search.png Diff File
rm - images/lime-icons/AA4340/security.png Diff File
rm - images/lime-icons/AA4340/share.png Diff File
rm - images/lime-icons/AA4340/statistics.png Diff File
rm - images/lime-icons/AA4340/statistics_time.png Diff File
rm - images/lime-icons/AA4340/subquestions.png Diff File
rm - images/lime-icons/AA4340/success_notice.png Diff File
rm - images/lime-icons/AA4340/summary.png Diff File
rm - images/lime-icons/AA4340/superadmin.png Diff File
rm - images/lime-icons/AA4340/survey_security.png Diff File
rm - images/lime-icons/AA4340/surveylist.png Diff File
rm - images/lime-icons/AA4340/surveysettings.png Diff File
rm - images/lime-icons/AA4340/tag.png Diff File
rm - images/lime-icons/AA4340/takeownership.png Diff File
rm - images/lime-icons/AA4340/templatepermissions.png Diff File
rm - images/lime-icons/AA4340/templates.png Diff File
rm - images/lime-icons/AA4340/token_manage.png Diff File
rm - images/lime-icons/AA4340/token_viewanswer.png Diff File
rm - images/lime-icons/AA4340/tokens.png Diff File
rm - images/lime-icons/AA4340/tools.png Diff File
rm - images/lime-icons/AA4340/trafficred.png Diff File
rm - images/lime-icons/AA4340/translate.png Diff File
rm - images/lime-icons/AA4340/translate_disabled.png Diff File
rm - images/lime-icons/AA4340/user.png Diff File
rm - images/lime-icons/AA4340/viewlast.png Diff File
rm - images/lime-icons/big/328637/activate.png Diff File
rm - images/lime-icons/big/328637/activate_deactivate.png Diff File
rm - images/lime-icons/big/328637/active.png Diff File
rm - images/lime-icons/big/328637/add.png Diff File
rm - images/lime-icons/big/328637/addanswer.png Diff File
rm - images/lime-icons/big/328637/answers.png Diff File
rm - images/lime-icons/big/328637/assessments.png Diff File
rm - images/lime-icons/big/328637/backup.png Diff File
rm - images/lime-icons/big/328637/bounce.png Diff File
rm - images/lime-icons/big/328637/bounce_settings.png Diff File
rm - images/lime-icons/big/328637/browse.png Diff File
rm - images/lime-icons/big/328637/chart_bar.png Diff File
rm - images/lime-icons/big/328637/chart_pie.png Diff File
rm - images/lime-icons/big/328637/close.png Diff File
rm - images/lime-icons/big/328637/conditions.png Diff File
rm - images/lime-icons/big/328637/conditions_add.png Diff File
rm - images/lime-icons/big/328637/conditions_copy.png Diff File
rm - images/lime-icons/big/328637/conditions_delete_all.png Diff File
rm - images/lime-icons/big/328637/copy.png Diff File
rm - images/lime-icons/big/328637/cpdb.png Diff File
rm - images/lime-icons/big/328637/create_dummy_token.png Diff File
rm - images/lime-icons/big/328637/databack.png Diff File
rm - images/lime-icons/big/328637/database.png Diff File
rm - images/lime-icons/big/328637/databegin.png Diff File
rm - images/lime-icons/big/328637/dataend.png Diff File
rm - images/lime-icons/big/328637/dataentry.png Diff File
rm - images/lime-icons/big/328637/dataforward.png Diff File
rm - images/lime-icons/big/328637/deactivate.png Diff File
rm - images/lime-icons/big/328637/defaultanswers.png Diff File
rm - images/lime-icons/big/328637/delete.png Diff File
rm - images/lime-icons/big/328637/display_export.png Diff File
rm - images/lime-icons/big/328637/do.png Diff File
rm - images/lime-icons/big/328637/document.png Diff File
rm - images/lime-icons/big/328637/down_all.png Diff File
rm - images/lime-icons/big/328637/download.png Diff File
rm - images/lime-icons/big/328637/dumpgroup.png Diff File
rm - images/lime-icons/big/328637/dumplabel.png Diff File
rm - images/lime-icons/big/328637/dumplabelmulti.png Diff File
rm - images/lime-icons/big/328637/dumpquestion.png Diff File
rm - images/lime-icons/big/328637/edit.png Diff File
rm - images/lime-icons/big/328637/emailtemplates.png Diff File
rm - images/lime-icons/big/328637/expired.png Diff File
rm - images/lime-icons/big/328637/export.png Diff File
rm - images/lime-icons/big/328637/exportcsv.png Diff File
rm - images/lime-icons/big/328637/exportr.png Diff File
rm - images/lime-icons/big/328637/exportspss.png Diff File