Skip to content

Commit

Permalink
Updated RavenDB to build 2261; Fixed email service bug; Updated Nusta…
Browse files Browse the repository at this point in the history 
…che to release build; Tweaked indexes
  • Loading branch information
@frankradocaj
frankradocaj committed Feb 15, 2013
1 parent 7856edb commit ef7d7d8
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 27 deletions.
Binary file modified Lib/Nustache.Core.dll
View file
Binary file not shown.
Binary file added Lib/Nustache.Core.pdb
View file
Binary file not shown.
Binary file modified Lib/Nustache.Mvc3.dll
View file
Binary file not shown.
Binary file added Lib/Nustache.Mvc3.pdb
View file
Binary file not shown.
14 changes: 6 additions & 8 deletions Src/Bowerbird.Core/Bowerbird.Core.csproj
View file
Expand Up @@ -62,7 +62,7 @@
<Reference Include="Ninject">
<HintPath>..\..\packages\Ninject.3.0.1.10\lib\net40\Ninject.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<Reference Include="NLog">
<HintPath>..\..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
</Reference>
<Reference Include="Nustache.Core, Version=1.12.4.29, Culture=neutral, processorArchitecture=MSIL">
Expand All @@ -72,21 +72,19 @@
<Reference Include="policy.2.0.taglib-sharp">
<HintPath>..\..\packages\taglib.2.1.0.0\lib\policy.2.0.taglib-sharp.dll</HintPath>
</Reference>
<Reference Include="Raven.Abstractions, Version=1.2.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<Reference Include="Raven.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\RavenDB.Client.1.2.2010-Unstable\lib\net40\Raven.Abstractions.dll</HintPath>
<HintPath>..\..\packages\RavenDB.Client.2.0.2261\lib\net40\Raven.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Lightweight, Version=1.2.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<Reference Include="Raven.Client.Lightweight, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\RavenDB.Client.1.2.2010-Unstable\lib\net40\Raven.Client.Lightweight.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.MvcIntegration">
<HintPath>..\..\packages\RavenDB.Client.MvcIntegration.1.2.2010-Unstable\lib\net40\Raven.Client.MvcIntegration.dll</HintPath>
<HintPath>..\..\packages\RavenDB.Client.2.0.2261\lib\net40\Raven.Client.Lightweight.dll</HintPath>
</Reference>
<Reference Include="ReflectionMagic">
<HintPath>..\..\packages\ReflectionMagic.1.1\lib\net40\ReflectionMagic.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
Expand Down
4 changes: 2 additions & 2 deletions Src/Bowerbird.Core/Indexes/All_Contributions.cs
View file
Expand Up @@ -425,10 +425,10 @@ select new
g.Key.ParentContributionType,
g.Key.SubContributionType,
UserId = g.Select(x => x.UserId).Where(x => x != null).FirstOrDefault(),
CreatedDateTime = g.Select(x => x.CreatedDateTime).Where(x => x != null).FirstOrDefault(),
CreatedDateTime = g.Select(x => x.CreatedDateTime).FirstOrDefault(),
GroupIds = g.SelectMany(x => x.GroupIds),
SightingTitle = g.Select(x => x.SightingTitle).Where(x => x != null).FirstOrDefault(),
SightingSightedOn = g.Select(x => x.SightingSightedOn).Where(x => x != null).FirstOrDefault(),
SightingSightedOn = g.Select(x => x.SightingSightedOn).FirstOrDefault(),
SightingCategory = g.Select(x => x.SightingCategory).Where(x => x != null).FirstOrDefault(),
SightingTags = g.SelectMany(x => x.SightingTags),
SightingDescriptions = g.SelectMany(x => x.SightingDescriptions),
Expand Down
2 changes: 1 addition & 1 deletion Src/Bowerbird.Core/Queries/ActivityViewModelQuery.cs
View file
Expand Up @@ -221,7 +221,7 @@ private object Execute(IRavenQueryable<All_Activities.Result> query, ActivitiesQ
if (x.Type == "sightingadded")
{
var result = contributions.FirstOrDefault(y => y.ParentContributionId == x.ContributionId && (y.ParentContributionType == "observation" || y.ParentContributionType == "record"));
var result = contributions.FirstOrDefault(y => y.ParentContributionId == x.ContributionId && (y.ParentContributionType == "observation" || y.ParentContributionType == "record") && y.SubContributionType == null);
if (result == null)
{
Expand Down
5 changes: 2 additions & 3 deletions Src/Bowerbird.Core/packages.config
View file
Expand Up @@ -4,9 +4,8 @@
<package id="DataAnnotationsExtensions" version="1.1.0.0" targetFramework="net40" />
<package id="MiniProfiler" version="2.0.2" targetFramework="net40" />
<package id="Ninject" version="3.0.1.10" targetFramework="net40" />
<package id="NLog" version="2.0.0.2000" />
<package id="RavenDB.Client" version="1.2.2010-Unstable" />
<package id="RavenDB.Client.MvcIntegration" version="1.2.2010-Unstable" targetFramework="net40" />
<package id="NLog" version="2.0.0.2000" targetFramework="net40" />
<package id="RavenDB.Client" version="2.0.2261" targetFramework="net40" />
<package id="ReflectionMagic" version="1.1" targetFramework="net40" />
<package id="taglib" version="2.1.0.0" targetFramework="net40" />
</packages>
17 changes: 10 additions & 7 deletions Src/Bowerbird.Web/Bowerbird.Web.csproj
View file
Expand Up @@ -107,7 +107,7 @@
<Reference Include="NinjectAdapter">
<HintPath>..\..\packages\CommonServiceLocator.NinjectAdapter.1.0.0.0\lib\NinjectAdapter.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<Reference Include="NLog">
<HintPath>..\..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
</Reference>
<Reference Include="NodaTime">
Expand All @@ -124,14 +124,17 @@
<Reference Include="Owin">
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference>
<Reference Include="Raven.Abstractions, Version=1.2.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\packages\RavenDB.Client.1.2.2010-Unstable\lib\net40\Raven.Abstractions.dll</HintPath>
<Reference Include="Raven.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\RavenDB.Client.2.0.2261\lib\net40\Raven.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Lightweight, Version=1.2.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\packages\RavenDB.Client.1.2.2010-Unstable\lib\net40\Raven.Client.Lightweight.dll</HintPath>
<Reference Include="Raven.Client.Lightweight, Version=2.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\RavenDB.Client.2.0.2261\lib\net40\Raven.Client.Lightweight.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.MvcIntegration, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\RavenDB.Client.MvcIntegration.1.2.2010-Unstable\lib\net40\Raven.Client.MvcIntegration.dll</HintPath>
<Reference Include="Raven.Client.MvcIntegration, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\RavenDB.Client.MvcIntegration.2.0.2261\lib\net40\Raven.Client.MvcIntegration.dll</HintPath>
</Reference>
<Reference Include="ReflectionMagic">
<HintPath>..\..\packages\ReflectionMagic.1.1\lib\net40\ReflectionMagic.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion Src/Bowerbird.Web/Services/EmailService.cs
View file
Expand Up @@ -65,7 +65,7 @@ public void SendMailMessage(MailMessage mailMessage)

var appRoot = _documentSession.Load<AppRoot>(Constants.AppRootId);

if (appRoot.EmailServiceStatus)
if (appRoot != null && appRoot.EmailServiceStatus)
{
smtpClient.SendAsync(mailMessage, null);
}
Expand Down
6 changes: 3 additions & 3 deletions Src/Bowerbird.Web/packages.config
View file
Expand Up @@ -22,11 +22,11 @@
<package id="Ninject.Extensions.NamedScope" version="3.0.0.5" />
<package id="Ninject.MVC3" version="3.0.0.6" />
<package id="Ninject.Web.Common" version="3.0.0.7" />
<package id="NLog" version="2.0.0.2000" />
<package id="NLog" version="2.0.0.2000" targetFramework="net40" />
<package id="NodaTime" version="1.0.0-beta2" targetFramework="net40" />
<package id="Owin" version="1.0" targetFramework="net40" />
<package id="RavenDB.Client" version="1.2.2010-Unstable" />
<package id="RavenDB.Client.MvcIntegration" version="1.2.2010-Unstable" />
<package id="RavenDB.Client" version="2.0.2261" targetFramework="net40" />
<package id="RavenDB.Client.MvcIntegration" version="2.0.2261" targetFramework="net40" />
<package id="ReflectionMagic" version="1.1" targetFramework="net40" />
<package id="WebActivator" version="1.5.1" />
</packages>
1 change: 0 additions & 1 deletion Src/Bowerbird.Website/Bowerbird.Website.csproj
View file
Expand Up @@ -314,7 +314,6 @@
<Content Include="js\libs\jquery.visualize\jquery.visualize.js" />
<Content Include="js\libs\jquery.jsonp\jquery.jsonp.js" />
<Content Include="js\libs\jquery.multiselect\jquery.multiselect.js" />
<None Include="js\libs\jquery.signalr\jquery.signalr.js.OLD" />
<Content Include="js\libs\jquery.tag-it\jquery.tag-it.js" />
<Content Include="js\libs\jquery.timeago\jquery.timeago.js" />
<Content Include="js\libs\jquery.tipsy\jquery.tipsy.js" />
Expand Down
2 changes: 1 addition & 1 deletion Src/Bowerbird.Website/Web.config
View file
Expand Up @@ -15,7 +15,7 @@
</appSettings>
<!--YOU WILL NEED TO CHANGE THESE SETTINGS-->
<bowerbird>
<documentStore databaseName="" url="http://localhost:8080/" />
<documentStore databaseName="bowerbird" url="http://localhost:8080/" />
<environment rootUri="http://localhost:65061" staticContentIncrement="5" />
<email adminAccount="noreply@bowerbird.org.au" resetPasswordRelativeUri="/account/updatepassword/{0}" />
<media rootUri="/media/" relativePath="media\" />
Expand Down

0 comments on commit ef7d7d8

Please sign in to comment.