Skip to content

Commit

Permalink
Merge branch 'release/3.0.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
simon-brooke committed Jun 9, 2017
2 parents 5f47d05 + 5f6e570 commit a749ae2
Show file tree
Hide file tree
Showing 86 changed files with 5,775 additions and 2,221 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,9 @@ bin
obj

licencekey\.txt

Documentation/html/

Documentation/latex/

*.gz
2,480 changes: 2,480 additions & 0 deletions Doxyfile

Large diffs are not rendered by default.

218 changes: 0 additions & 218 deletions SuiteCRMAddIn/AddressBook.resx

This file was deleted.

33 changes: 29 additions & 4 deletions SuiteCRMAddIn/BusinessLogic/AppointmentSyncState.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,31 @@
using System;
using SuiteCRMAddIn.ProtoItems;
using Outlook = Microsoft.Office.Interop.Outlook;

/**
* Outlook integration for SuiteCRM.
* @package Outlook integration for SuiteCRM
* @copyright SalesAgility Ltd http://www.salesagility.com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU LESSER GENERAL PUBLIC LICENCE as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU LESSER GENERAL PUBLIC LICENCE
* along with this program; if not, see http://www.gnu.org/licenses
* or write to the Free Software Foundation,Inc., 51 Franklin Street,
* Fifth Floor, Boston, MA 02110-1301 USA
*
* @author SalesAgility <[email protected]>
*/
namespace SuiteCRMAddIn.BusinessLogic
{
using System;
using SuiteCRMAddIn.ProtoItems;
using Outlook = Microsoft.Office.Interop.Outlook;

public class AppointmentSyncState: SyncState<Outlook.AppointmentItem>
{
public AppointmentSyncState(string crmType)
Expand All @@ -24,6 +46,9 @@ public override void DeleteItem()
this.OutlookItem.Delete();
}

/// <summary>
/// Construct a JSON-serialisable representation of my appointment item.
/// </summary>
internal override ProtoItem<Outlook.AppointmentItem> CreateProtoItem(Outlook.AppointmentItem outlookItem)
{
return new ProtoAppointment(outlookItem);
Expand Down
Loading

0 comments on commit a749ae2

Please sign in to comment.