Pokaż
Ignoruj:
Data:
2009-10-15 15:34:49 (17 years ago)
Autor:
marek
Opis:

re #195 - merged with latest trunk

Lokalizacja:
branches/Emisje
Pliki:
2 zmodyfikowane

Legenda:

Bez zmian
Dodane
Usunięte

  • branches/Emisje

    • Property svn:mergeinfo

      •  

        old new  
        22/branches/ReklamaReorganizacja:568-731 
        33/tags/BazaReklam_1.1.28:831 
        4 /trunk:774-837 
         4/trunk:774-852 

  • branches/Emisje/Wierszowki/Wierszowki.Web/Wierszowki.Web.csproj

    r838 r853  
    7474    <Compile Include="Controllers\ReportController.cs" /> 
    7575    <Compile Include="Helpers\SelectExtension.cs" /> 
     76    <Compile Include="Models\AllViewData.cs" /> 
    7677    <Compile Include="Models\AuthorCardViewData.cs" /> 
     78    <Compile Include="Models\ConfirmViewData.cs" /> 
     79    <Compile Include="Models\DeleteViewData.cs" /> 
    7780    <Compile Include="Models\FormsAuthenticationService.cs" /> 
    7881    <Compile Include="Models\Interfaces\IFormsAuthentication.cs" /> 
    … …  
    8689    </Compile> 
    8790    <Compile Include="Models\AuthorViewData.cs" /> 
     91    <Compile Include="Models\UserConfirmViewData.cs" /> 
    8892    <Compile Include="Models\MagazineItemViewData.cs" /> 
     93    <Compile Include="Models\OperationType.cs" /> 
    8994    <Compile Include="Models\ReportViewData.cs" /> 
    9095    <Compile Include="Properties\AssemblyInfo.cs" /> 
    … …  
    102107    <Content Include="Scripts\date.js" /> 
    103108    <Content Include="Scripts\jHelper.js" /> 
     109    <Content Include="Scripts\jquery-1.2.6.js" /> 
     110    <Content Include="Scripts\jquery-1.2.6.min.js" /> 
    104111    <Content Include="Scripts\jquery-1.3.1-vsdoc.js" /> 
    105112    <Content Include="Scripts\jquery-1.3.1.js" /> 
    … …  
    109116    <Content Include="Scripts\jquery.datePicker.js" /> 
    110117    <Content Include="Scripts\jquery.form.js" /> 
     118    <Content Include="Scripts\jquery.validate.js" /> 
     119    <Content Include="Scripts\jqueryvalid.js" /> 
     120    <Content Include="Scripts\xValAuthor.js" /> 
     121    <Content Include="Scripts\xValUser.js" /> 
     122    <Content Include="Scripts\xValCreateMagazineItem.js" /> 
     123    <Content Include="Scripts\xValEditMagazineItem.js" /> 
    111124    <Content Include="Scripts\spiffy.js" /> 
     125    <Content Include="Scripts\xVal.AspNetNative.js" /> 
     126    <Content Include="Scripts\xVal.jquery.validate.js" /> 
    112127    <Content Include="Views\Account\Login.aspx" /> 
    113128    <Content Include="Views\Author\Confirm.aspx" /> 
    … …  
    115130    <Content Include="Views\Author\Edit.aspx" /> 
    116131    <Content Include="Views\Author\Index.aspx" /> 
     132    <Content Include="Views\Home\About.aspx" /> 
     133    <Content Include="Views\Home\Index.aspx" /> 
    117134    <Content Include="Views\MagazineItem\Confirm.aspx" /> 
     135    <Content Include="Views\MagazineItem\Create.aspx" /> 
    118136    <Content Include="Views\MagazineItem\Delete.aspx" /> 
    119137    <Content Include="Views\MagazineItem\Edit.aspx" /> 
    120     <Content Include="Views\MagazineItem\Create.aspx" /> 
    121138    <Content Include="Views\Report\AuthorCard.aspx" /> 
    122139    <Content Include="Views\Report\AuthorCardNotFound.aspx" /> 
    … …  
    126143    <Content Include="Views\Report\All.aspx" /> 
    127144    <Content Include="Views\Report\Index.aspx" /> 
     145    <Content Include="Views\Shared\Error.aspx" /> 
    128146    <Content Include="Views\User\Confirm.aspx" /> 
    129147    <Content Include="Views\User\Create.aspx" /> 
    … …  
    136154    <Content Include="Scripts\MicrosoftMvcAjax.js" /> 
    137155    <Content Include="Scripts\MicrosoftMvcAjax.debug.js" /> 
    138     <Content Include="Views\Home\About.aspx" /> 
    139     <Content Include="Views\Home\Index.aspx" /> 
    140     <Content Include="Views\Shared\Error.aspx" /> 
    141156    <Content Include="Views\Shared\LogOnUserControl.ascx" /> 
    142157    <Content Include="Views\Shared\Site.Master" />