Committer: root <root@extranet.openlog.fr>

 On branch dev
 Changes to be committed:

	modified:   assets/default/css/theme.css
	modified:   client.inc.php
	new file:   images/anglais.png
	new file:   images/francais.png
	new file:   images/logo-thales.jpg
	modified:   include/ajax.reports.php
	modified:   include/ajax.tickets.php
	modified:   include/ajax.users.php
	modified:   include/class.auth.php
	modified:   include/class.client.php
	modified:   include/class.config.php
	modified:   include/class.dynamic_forms.php
	modified:   include/class.email.php
	modified:   include/class.i18n.php
	modified:   include/class.nav.php
	modified:   include/class.pagenate.php
	modified:   include/class.template.php
	modified:   include/class.user.php
	modified:   include/client/edit.inc.php
	modified:   include/client/footer.inc.php
	modified:   include/client/header.inc.php
	modified:   include/client/knowledgebase.inc.php
	modified:   include/client/login.inc.php
	modified:   include/client/open.inc.php
	modified:   include/client/profile.inc.php
	modified:   include/client/tickets.inc.php
	modified:   include/client/view.inc.php
	modified:   include/i18n/en_US/help_topic.yaml
	new file:   include/i18n/fr_FR/config.yaml
	new file:   include/i18n/fr_FR/department.yaml
	new file:   include/i18n/fr_FR/email_template_group.yaml
	new file:   include/i18n/fr_FR/file.yaml
	new file:   include/i18n/fr_FR/filter.yaml
	new file:   include/i18n/fr_FR/form.yaml
	new file:   include/i18n/fr_FR/group.yaml
	new file:   include/i18n/fr_FR/help/tips/forms.yaml
	new file:   include/i18n/fr_FR/help/tips/install.yaml
	new file:   include/i18n/fr_FR/help/tips/settings.alerts.yaml
	new file:   include/i18n/fr_FR/help/tips/settings.autoresponder.yaml
	new file:   include/i18n/fr_FR/help/tips/settings.email.yaml
	new file:   include/i18n/fr_FR/help/tips/settings.system.yaml
	new file:   include/i18n/fr_FR/help/tips/staff.yaml
	new file:   include/i18n/fr_FR/help_topic.yaml
	new file:   include/i18n/fr_FR/priority.yaml
	new file:   include/i18n/fr_FR/sla.yaml
	new file:   include/i18n/fr_FR/team.yaml
	new file:   include/i18n/fr_FR/templates/email/assigned.alert.yaml
	new file:   include/i18n/fr_FR/templates/email/message.alert.yaml
	new file:   include/i18n/fr_FR/templates/email/message.autoresp.yaml
	new file:   include/i18n/fr_FR/templates/email/note.alert.yaml
	new file:   include/i18n/fr_FR/templates/email/staff.pwreset.yaml
	new file:   include/i18n/fr_FR/templates/email/ticket.activity.notice.yaml
	new file:   include/i18n/fr_FR/templates/email/ticket.alert.yaml
	new file:   include/i18n/fr_FR/templates/email/ticket.autoreply.yaml
	new file:   include/i18n/fr_FR/templates/email/ticket.autoresp.yaml
	new file:   include/i18n/fr_FR/templates/email/ticket.notice.yaml
	new file:   include/i18n/fr_FR/templates/email/ticket.overdue.yaml
	new file:   include/i18n/fr_FR/templates/email/ticket.overlimit.yaml
	new file:   include/i18n/fr_FR/templates/email/ticket.reply.yaml
	new file:   include/i18n/fr_FR/templates/email/transfer.alert.yaml
	new file:   include/i18n/fr_FR/templates/email/user.accesslink.yaml
	new file:   include/i18n/fr_FR/templates/page/landing.yaml
	new file:   include/i18n/fr_FR/templates/page/offline.yaml
	new file:   include/i18n/fr_FR/templates/page/thank-you.yaml
	new file:   include/i18n/fr_FR/templates/premade.yaml
	new file:   include/i18n/fr_FR/templates/ticket/installed.yaml
	new file:   include/i18n/fr_FR/templates/ticket/upgraded.yaml
	new file:   include/ost-config.php
	new file:   include/plugins/auth-ldap.phar
	new file:   include/plugins/auth-passthru.phar
	modified:   include/staff/apikey.inc.php
	modified:   include/staff/apikeys.inc.php
	modified:   include/staff/attachment.inc.php
	modified:   include/staff/banlist.inc.php
	modified:   include/staff/banrule.inc.php
	modified:   include/staff/cannedresponse.inc.php
	modified:   include/staff/cannedresponses.inc.php
	modified:   include/staff/categories.inc.php
	modified:   include/staff/category.inc.php
	modified:   include/staff/department.inc.php
	modified:   include/staff/departments.inc.php
	modified:   include/staff/directory.inc.php
	modified:   include/staff/dynamic-form.inc.php
	modified:   include/staff/dynamic-forms.inc.php
	modified:   include/staff/dynamic-list.inc.php
	modified:   include/staff/dynamic-lists.inc.php
	modified:   include/staff/email.inc.php
	modified:   include/staff/emails.inc.php
	modified:   include/staff/faq-categories.inc.php
	modified:   include/staff/faq-category.inc.php
	modified:   include/staff/faq-view.inc.php
	modified:   include/staff/faq.inc.php
	modified:   include/staff/filter.inc.php
	modified:   include/staff/filters.inc.php
	modified:   include/staff/footer.inc.php
	modified:   include/staff/group.inc.php
	modified:   include/staff/groups.inc.php
	modified:   include/staff/header.inc.php
	modified:   include/staff/helptopic.inc.php
	modified:   include/staff/helptopics.inc.php
	modified:   include/staff/login.tpl.php
	modified:   include/staff/page.inc.php
	modified:   include/staff/pages.inc.php
	modified:   include/staff/plugin-add.inc.php
	modified:   include/staff/plugin.inc.php
	modified:   include/staff/plugins.inc.php
	modified:   include/staff/profile.inc.php
	modified:   include/staff/pwreset.login.php
	modified:   include/staff/pwreset.php
	modified:   include/staff/pwreset.sent.php
	modified:   include/staff/settings-alerts.inc.php
	modified:   include/staff/settings-autoresp.inc.php
	modified:   include/staff/settings-emails.inc.php
	modified:   include/staff/settings-kb.inc.php
	modified:   include/staff/settings-pages.inc.php
	modified:   include/staff/settings-system.inc.php
	modified:   include/staff/settings-tickets.inc.php
	modified:   include/staff/slaplan.inc.php
	modified:   include/staff/slaplans.inc.php
	modified:   include/staff/staff.inc.php
	modified:   include/staff/staffmembers.inc.php
	modified:   include/staff/syslogs.inc.php
	modified:   include/staff/system.inc.php
	modified:   include/staff/team.inc.php
	modified:   include/staff/teams.inc.php
	modified:   include/staff/template.inc.php
	modified:   include/staff/templates.inc.php
	modified:   include/staff/templates/collaborators-preview.tmpl.php
	modified:   include/staff/templates/collaborators.tmpl.php
	modified:   include/staff/templates/dynamic-field-config.tmpl.php
	modified:   include/staff/templates/ticket-preview.tmpl.php
	modified:   include/staff/templates/user-lookup.tmpl.php
	modified:   include/staff/templates/user.tmpl.php
	modified:   include/staff/ticket-edit.inc.php
	modified:   include/staff/ticket-open.inc.php
	modified:   include/staff/ticket-view.inc.php
	modified:   include/staff/tickets.inc.php
	modified:   include/staff/tpl.inc.php
	modified:   include/upgrader/aborted.inc.php
	modified:   include/upgrader/done.inc.php
	modified:   include/upgrader/prereq.inc.php
	modified:   include/upgrader/rename.inc.php
	modified:   include/upgrader/upgrade.inc.php
	modified:   index.php
	modified:   js/jquery-ui-1.10.3.custom.min.js
	modified:   js/redactor-osticket.js
	modified:   login.php
	modified:   scp/css/login.css
	modified:   scp/css/scp.css
	modified:   scp/dashboard.php
	modified:   scp/emailtest.php
	modified:   scp/images/header-bg.png
	new file:   scp/images/login-opl.png
	new file:   scp/images/logo-opl.png
	modified:   scp/login.php
	modified:   scp/logout.php
	modified:   scp/pwreset.php
	modified:   scp/staff.inc.php
	modified:   scp/tickets.php

 #Untracked files:
 #  (use "git add <file>..." to include in what will be committed)