Commits · 5147bff9cd47f9e587698caeeb618765b103cf9c · TimeOut / TimeOutAdmin

07 Oct, 2019 2 commits
- Merge branch 'master' into 'dev_production' · 5147bff9
  Tobin authored Oct 07, 2019
```
dc

See merge request !102
```
  5147bff9
- dc · 4b364cd8
  Tobin authored Oct 07, 2019
  
  4b364cd8
04 Oct, 2019 4 commits
- Merge branch 'master' into 'dev_production' · 81a86485
  Tobin authored Oct 04, 2019
```
dc

See merge request !101
```
  81a86485
- dc · ef439d5b
  Tobin authored Oct 04, 2019
  
  ef439d5b
- Merge branch 'master' into 'dev_production' · 070830bc
  Tobin authored Oct 04, 2019
```
dc

See merge request !100
```
  070830bc
- dc · e680e527
  Tobin authored Oct 04, 2019
  
  e680e527
03 Oct, 2019 5 commits
- Merge branch 'master' into 'dev_production' · a7012f9d
  Tobin authored Oct 03, 2019
```
dc

See merge request !99
```
  a7012f9d
- dc · 3b036b3c
  Tobin authored Oct 03, 2019
  
  3b036b3c
- Update database.php · 054830b5
  Tobin authored Oct 03, 2019
  
  054830b5
- Merge branch 'master' into 'dev_production' · 3bd18c85
  Tobin authored Oct 03, 2019
```
dc

See merge request !98
```
  3bd18c85
- dc · 3280636f
  Tobin authored Oct 03, 2019
  
  3280636f
30 Sep, 2019 2 commits
- Merge branch 'master' into 'dev_production' · ea3bed58
  Tobin authored Sep 30, 2019
```
Master

See merge request !97
```
  ea3bed58
- dc · b2eeb1bb
  Tobin authored Sep 30, 2019
  
  b2eeb1bb
26 Sep, 2019 7 commits
- Merge branch 'jansa' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 2503af97
  Tobin authored Sep 26, 2019
  
  2503af97
- dc · 2982e2cf
  Tobin authored Sep 26, 2019
  
  2982e2cf
- language changes in api · 962cfbc7
  Jansa Jose authored Sep 26, 2019
  
  962cfbc7
- Merge branch 'jansa' of https://gitlab.techware.co.in/timeout/timeOut into tobin · c11da653
  Tobin authored Sep 26, 2019
```
# Conflicts:
#	application/models/Webservice_model.php
```
  c11da653
- dc · f805fac4
  Tobin authored Sep 26, 2019
  
  f805fac4
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 35ba3213
  Jansa Jose authored Sep 26, 2019
  
  35ba3213
- language changes · 27ee566d
  Jansa Jose authored Sep 26, 2019
  
  27ee566d
24 Sep, 2019 4 commits
- Merge branch 'jansa' into 'master' · 10a8a4bd
  Tobin authored Sep 24, 2019
```
Jansa

See merge request !96
```
  10a8a4bd
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · be763f0b
  Jansa Jose authored Sep 24, 2019
```
# Conflicts:
#	application/controllers/Webservice.php
#	application/models/Webservice_model.php
```
  be763f0b
- dc · 4dbcccdc
  Jansa Jose authored Sep 24, 2019
  
  4dbcccdc
- dc · c5265aab
  Tobin authored Sep 24, 2019
  
  c5265aab
18 Sep, 2019 4 commits
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 1eef46a0
  Jansa Jose authored Sep 18, 2019
  
  1eef46a0
- change in promocode api · 5d893d68
  Jansa Jose authored Sep 18, 2019
  
  5d893d68
- Merge branch 'jansa' into 'master' · 205dcb7e
  Tobin authored Sep 18, 2019
```
Jansa

See merge request !95
```
  205dcb7e
- promocode · 98b3933a
  Jansa Jose authored Sep 18, 2019
  
  98b3933a
17 Sep, 2019 4 commits
- dc · 9ea520da
  Jansa Jose authored Sep 17, 2019
  
  9ea520da
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · fc9ec6ce
  Jansa Jose authored Sep 17, 2019
```
# Conflicts:
#	application/models/Webservice_model.php
```
  fc9ec6ce
- view page comit · f5233eea
  Jansa Jose authored Sep 17, 2019
  
  f5233eea
- dc · 90fb8b78
  Tobin authored Sep 17, 2019
  
  90fb8b78
03 Sep, 2019 4 commits
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · b6cdcf98
  Tobin authored Sep 03, 2019
  
  b6cdcf98
- dc · eb15bc09
  Tobin authored Sep 03, 2019
  
  eb15bc09
- Merge branch 'jansa' into 'master' · f899048d
  Tobin authored Sep 03, 2019
```
Jansa

See merge request !94
```
  f899048d
- customer Id · b8b13356
  Jansa Jose authored Sep 03, 2019
  
  b8b13356
02 Sep, 2019 3 commits
- phone number changes · 365cebd2
  Jansa Jose authored Sep 02, 2019
  
  365cebd2
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 4bbcc9ec
  Jansa Jose authored Sep 02, 2019
  
  4bbcc9ec
- changes in sync contacts · 74484928
  Jansa Jose authored Sep 02, 2019
  
  74484928
29 Aug, 2019 1 commit
- Merge branch 'master' into 'dev_production' · 68f32620
  Tobin authored Aug 29, 2019
```
Master

See merge request !93
```
  68f32620