Commits · ffcb9c049f2d6ca9dabdcc4369c875d8e1e06a29 · Junaid Rahman pv / test-project

03 Sep, 2016 6 commits
- Merge remote-tracking branch 'origin/development' into development · ffcb9c04
```
# Conflicts:
#	composer.json
```
  Junaid Rahman pv authored Sep 03, 2016
  ffcb9c04
- modified state,district and business module · 0a66f601
  Junaid Rahman pv authored Sep 03, 2016
  
  0a66f601
- Theme CRUD · 8e5dab8a
  dianc authored Sep 03, 2016
  
  8e5dab8a
- File type added in category · 78b74de1
  dianc authored Sep 03, 2016
  
  78b74de1
- Merge remote-tracking branch 'origin/development' into development · 762a49eb
  dianc authored Sep 03, 2016
  
  762a49eb
- Category Files Created · 23fcf85c
  dianc authored Sep 03, 2016
  
  23fcf85c
01 Sep, 2016 20 commits
- modified field size · 5034d186
  Junaid Rahman pv authored Sep 01, 2016
  
  5034d186
- modified unique validation · 951ccd96
  Junaid Rahman pv authored Sep 01, 2016
  
  951ccd96
- modified state and district · 98e0ece9
  Junaid Rahman pv authored Sep 01, 2016
  
  98e0ece9
- modified sidebar · fb1db90b
  Junaid Rahman pv authored Sep 01, 2016
  
  fb1db90b
- modified sidebar · 1792829c
  Junaid Rahman pv authored Sep 01, 2016
  
  1792829c
- code review changes · ed47356e
  jomon authored Sep 01, 2016
  
  ed47356e
- code review changes · 1a7272ce
  jomon authored Sep 01, 2016
  
  1a7272ce
- Merge remote-tracking branch 'origin/development' into development · 71b55384
  Junaid Rahman pv authored Sep 01, 2016
  
  71b55384
- modified tables and added extra functions · 8314fbdf
  Junaid Rahman pv authored Sep 01, 2016
  
  8314fbdf
- modified tables and added extra functions · 788e30a1
  Junaid Rahman pv authored Sep 01, 2016
  
  788e30a1
- Removed View Action form Category Index · 7c1c89be
  dianc authored Sep 01, 2016
  
  7c1c89be
- Category Index Changes · d1a3cd1d
  dianc authored Sep 01, 2016
  
  d1a3cd1d
- Merge remote-tracking branch 'origin/development' into development · 0ea084e9
  jomon authored Sep 01, 2016
  
  0ea084e9
- code review changes · 11bb6f87
  jomon authored Sep 01, 2016
  
  11bb6f87
- Merge remote-tracking branch 'origin/development' into development · 1e394749
  Junaid Rahman pv authored Sep 01, 2016
  
  1e394749
- created controller model and views for business and location modules · 2b2e9f35
  Junaid Rahman pv authored Sep 01, 2016
  
  2b2e9f35
- Category Layout Menu added · c6ed255b
  dianc authored Sep 01, 2016
  
  c6ed255b
- Merge remote-tracking branch 'origin/development' into development · ba4a83b7
```
# Conflicts:
#	backend/modules/theme/views/category/_form.php
```
  dianc authored Sep 01, 2016
  ba4a83b7
- Category Layout Menu added · 9f2151e4
  dianc authored Sep 01, 2016
  
  9f2151e4
- created modules · a8682a9a
  Junaid Rahman pv authored Sep 01, 2016
  
  a8682a9a
31 Aug, 2016 14 commits
- created modules · 211aa2dc
  Junaid Rahman pv authored Aug 31, 2016
  
  211aa2dc
- created models for those 3 tables modified migrations for business and location(state,district) · 2d5412da
  Junaid Rahman pv authored Aug 31, 2016
  
  2d5412da
- modified migrations for business and location(state,district) · 39f593c1
  Junaid Rahman pv authored Aug 31, 2016
  
  39f593c1
- modified migrations for business and location(state,district) · f50df33e
  Junaid Rahman pv authored Aug 31, 2016
  
  f50df33e
- Merge remote-tracking branch 'origin/development' into development · bdd0e60a
  Junaid Rahman pv authored Aug 31, 2016
  
  bdd0e60a
- created migrations for business and location(state,district) · fed7b063
  Junaid Rahman pv authored Aug 31, 2016
  
  fed7b063
- code review changes · 496fdd58
  jomon authored Aug 31, 2016
  
  496fdd58
- code review changes · c9e0ec8a
  jomon authored Aug 31, 2016
  
  c9e0ec8a
- Category Info and Files Tab · 31be3fa5
  dianc authored Aug 31, 2016
  
  31be3fa5
- code review changes · 921e71b3
  jomon authored Aug 31, 2016
  
  921e71b3
- code review changes · 027b5253
  jomon authored Aug 31, 2016
  
  027b5253
- code review changes · b99834fe
  jomon authored Aug 31, 2016
  
  b99834fe
- code review changes · 470b0c23
  jomon authored Aug 31, 2016
  
  470b0c23
- Category Updated-4 · 9ee19cd3
  dianc authored Aug 31, 2016
  
  9ee19cd3