Development new #13

Open

YaVanilko wants to merge 192 commits intoYaVanilko:NewStorage2from

demmy:Development

Commits on Oct 20, 2015

Merge pull request #2 from demmy/Development
Valery Brezhnieva
committed

Commits on Oct 22, 2015

Merge pull request #3 from demmy/Development
Valery Brezhnieva
committed
Merge pull request #55 from vbre/workBranch
Valery Brezhnieva
committed
Merge pull request #4 from demmy/Development
Valery Brezhnieva
committed
Merge pull request #5 from demmy/Development
Valery Brezhnieva
committed
Merge from demmy/Development
Valery Brezhnieva
committed

Commits on Oct 27, 2015

On work
Valery Brezhnieva
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development' into currentBranch
Valery Brezhnieva
committed

Commits on Oct 29, 2015

Commits on Oct 31, 2015

Merge remote-tracking branch 'refs/remotes/origin/master' into DevExForms
SmolenskiyK
committed
implementation of add button
AlinaKulishdp
committed
Merge pull request #33 from demmy/Development
AlinaKulishdp
committed
Merge branch 'master' into RolesView
AlinaKulishdp
committed

Commits on Nov 1, 2015

OnWork
Valery Brezhnieva
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development'
Valery Brezhnieva
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into currentBranch
Valery Brezhnieva
committed
Merge bugs fixed
Valery Brezhnieva
committed
save button
AlinaKulishdp
committed
OnWork
Valery Brezhnieva
committed
RoleView form was finished
AlinaKulishdp
committed

Commits on Nov 2, 2015

Commits on Nov 3, 2015

Order forms almost done
Valery Brezhnieva
committed
Merge pull request #35 from demmy/Development
AlinaKulishdp
committed
Merge pull request #80 from YaVanilko/EFWorkingForms
demmy
committed
sql ce and annotation
demmy
committed
remove Redistr
demmy
committed
bugs in ProductCategoryView were fixed
AlinaKulishdp
committed
add annotation
demmy
committed
message box was added before deactivation entities
AlinaKulishdp
committed
Merge pull request #36 from demmy/Development
AlinaKulishdp
committed
Merge branch 'master' into RolesView
AlinaKulishdp
committed
Merge pull request #81 from vbre/currentBranch
demmy
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development' into DevExForms
SmolenskiyK
committed
add validation
AlinaKulishdp
committed
Merge pull request #82 from AlinaKulishdp/RolesView
demmy
committed
Merge pull request #37 from demmy/Development
AlinaKulishdp
committed
Merge remote-tracking branch 'origin/Development' into SqlCE
demmy
committed
migration
demmy
committed
Merge branch 'SqlCE' into from_vbre
demmy
committed
manual merge
demmy
committed
Merge pull request #84 from demmy/from_vbre
demmy
committed
Merge pull request #39 from demmy/Development
AlinaKulishdp
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development' into DevExForms
SmolenskiyK
committed
Merge pull request #6 from demmy/Development
SmolenskiyK
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into DevExForms
SmolenskiyK
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development' into currentBranch
Valery Brezhnieva
committed
Merge fix and context added
Valery Brezhnieva
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development' into currentBranch
Valery Brezhnieva
committed
add proxy for users and roles (user edit form)
AlinaKulishdp
committed
rename proxy to service
AlinaKulishdp
committed
addUser method added
AlinaKulishdp
committed
Bugs fixed
Valery Brezhnieva
committed
password changing fix
AlinaKulishdp
committed

Commits on Nov 4, 2015

Merge branch 'RolesView' of https://github.com/AlinaKulishdp/CS2_Project into DevExForms
SmolenskiyK
committed
fixes and refactoring
SmolenskiyK
committed
add ctor without incoming parametres
SmolenskiyK
committed
Merge pull request #86 from SmolenskiyK/DevExForms
demmy
committed
add validation in RoleView
AlinaKulishdp
committed
Merge pull request #40 from demmy/Development
AlinaKulishdp
committed
Merge branch 'master' into RolesView
AlinaKulishdp
committed
new version
AlinaKulishdp
committed
bug fix
AlinaKulishdp
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development' into currentBranch
Valery Brezhnieva
committed
empty fields
SmolenskiyK
committed

Commits on Nov 5, 2015

add validation into user edit
SmolenskiyK
committed
Add service and fixing some bugs
YaVanilko
committed
Activation + Price fixed
Valery Brezhnieva
committed
Merge pull request #89 from SmolenskiyK/DevExForms
demmy
committed
Merge pull request #91 from YaVanilko/Refactoring
demmy
committed
Merge branch 'currentBranch' of https://github.com/vbre/CS2_Project into vbre_merge
demmy
committed
fix encoding
demmy
committed
fix names
demmy
committed
code refactoring in RoleView
AlinaKulishdp
committed
code refactoring in ProductCategoryView
AlinaKulishdp
committed
validation bug fix, unsaved changes dialog
SmolenskiyK
committed
dialog result yes
SmolenskiyK
committed
true fix
SmolenskiyK
committed
some little things
AlinaKulishdp
committed
add condition
SmolenskiyK
committed
adjust columns size
AlinaKulishdp
committed
Merge pull request #87 from AlinaKulishdp/RolesView
demmy
committed
Merge pull request #96 from SmolenskiyK/DevExForms
demmy
committed
Merge pull request #41 from demmy/Development
AlinaKulishdp
committed
bug fixes
SmolenskiyK
committed
role validation fix
SmolenskiyK
committed
cancel click closing fix
SmolenskiyK
committed
add dummy data to seed
demmy
committed
fix good access modifier
demmy
committed
Merge pull request #100 from demmy/vbre_merge
demmy
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development' into currentBranch
Valery Brezhnieva
committed
view changes
SmolenskiyK
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development'
SmolenskiyK
committed
add user in main view caption
SmolenskiyK
committed
refactor Customer
demmy
committed
Validation was added in CustomerView
AlinaKulishdp
committed
Merge pull request #42 from demmy/Development
AlinaKulishdp
committed
Merge remote-tracking branch 'refs/remotes/demmy/vbre_merge' into currentBranch
Valery Brezhnieva
committed
Comboboxs seted as redonly
Valery Brezhnieva
committed
Merge branch 'master' into Customer-refactoring
AlinaKulishdp
committed

Commits on Nov 6, 2015

Commits on Nov 8, 2015

Cosmetic changes
Valery Brezhnieva
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development' into currentBranch
Valery Brezhnieva
committed
Merge pull request #43 from demmy/Development
AlinaKulishdp
committed
Bug fix in CustomerView
AlinaKulishdp
committed
Merge pull request #106 from AlinaKulishdp/Customer-refactoring
demmy
committed
Bug fixing
Valery Brezhnieva
committed
Merge pull request #107 from vbre/currentBranch
demmy
committed

Commits on Nov 9, 2015

empty password bug fix
SmolenskiyK
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development' into Refactoring
SmolenskiyK
committed
add notifyManager
SmolenskiyK
committed
Merge pull request #44 from demmy/Development
AlinaKulishdp
committed
Merge pull request #105 from SmolenskiyK/Refactoring
demmy
committed
Merge pull request #45 from demmy/Development
AlinaKulishdp
committed
Merge branch 'Refactoring' of https://github.com/YaVanilko/CS2_Project into Development
demmy
committed
GoodsDao refactor
demmy
committed
Cosmetic changes
AlinaKulishdp
committed
add event in CustomerDetailView
AlinaKulishdp
committed
fix AddGoods
demmy
committed
Merge pull request #109 from demmy/elena_merge
demmy
committed
Merge pull request #108 from AlinaKulishdp/Customer-refactoring
demmy
committed
remove dummy Seed
demmy
committed
Merge pull request #46 from demmy/Development
AlinaKulishdp
committed
Merge pull request #7 from demmy/Development
Valery Brezhnieva
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development' into currentBranch
Valery Brezhnieva
committed
Merge branch 'currentBranch' of https://github.com/vbre/CS2_Project into currentBranch
Valery Brezhnieva
committed
fix category duplication
demmy
committed
Merge pull request #47 from demmy/Development
AlinaKulishdp
committed
Merge pull request #8 from demmy/Development
Valery Brezhnieva
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development' into ContosoProject
YaVanilko
committed
aasa
demmy
committed
IsActive edit
YaVanilko
committed
Merge pull request #9 from demmy/vbre_add_order
Valery Brezhnieva
committed
Merge pull request #114 from YaVanilko/ContosoProject
demmy
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development' into currentBranch
Valery Brezhnieva
committed
comments removed
Valery Brezhnieva
committed
Refactoring
Valery Brezhnieva
committed
Validation and Message dialog
AlinaKulishdp
committed
If category is empty, form doesn't fall
YaVanilko
committed
Hard refactoring
Valery Brezhnieva
committed
Bug fixing
Valery Brezhnieva
committed

Commits on Nov 10, 2015

Bud fixing + refactoring
Valery Brezhnieva
committed
Merge pull request #115 from AlinaKulishdp/Finish
demmy
committed
Merge pull request #116 from YaVanilko/ContosoProject
demmy
committed
Merge remote-tracking branch 'refs/remotes/origin/Development' into vbre_add_order
Valery Brezhnieva
committed
Merge remote-tracking branch 'refs/remotes/origin/vbre_add_order' into Development
Valery Brezhnieva
committed
Merge branch 'Development' of https://github.com/demmy/CS2_Project into currentBranch
demmy
committed
Merge pull request #119 from demmy/vbre_currentBranch
demmy
committed
Merge pull request #48 from demmy/Development
AlinaKulishdp
committed
Bug with orders' list fixed
Valery Brezhnieva
committed
Fixing bugs
AlinaKulishdp
committed
Merge remote-tracking branch 'refs/remotes/demmy/Development' into currentBranch
Valery Brezhnieva
committed
Merge pull request #120 from vbre/currentBranch
demmy
committed
Merge pull request #121 from AlinaKulishdp/Finish
demmy
committed
Final changes
YaVanilko
committed
Merge pull request #122 from YaVanilko/Final
demmy
committed
Merge pull request #49 from demmy/Development
AlinaKulishdp
committed

Commits on Nov 11, 2015

add image to authentication form
AlinaKulishdp
committed
Merge pull request #123 from AlinaKulishdp/Finish
demmy
committed

Commits on Nov 24, 2015