Skip to content

Commit

Permalink
0.58.0
Browse files Browse the repository at this point in the history
This closes #67 and closes #68
  • Loading branch information
coni2k committed Jun 15, 2016
1 parent 7af02ca commit 05560df
Show file tree
Hide file tree
Showing 44 changed files with 1,066 additions and 1,497 deletions.
2 changes: 1 addition & 1 deletion BusinessObjects/Models/ElementItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public ElementItem(Element element, string name) : this()
public int ElementId { get; set; }

[Required]
[StringLength(250)]
[StringLength(150)]
public string Name { get; set; }

public virtual Element Element { get; set; }
Expand Down
5 changes: 4 additions & 1 deletion BusinessObjects/Models/ResourcePool.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,12 @@ public string Key
}

[Required]
[StringLength(250)]
[StringLength(50)]
public string Name { get; set; }

[StringLength(5000)]
public string Description { get; set; }

public decimal InitialValue { get; set; }

public bool UseFixedResourcePoolRate { get; set; }
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
### Changelog

**0.58.0**

* Description field for resource pool
https://github.com/forCrowd/WealthEconomy/issues/68
* Is Main Element bug fix
https://github.com/forCrowd/WealthEconomy/issues/67
* Project notes were moved to wiki page
https://github.com/forCrowd/WealthEconomy/wiki
* package updates
* breezejs was updated to 1.5.7 and odata adapter's manually fixed version was removed
* angular was replaced with fixed 1.5.4: there is a problem with 1.5.5+ packages, it installs 1.5.7 instead
* jquery was replaced with fixed 2.2.2: there is a problem with 2.2.3+ packages, it installs 3.0.0 instead
* bootstrap-social package was removed

**0.57.0**

* Search page instead of list
Expand Down
20 changes: 10 additions & 10 deletions DataObjects/DataObjects.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@
<Compile Include="Generated\UserRoleRepository.cs">
<DependentUpon>Repository.tt</DependentUpon>
</Compile>
<Compile Include="Migrations\201603261149374_Initial.cs" />
<Compile Include="Migrations\201603261149374_Initial.Designer.cs">
<DependentUpon>201603261149374_Initial.cs</DependentUpon>
<Compile Include="Migrations\201606141949102_Initial.cs" />
<Compile Include="Migrations\201606141949102_Initial.Designer.cs">
<DependentUpon>201606141949102_Initial.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\201603261149481_Initial_Manual.cs" />
<Compile Include="Migrations\201603261149481_Initial_Manual.Designer.cs">
<DependentUpon>201603261149481_Initial_Manual.cs</DependentUpon>
<Compile Include="Migrations\201606141949205_Initial_Manual.cs" />
<Compile Include="Migrations\201606141949205_Initial_Manual.Designer.cs">
<DependentUpon>201606141949205_Initial_Manual.cs</DependentUpon>
</Compile>
<Compile Include="ResourcePoolRepository.cs" />
<Compile Include="RoleStore.cs" />
Expand Down Expand Up @@ -162,11 +162,11 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Migrations\201603261149374_Initial.resx">
<DependentUpon>201603261149374_Initial.cs</DependentUpon>
<EmbeddedResource Include="Migrations\201606141949102_Initial.resx">
<DependentUpon>201606141949102_Initial.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\201603261149481_Initial_Manual.resx">
<DependentUpon>201603261149481_Initial_Manual.cs</DependentUpon>
<EmbeddedResource Include="Migrations\201606141949205_Initial_Manual.resx">
<DependentUpon>201606141949205_Initial_Manual.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
126 changes: 0 additions & 126 deletions DataObjects/Migrations/201603261149374_Initial.resx

This file was deleted.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public override void Up()
{
Id = c.Int(nullable: false, identity: true),
ElementId = c.Int(nullable: false),
Name = c.String(nullable: false, maxLength: 250),
Name = c.String(nullable: false, maxLength: 150),
CreatedOn = c.DateTime(nullable: false),
ModifiedOn = c.DateTime(nullable: false),
DeletedOn = c.DateTime(),
Expand Down Expand Up @@ -189,7 +189,8 @@ public override void Up()
Id = c.Int(nullable: false, identity: true),
UserId = c.Int(nullable: false),
Key = c.String(nullable: false, maxLength: 250),
Name = c.String(nullable: false, maxLength: 250),
Name = c.String(nullable: false, maxLength: 50),
Description = c.String(),
InitialValue = c.Decimal(nullable: false, precision: 18, scale: 2),
UseFixedResourcePoolRate = c.Boolean(nullable: false),
ResourcePoolRateTotal = c.Decimal(precision: 18, scale: 2),
Expand Down
Loading

0 comments on commit 05560df

Please sign in to comment.