Commits · 857001a1facf929a030db8ee298e3477beef9970 · Tran Hoang Viet / VietTH-VenShop · GitLab

22 Jul, 2015 2 commits
- Merge branch 'vietth_feat_order_management' into vietth_feat_additional · 857001a1
```
Conflicts:
	Gemfile
	app/views/layouts/_header.html.haml
	app/views/layouts/application.html.haml
	app/views/orders/index.html.haml
```
  Tran Hoang Viet committed Jul 22, 2015
  857001a1 Browse Files
- VietTH: Fix review code, saperate admin orders controler · bae6f988
  Tran Hoang Viet committed Jul 22, 2015
  
  bae6f988 Browse Files
21 Jul, 2015 2 commits
- VietTH: Use gem pundit instead cancan · e6026430
  Tran Hoang Viet committed Jul 21, 2015
  
  e6026430 Browse Files
- VietTH: Extend solr search with multi fields · e8423022
  Tran Hoang Viet committed Jul 21, 2015
  
  e8423022 Browse Files
20 Jul, 2015 4 commits
- VietTH: Fix issue show image scocial · ae61394c
  Tran Hoang Viet committed Jul 20, 2015
  
  ae61394c Browse Files
- VietTH: update deploy information · f4b43517
  Tran Hoang Viet committed Jul 20, 2015
  
  f4b43517 Browse Files
- VietTH: Move server to koding.io · df5717f4
  Tran Hoang Viet committed Jul 20, 2015
  
  df5717f4 Browse Files
- VietTH: Implement AWS S3 for products image management · 89e7a441
  Tran Hoang Viet committed Jul 20, 2015
  
  89e7a441 Browse Files
17 Jul, 2015 4 commits
- VietTH: Add rake update_price to crontab · eebd25df
  Tran Hoang Viet committed Jul 17, 2015
  
  eebd25df Browse Files
- VietTH: Add rake update price for products amazon · 2f3c0762
  Tran Hoang Viet committed Jul 17, 2015
  
  2f3c0762 Browse Files
- VietTH: Apply permission to order resource. Use gem cancan · 92e948d5
  Tran Hoang Viet committed Jul 17, 2015
  
  92e948d5 Browse Files
- Merge remote-tracking branch 'origin/develop' into vietth_feat_order_management · f308e16c
  Tran Hoang Viet committed Jul 17, 2015
  
  f308e16c Browse Files
16 Jul, 2015 3 commits
- VietTH: Implement feature order management · 1236556d
  Tran Hoang Viet committed Jul 16, 2015
  
  1236556d Browse Files
- VietTH: Add and use gem meta-tags · 03601722
  Tran Hoang Viet committed Jul 16, 2015
  
  03601722 Browse Files
- VietTH: Fix review code social feature · 6d6f1f12
  Tran Hoang Viet committed Jul 16, 2015
  
  6d6f1f12 Browse Files
15 Jul, 2015 4 commits
- VietTH: Implement feature share scocials and update layout venshop · a9b16269
  Tran Hoang Viet committed Jul 15, 2015
  
  a9b16269 Browse Files
- VietTH: Create new product with new attribute :stock · ceb74a0c
  Tran Hoang Viet committed Jul 15, 2015
  
  ceb74a0c Browse Files
- VietTH: Implement validate add_to_cart · d95632a4
  Tran Hoang Viet committed Jul 15, 2015
  
  d95632a4 Browse Files
- VietTH: Move add_t_cart and update_cart to CartService · 91759019
  Tran Hoang Viet committed Jul 15, 2015
  
  91759019 Browse Files
14 Jul, 2015 1 commit
- VietTH: Implement feature stock manager · 5db57ed9
  Tran Hoang Viet committed Jul 14, 2015
  
  5db57ed9 Browse Files
13 Jul, 2015 17 commits
- Merge remote-tracking branch 'origin/hotfix-1.0.1' into develop · 1cca49df
  Tran Hoang Viet committed Jul 13, 2015
  
  1cca49df Browse Files
- VietTH: Hotfix issue search with regex '~' · 084d72b3
  Tran Hoang Viet committed Jul 13, 2015
  
  084d72b3 Browse Files
- Merge branch 'hotfix-1.0.1' into 'develop' · ab57ecbf
```
VietTH: Hotfix release 1.0.0

See merge request !8
```
  Tran Hoang Viet committed Jul 13, 2015
  ab57ecbf Browse Files
- VietTH: Hotfix issue search with special characters · 58360014
  Tran Hoang Viet committed Jul 13, 2015
  
  58360014 Browse Files
- Merge remote-tracking branch 'origin/hotfix-1.0.1' into develop · e86b7398
  Tran Hoang Viet committed Jul 13, 2015
  
  e86b7398 Browse Files
- VietTH: Hotfix issue searching more than 1 word · 74ba6f73
  Tran Hoang Viet committed Jul 13, 2015
  
  74ba6f73 Browse Files
- Merge remote-tracking branch 'origin/hotfix-1.0.1' into develop · f0a13325
```
Conflicts:
	app/controllers/categories_controller.rb
```
  Tran Hoang Viet committed Jul 13, 2015
  f0a13325 Browse Files
- VietTH: Hotfix fissue truncate category title · 5a34ad79
  Tran Hoang Viet committed Jul 13, 2015
  
  5a34ad79 Browse Files
- Merge remote-tracking branch 'origin/hotfix-1.0.0' into develop · 7bfe7d64
  Tran Hoang Viet committed Jul 13, 2015
  
  7bfe7d64 Browse Files
- VietTH: Hotfix add breadcrumb to search and category detail page · f5b846b1
  Tran Hoang Viet committed Jul 13, 2015
  
  f5b846b1 Browse Files
- Merge remote-tracking branch 'origin/hotfix-1.0.0' into develop · 58ab0ba8
  Tran Hoang Viet committed Jul 13, 2015
  
  58ab0ba8 Browse Files
- VietTH: Hotfix change per_page in search result · e8b8f19a
  Tran Hoang Viet committed Jul 13, 2015
  
  e8b8f19a Browse Files
- Merge remote-tracking branch 'origin/release-1.0.0' · 9b8cf531
  Tran Hoang Viet committed Jul 13, 2015
  
  9b8cf531 Browse Files
- Merge branch 'vietth_feat_search' into 'develop' · 3b19a49d
```
VietTH: Feature search

See merge request !4
```
  Tran Hoang Viet committed Jul 13, 2015
  3b19a49d Browse Files
- Merge branch 'vietth_feat_product_management' into 'develop' · b07e1f6f
```
Vietth feature product management

See merge request !3
```
  Tran Hoang Viet committed Jul 13, 2015
  b07e1f6f Browse Files
- VietTH: Fix review code feature search · 26aab3c8
  Tran Hoang Viet committed Jul 13, 2015
  
  26aab3c8 Browse Files
- VietTH: Update info for deploy · 5a3bd5d8
  Tran Hoang Viet committed Jul 13, 2015
  
  5a3bd5d8 Browse Files
12 Jul, 2015 1 commit
- VietTH: Update info for deploy · 97dbc504
  Tran Hoang Viet committed Jul 13, 2015
  
  97dbc504 Browse Files
10 Jul, 2015 2 commits
- VietTH: Apply rubocop · e6e8a16c
  Tran Hoang Viet committed Jul 10, 2015
  
  e6e8a16c Browse Files
- Initialize library to deploy · dc7a3a6d
  Tran Hoang Viet committed Jul 10, 2015
  
  dc7a3a6d Browse Files