1391/11/20 01:48
1391/11/20 01:48 bin & dlls
1
Merge branch 'master' of https://github.com/nmohammadi/MITD.PMS

Conflicts:
	MITD.PMS.Data.EF/bin/Debug/MITD.PMS.Data.EF.dll
	MITD.PMS.Data.EF/bin/Debug/MITD.PMS.Data.EF.pdb
	MITD.PMS.Data.EF/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MITD.PMS.Data.EF/obj/Debug/MITD.PMS.Data.EF.csproj.FileListAbsolute.txt
	MITD.PMS.Data.EF/obj/Debug/MITD.PMS.Data.EF.csprojResolveAssemblyReference.cache
	MITD.PMS.Data.EF/obj/Debug/MITD.PMS.Data.EF.dll
	MITD.PMS.Data.EF/obj/Debug/MITD.PMS.Data.EF.pdb
	MITD.PMS.Domain.Model/bin/Debug/MITD.PMS.Domain.Model.dll
	MITD.PMS.Domain.Model/bin/Debug/MITD.PMS.Domain.Model.pdb
	MITD.PMS.Domain.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MITD.PMS.Domain.Model/obj/Debug/MITD.PMS.Domain.Model.csproj.FileListAbsolute.txt
	MITD.PMS.Domain.Model/obj/Debug/MITD.PMS.Domain.Model.dll
	MITD.PMS.Domain.Model/obj/Debug/MITD.PMS.Domain.Model.pdb
	MITD.PMS.Presentation.Contracts.SL/Bin/Debug/MITD.PMS.Presentation.Contracts.SL.dll
	MITD.PMS.Presentation.Contracts.SL/Bin/Debug/MITD.PMS.Presentation.Contracts.SL.pdb
	MITD.PMS.Presentation.Contracts.SL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MITD.PMS.Presentation.Contracts.SL/obj/Debug/MITD.PMS.Presentation.Contracts.SL.csproj.FileListAbsolute.txt
	MITD.PMS.Presentation.Contracts.SL/obj/Debug/MITD.PMS.Presentation.Contracts.SL.csprojResolveAssemblyReference.cache
	MITD.PMS.Presentation.Contracts.SL/obj/Debug/MITD.PMS.Presentation.Contracts.SL.dll
	MITD.PMS.Presentation.Contracts.SL/obj/Debug/MITD.PMS.Presentation.Contracts.SL.pdb
	MITD.PMS.Presentation.Contracts/bin/Debug/MITD.PMS.Presentation.Contracts.dll
	MITD.PMS.Presentation.Contracts/bin/Debug/MITD.PMS.Presentation.Contracts.pdb
	MITD.PMS.Presentation.Contracts/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MITD.PMS.Presentation.Contracts/obj/Debug/MITD.PMS.Presentation.Contracts.csproj.FileListAbsolute.txt
	MITD.PMS.Presentation.Contracts/obj/Debug/MITD.PMS.Presentation.Contracts.csprojResolveAssemblyReference.cache
	MITD.PMS.Presentation.Contracts/obj/Debug/MITD.PMS.Presentation.Contracts.dll
	MITD.PMS.Presentation.Contracts/obj/Debug/MITD.PMS.Presentation.Contracts.pdb
	MITD.PMS.Presentation.Logic.SL/Bin/Debug/MITD.PMS.Presentation.Contracts.SL.dll
	MITD.PMS.Presentation.Logic.SL/Bin/Debug/MITD.PMS.Presentation.Contracts.SL.pdb
	MITD.PMS.Presentation.Logic.SL/Bin/Debug/MITD.PMS.Presentation.Logic.SL.dll
	MITD.PMS.Presentation.Logic.SL/Bin/Debug/MITD.PMS.Presentation.Logic.SL.pdb
	MITD.PMS.Presentation.Logic.SL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MITD.PMS.Presentation.Logic.SL/obj/Debug/MITD.PMS.Presentation.Logic.SL.csproj.FileListAbsolute.txt
	MITD.PMS.Presentation.Logic.SL/obj/Debug/MITD.PMS.Presentation.Logic.SL.csprojResolveAssemblyReference.cache
	MITD.PMS.Presentation.Logic.SL/obj/Debug/MITD.PMS.Presentation.Logic.SL.dll
	MITD.PMS.Presentation.Logic.SL/obj/Debug/MITD.PMS.Presentation.Logic.SL.pdb
	MITD.PMS.Presentation.PeriodManagementApp/Bin/Debug/MITD.PM.Presentation.PeriodManagementApp.xap
	MITD.PMS.Presentation.PeriodManagementApp/Bin/Debug/MITD.PMS.Presentation.Contracts.SL.dll
	MITD.PMS.Presentation.PeriodManagementApp/Bin/Debug/MITD.PMS.Presentation.Contracts.SL.pdb
	MITD.PMS.Presentation.PeriodManagementApp/Bin/Debug/MITD.PMS.Presentation.Logic.SL.dll
	MITD.PMS.Presentation.PeriodManagementApp/Bin/Debug/MITD.PMS.Presentation.Logic.SL.pdb
	MITD.PMS.Presentation.PeriodManagementApp/Bin/Debug/MITD.PMS.Presentation.PeriodManagementApp.dll
	MITD.PMS.Presentation.PeriodManagementApp/Bin/Debug/MITD.PMS.Presentation.PeriodManagementApp.pdb
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/App.g.cs
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/App.g.i.cs
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/MITD.PMS.Presentation.PeriodManagementApp.csproj.FileListAbsolute.txt
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/MITD.PMS.Presentation.PeriodManagementApp.csprojResolveAssemblyReference.cache
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/MITD.PMS.Presentation.PeriodManagementApp.dll
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/MITD.PMS.Presentation.PeriodManagementApp.pdb
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/MainPage.g.cs
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/MainPage.g.i.cs
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/Views/JobInPeriodListView.g.cs
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/Views/JobInPeriodListView.g.i.cs
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/Views/PeriodListView.g.cs
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/Views/PeriodListView.g.i.cs
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/Views/PeriodView.g.cs
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/Views/PeriodView.g.i.cs
	MITD.PMS.Presentation.PeriodManagementApp/obj/Debug/XapCacheFile.xml
	MITD.PMS.Presentation.UI.SL/Bin/Debug/MITD.PMS.Presentation.UI.SL.dll
	MITD.PMS.Presentation.UI.SL/Bin/Debug/MITD.PMS.Presentation.UI.SL.pdb
	MITD.PMS.Presentation.UI.SL/obj/Debug/App.g.cs
	MITD.PMS.Presentation.UI.SL/obj/Debug/App.g.i.cs
	MITD.PMS.Presentation.UI.SL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MITD.PMS.Presentation.UI.SL/obj/Debug/MITD.PMS.Presentation.UI.SL.csproj.FileListAbsolute.txt
	MITD.PMS.Presentation.UI.SL/obj/Debug/MITD.PMS.Presentation.UI.SL.csprojResolveAssemblyReference.cache
	MITD.PMS.Presentation.UI.SL/obj/Debug/MITD.PMS.Presentation.UI.SL.dll
	MITD.PMS.Presentation.UI.SL/obj/Debug/MITD.PMS.Presentation.UI.SL.pdb
	MITD.PMS.Presentation.UI.SL/obj/Debug/MainPage.g.cs
	MITD.PMS.Presentation.UI.SL/obj/Debug/MainPage.g.i.cs
	MITD.PMS.Presentation.UI.SL/obj/Debug/System.ComponentModel.DataAnnotations.zip.cache
	MITD.PMS.Presentation.UI.SL/obj/Debug/System.Windows.Controls.Data.Input.zip.cache
	MITD.PMS.Presentation.UI.SL/obj/Debug/System.Windows.Controls.Data.Toolkit.zip.cache
	MITD.PMS.Presentation.UI.SL/obj/Debug/System.Windows.Controls.Data.zip.cache
	MITD.PMS.Presentation.UI.SL/obj/Debug/System.Windows.Controls.Input.Toolkit.zip.cache
	MITD.PMS.Presentation.UI.SL/obj/Debug/System.Windows.Controls.Layout.Toolkit.zip.cache
	MITD.PMS.Presentation.UI.SL/obj/Debug/System.Windows.Controls.Toolkit.zip.cache
	MITD.PMS.Presentation.UI.SL/obj/Debug/System.Windows.Controls.zip.cache
	MITD.PMS.Presentation.UI.SL/obj/Debug/System.Windows.Data.zip.cache
	MITD.PMS.Presentation.UI.SL/obj/Debug/XapCacheFile.xml
	MITD.PMS.Service.Host/ClientBin/MITD.PMS.Presentation.PeriodManagementApp.xap
	MITD.PMS.Service.Host/bin/MITD.PMS.Service.Host.dll
	MITD.PMS.Service.Host/bin/MITD.PMS.Service.Host.pdb
	MITD.PMS.Service.Host/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MITD.PMS.Service.Host/obj/Debug/MITD.PMS.Service.Host.csproj.FileListAbsolute.txt
	MITD.PMS.Service.Host/obj/Debug/MITD.PMS.Service.Host.csprojResolveAssemblyReference.cache
	MITD.PMS.Service.Host/obj/Debug/MITD.PMS.Service.Host.dll
	MITD.PMS.Service.Host/obj/Debug/MITD.PMS.Service.Host.pdb
	MITD.PMS.Service.Inventory/bin/Debug/MITD.PMS.Service.Inventory.dll
	MITD.PMS.Service.Inventory/bin/Debug/MITD.PMS.Service.Inventory.pdb
	MITD.PMS.Service.Inventory/obj/Debug/MITD.PMS.Service.Inventory.dll
	MITD.PMS.Service.Inventory/obj/Debug/MITD.PMS.Service.Inventory.pdb
	MITD.PerformanceManagement.v11.suo
	test/ClientBin/MITD.PM.Presentation.UI.SL.xap
1391//20-15:05
1391/1120-15:22
13911124_16:47
Merge branch 'master' of https://github.com/nmohammadi/MITD.PMS

Conflicts:
	MITD.PMS.Presentation.Contracts/EnumModel.cs
	MITD.PMS.Presentation.Logic.SL/Controller/PMSController.cs
	MITD.PMS.Presentation.Logic.SL/MITD.PMS.Presentation.Logic.SL.csproj
	MITD.PMS.Presentation.Logic.SL/MainWindowVM.cs
	MITD.PMS.Presentation.PeriodManagementApp/MITD.PMS.Presentation.PeriodManagementApp.csproj
	MITD.PMS.Presentation.UI.SL/BootStrapper.cs
	MITD.PMS.Presentation.UI.SL/MITD.PMS.Presentation.UI.SL.csproj
	MITD.PMS.Presentation.UI.SL/MainPage.xaml
	MITD.PMS.Service.Host/ClientBin/MITD.Core.SL.zip
	MITD.PMS.Service.Host/ClientBin/MITD.PMS.Presentation.PeriodManagementApp.xap
	MITD.PMS.Service.Host/ClientBin/MITD.PMS.Presentation.UI.SL.xap
	MITD.PMS.Service.Host/ClientBin/MITD.Presentation.SL.zip
	MITD.PMS.Service.Host/ClientBin/MITD.Presentation.UI.SL.zip
	MITD.PMS.Service.Host/MITD.PMS.Service.Host.csproj
	MITD.PMS.Service.Host/MITD.PMS.Service.Host.csproj.user
	MITD.PMS.Service.Inventory/bin/Debug/MITD.PMS.Service.Inventory.dll
	MITD.PMS.Service.Inventory/bin/Debug/MITD.PMS.Service.Inventory.pdb
	MITD.PMS.Service.Inventory/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	MITD.PMS.Service.Inventory/obj/Debug/MITD.PMS.Service.Inventory.csproj.FileListAbsolute.txt
	MITD.PMS.Service.Inventory/obj/Debug/MITD.PMS.Service.Inventory.dll
	MITD.PMS.Service.Inventory/obj/Debug/MITD.PMS.Service.Inventory.pdb
	MITD.PerformanceManagement.sln
	MITD.PerformanceManagement.v11.suo
	test/ClientBin/MITD.PM.Presentation.UI.SL.xap
1391/11/25_16:11
1391/11/26_13:34
1391/11/26
1391/11/26
remove bin and obj folders
remove bin and obj folders
1391/11/26
Merge branch 'master' of https://github.com/nmohammadi/MITD.PMS

Conflicts:
	MITD.PMS.Presentation.Contracts.SL/MITD.PMS.Presentation.Contracts.SL.csproj
	MITD.PMS.Presentation.Contracts/EnumModel.cs.orig
	MITD.PMS.Presentation.Contracts/JobDto.cs
	MITD.PMS.Presentation.Logic.SL/Controller/PMSController.cs.orig
	MITD.PMS.Presentation.Logic.SL/MITD.PMS.Presentation.Logic.SL.csproj
	MITD.PMS.Presentation.Logic.SL/MainWindowVM.cs
	MITD.PMS.Presentation.Logic.SL/Wrapper/PeriodServiceWrapper.cs
	MITD.PMS.Presentation.PeriodManagementApp/MITD.PMS.Presentation.PeriodManagementApp.csproj
use localized resource in BasicInfoMenu_1391/11/30_08:59
use localized resource
1391/11/30
1391/11/30