Permalink
Browse files

Merge branch 'master' of git://github.com/Leeforall/NFCShopping

Conflicts:
	WebSite/WebSite/NFCShoppingWebSite.csproj
	WebSite/WebSite/WebPages/DiscountItemAdd.aspx.cs
  • Loading branch information...
EternalWind committed Apr 11, 2012
2 parents 346c2c3 + 14d5839 commit 3d04b39c2ebee720e85b62384545fe27561eb215
Showing with 746 additions and 444 deletions.
  1. +41 −68 WebSite/WebSite/Access_Data/ShopEntities.Designer.cs
  2. +45 −52 WebSite/WebSite/Access_Data/ShopEntities.edmx
  3. +23 −20 WebSite/WebSite/Account/ChangePassword.aspx
  4. +8 −8 WebSite/WebSite/Account/ChangePassword.aspx.designer.cs
  5. +12 −11 WebSite/WebSite/Account/Login.aspx
  6. +1 −0 WebSite/WebSite/Account/Login.aspx.cs
  7. +11 −11 WebSite/WebSite/Account/Login.aspx.designer.cs
  8. +47 −0 WebSite/WebSite/Account/PasswordRecovery.aspx
  9. +17 −0 WebSite/WebSite/Account/PasswordRecovery.aspx.cs
  10. +24 −0 WebSite/WebSite/Account/PasswordRecovery.aspx.designer.cs
  11. +21 −20 WebSite/WebSite/Account/Register.aspx
  12. +1 −5 WebSite/WebSite/BLL/DiscountBL.cs
  13. +11 −0 WebSite/WebSite/NFCShoppingWebSite.csproj
  14. +3 −0 WebSite/WebSite/NFCShoppingWebSite.csproj.user
  15. +1 −1 WebSite/WebSite/Styles/Site.Master
  16. +17 −17 WebSite/WebSite/Styles/Site.Master.designer.cs
  17. +17 −20 WebSite/WebSite/Web.config
  18. +0 −1 WebSite/WebSite/WebPages/DiscountAdd.aspx.cs
  19. +3 −1 WebSite/WebSite/WebPages/DiscountDetails.aspx
  20. +11 −11 WebSite/WebSite/WebPages/DiscountDetails.aspx.designer.cs
  21. +1 −3 WebSite/WebSite/WebPages/DiscountItemEdit.aspx.cs
  22. +3 −0 WebSite/WebSite/WebPages/web.config
  23. +1 −1 mobile phone client/NFCShopping/AndroidManifest.xml
  24. +52 −54 mobile phone client/NFCShopping/gen/scut/bgooo/ui/R.java
  25. +1 −1 mobile phone client/NFCShopping/res/layout/comment.xml
  26. +1 −1 mobile phone client/NFCShopping/res/layout/datetagitemview.xml
  27. +1 −21 mobile phone client/NFCShopping/res/layout/discountitem.xml
  28. +4 −3 mobile phone client/NFCShopping/res/layout/discountshititem.xml
  29. +2 −2 mobile phone client/NFCShopping/res/layout/itemview.xml
  30. +6 −5 mobile phone client/NFCShopping/res/layout/productitem.xml
  31. +19 −1 mobile phone client/NFCShopping/src/scut/bgooo/concern/ConcernItem.java
  32. +5 −1 mobile phone client/NFCShopping/src/scut/bgooo/concern/ConcernItemAdapter.java
  33. +11 −7 mobile phone client/NFCShopping/src/scut/bgooo/concern/ConcernManager.java
  34. +2 −1 mobile phone client/NFCShopping/src/scut/bgooo/db/DBHelper.java
  35. +18 −0 mobile phone client/NFCShopping/src/scut/bgooo/db/TransistionUtil.java
  36. +5 −3 mobile phone client/NFCShopping/src/scut/bgooo/db/UserProfileUtil.java
  37. +16 −5 mobile phone client/NFCShopping/src/scut/bgooo/entities/Discount.java
  38. +6 −23 mobile phone client/NFCShopping/src/scut/bgooo/entities/DiscountItem.java
  39. +1 −0 mobile phone client/NFCShopping/src/scut/bgooo/ui/CollectionListActivity.java
  40. +4 −2 mobile phone client/NFCShopping/src/scut/bgooo/ui/CommentActivity.java
  41. +16 −8 mobile phone client/NFCShopping/src/scut/bgooo/ui/CommentListActivity.java
  42. +31 −17 mobile phone client/NFCShopping/src/scut/bgooo/ui/DiscountItemListActivity.java
  43. +5 −4 mobile phone client/NFCShopping/src/scut/bgooo/ui/DiscountListActivity.java
  44. +1 −0 mobile phone client/NFCShopping/src/scut/bgooo/ui/LoginActivity.java
  45. +27 −14 mobile phone client/NFCShopping/src/scut/bgooo/ui/MoreActivity.java
  46. +126 −16 mobile phone client/NFCShopping/src/scut/bgooo/ui/ProductActivity.java
  47. +0 −2 mobile phone client/NFCShopping/src/scut/bgooo/ui/VerifierWebViewActivity.java
  48. +2 −0 mobile phone client/NFCShopping/src/scut/bgooo/utility/Task.java
  49. +64 −3 mobile phone client/NFCShopping/src/scut/bgooo/utility/TaskHandler.java
  50. +1 −0 mobile phone client/NFCShopping/src/scut/bgooo/webservice/WebServiceUtil.java

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 3d04b39

Please sign in to comment.