Commits · c11da6538adafe22df5553f1b98dcedd8d8ff316 · TimeOut / TimeOutAdmin

26 Sep, 2019 4 commits
- 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 5 commits
- Merge branch 'jansa' into 'master' · 0eb3a948
  Tobin authored Aug 29, 2019
```
Jansa

See merge request !92
```
  0eb3a948
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · e7982ae6
  Jansa Jose authored Aug 29, 2019
  
  e7982ae6
- chat · 64fdb3db
  Jansa Jose authored Aug 29, 2019
  
  64fdb3db
- Merge branch 'jansa' into 'master' · f4172166
  Tobin authored Aug 29, 2019
```
chat apis

See merge request !91
```
  f4172166
- chat apis · 863d77d9
  Jansa Jose authored Aug 29, 2019
  
  863d77d9
14 Aug, 2019 2 commits
- dc · 6fe9a1a7
  Tobin authored Aug 14, 2019
  
  6fe9a1a7
- dc · 6fc27e01
  Tobin authored Aug 14, 2019
  
  6fc27e01
02 Jul, 2019 1 commit
- dc · fbe56b6b
  Tobin authored Jul 02, 2019
  
  fbe56b6b
26 Jun, 2019 1 commit
- dc · 97c068de
  Tobin authored Jun 26, 2019
  
  97c068de
25 Jun, 2019 1 commit
- dc · 385821f8
  Tobin authored Jun 25, 2019
  
  385821f8
19 Jun, 2019 7 commits
- dc · 1ebd15c2
  Tobin authored Jun 19, 2019
  
  1ebd15c2
- dc sql change · 093deee8
  Tobin authored Jun 19, 2019
  
  093deee8
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 1a69c03c
  Tobin authored Jun 19, 2019
  
  1a69c03c
- dc · a6617d13
  Tobin authored Jun 19, 2019
  
  a6617d13
- Merge branch 'dev_production' into 'master' · db8b92e0
  Tobin authored Jun 19, 2019
```
# Conflicts:
#   sql/timeout_run_sql.sql
```
  db8b92e0
- dc · 5f1fda8b
  Tobin authored Jun 19, 2019
  
  5f1fda8b
- Update timeout_run_sql.sql · e511c0e3
  Tobin authored Jun 19, 2019
  
  e511c0e3