Build: #1237 was successful Changes by David Butt
Code commits
TabletDirector-develop
-
David Butt 08ef1771aa64061995d3ad4963af3fd25bbbdbc2
fixed no compile scripts
-
David Butt 69c88ff3b5a4a431e6c3343632b71a9f4a9131b5
Merge branch 'DupAliases' into Trunk
-
Jared Koford 667b0aedd9067cff2b4e8c0c66465e0a055b5ef5
Merge remote-tracking branch 'origin/Trunk' into DupAliases
-
Jared Koford bb7edce7a1d8781f6d73ce548cc680dd6d982c21
Hidding Alias Unit Of Measure
-
Jared Koford b99c8a71d2e881d2bff46ea0c953ef23ed984176
Alias Index, Edit and Create page navigation and edit
-
Jared Koford 0c2802618a28356de7005626944b89e600473c36
Merge remote-tracking branch 'origin/Trunk' into DupAliases
-
Jared Koford 743dffce49cd4a1039be5dc30ece5e11a0e9bb61
Working on Alias list page
-
Jared Koford 1e82c1c1c2b2a93ae771d3a6f5bca951d7dbe506
working on edit delete item metadata
- TabletDirector/Controllers/ItemAliasController.cs (diffs)
- TabletDirector/Views/ItemAlias/Create.cshtml (diffs)
- TabletDirector/Views/ItemAlias/Delete.cshtml (diffs)
- TabletDirector/Views/ItemAlias/Edit.cshtml (diffs)
- TabletDirector/Views/ItemAlias/Index.cshtml (diffs)
- TabletDirector/Views/ItemMaster/Edit.cshtml (diffs)
- TabletDirector/Views/Shared/_MenuPartial.cshtml (diffs)
-
Jared Koford 29bcaf16246dee9ab3cd3d7cce4a06875e244a74
ManyToManyItemAlias migration
-
Jared Koford 77f52ea4e0c2c83a2a5994f7271cf05ccb154adf
Making ItemAlias ItemMaster Many to Many
- TabletDirector/Controllers/ItemAliasController.cs (diffs)
- TabletDirector/Controllers/ItemMasterController.cs (diffs)
- TabletDirector/Models/DatabaseModels/ItemMaster.cs (diffs)
- TabletDirector/Views/ItemAlias/Create.cshtml (diffs)
- TabletDirector/Views/ItemAlias/Edit.cshtml (diffs)
- TabletDirector/Views/ItemAlias/Index.cshtml (diffs)
- TabletDirector/Views/ItemMaster/Edit.cshtml (diffs)
- TabletDirector/Web.config (diffs)
-
Jared Koford 6f0ab8f76dec057cafceb8ee98577440d59ddedc
Added Migration
-
Jared Koford f921abee6d7f74d02c8dece26cbc2294140f238e
Adding item alias index
-
Jared Koford b0017c726cc307fcb95b6da29198a6de86232549
Merge remote-tracking branch 'origin/Trunk' into DupAliases
-
Jared Koford 8b142846eaa517fcd36f1c7c73868858efaf4738
Working on Duplicate Aliases
- TabletDirector/API/ItemApiController.cs (diffs)
- TabletDirector/API/OrderApiController.cs (diffs)
- TabletDirector/Controllers/ImportExportController.cs (diffs)
- TabletDirector/Controllers/ItemAliasController.cs (diffs)
- TabletDirector/Controllers/ItemMasterController.cs (diffs)
- TabletDirector/Controllers/WebServiceController.cs (diffs)
- TabletDirector/Models/DataContext.cs (diffs)
- TabletDirector/Models/DatabaseModels/ItemAlias.cs (diffs)
- TabletDirector/Models/DatabaseModels/ItemMaster.cs (diffs)
- TabletDirector/Models/DatabaseModels/ItemMetaData.cs (diffs)
- TabletDirector/Models/ImportModels/ImportItemMaster.cs (diffs)
- TabletDirector/TabletDirector.csproj (diffs)
-
Jared Koford a7b1d0b90bbee41e0e73a22f963788cb0c0e645b
Merge remote-tracking branch 'origin/3.3' into DupAliases
# Conflicts:
# TabletDirector/Controllers/HomeController.cs
# TabletDirector/Properties/AssemblyInfo.cs
# TabletDirector/Views/Home/Dashboard.cshtml -
David Butt 02156d86eb0d2a2d88757aceb508f8e31dee06ce
upped build number
-
David Butt f4c631788fbe3d5a5717be0690909757b282d1e6
fixed javascript for grouping
-
Jared Koford 90ce7535d7c089debc71ca056032473b79ed4a2c
Merge branch 'Trunk' into DupAliases
-
Jared Koford c91533177ffee32c3b533422255d65b9b4cc8ef7
get branch set
-
Jared Koford 36a216b84ff983c37eb988f387fc3e10c2ddc0a1
Dashboard display populate change
-
Jared Koford ede71f4d941020b54295da8c287719189c884d50
Dashboard pushing back changes made in trunk