Commits · 0869a7edb91e5a44fd1a650d184b64e24173039d · TimeOut / TimeOutAdmin

11 Nov, 2019 8 commits
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 0869a7ed
  Tobin authored Nov 11, 2019
```
# Conflicts:
#	application/controllers/Webservice.php
#	application/models/Webservice_model.php
```
  0869a7ed
- dc · 48b12131
  Tobin authored Nov 11, 2019
  
  48b12131
- Merge branch 'jansa' into 'master' · c275c17a
  Tobin authored Nov 11, 2019
```
Jansa

See merge request !194
```
  c275c17a
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · b7ba5d94
  Jansa Jose authored Nov 11, 2019
  
  b7ba5d94
- country list · 7014330e
  Jansa Jose authored Nov 11, 2019
  
  7014330e
- Merge branch 'jansa' into 'master' · 8b4166a6
  Tobin authored Nov 11, 2019
```
Jansa

See merge request !192
```
  8b4166a6
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · a18c05b9
  Jansa Jose authored Nov 11, 2019
  
  a18c05b9
- get checkers list · 845bfe13
  Jansa Jose authored Nov 11, 2019
  
  845bfe13
08 Nov, 2019 13 commits
- Merge branch 'jansa' into 'master' · b1f55d7f
  Tobin authored Nov 08, 2019
```
Jansa

See merge request !190
```
  b1f55d7f
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 1d8a8c7a
  Jansa Jose authored Nov 08, 2019
  
  1d8a8c7a
- booking details · 6e243f61
  Jansa Jose authored Nov 08, 2019
  
  6e243f61
- Merge branch 'jansa' into 'master' · d14c33a3
  Tobin authored Nov 08, 2019
```
Jansa

See merge request !188
```
  d14c33a3
- getEventDetails · 50d97223
  Jansa Jose authored Nov 08, 2019
  
  50d97223
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 45226fa0
  Jansa Jose authored Nov 08, 2019
  
  45226fa0
- qrcode · 0ce395a4
  Jansa Jose authored Nov 08, 2019
  
  0ce395a4
- Merge branch 'jansa' into 'master' · 37d0f7a4
  Tobin authored Nov 08, 2019
```
Jansa

See merge request !186
```
  37d0f7a4
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · f0b86ac4
  Jansa Jose authored Nov 08, 2019
  
  f0b86ac4
- json_decode changes · 683f22a5
  Jansa Jose authored Nov 08, 2019
  
  683f22a5
- Merge branch 'jansa' into 'master' · 4242636a
  Tobin authored Nov 08, 2019
```
Jansa

See merge request !184
```
  4242636a
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 3828aee3
  Jansa Jose authored Nov 08, 2019
  
  3828aee3
- trawex and organizer api changes · d24d374b
  Jansa Jose authored Nov 08, 2019
  
  d24d374b
07 Nov, 2019 9 commits
- Merge branch 'jansa' into 'master' · 923e8a10
  Tobin authored Nov 07, 2019
```
Jansa

See merge request !182
```
  923e8a10
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 35507b83
  Jansa Jose authored Nov 07, 2019
  
  35507b83
- changes in trawex api · 3ad01cbd
  Jansa Jose authored Nov 07, 2019
  
  3ad01cbd
- Merge branch 'jansa' into 'master' · 28d068ff
  Tobin authored Nov 07, 2019
```
Jansa

See merge request !180
```
  28d068ff
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · b7b1da51
  Jansa Jose authored Nov 07, 2019
  
  b7b1da51
- cancel booking in trawex api · 2a264111
  Jansa Jose authored Nov 07, 2019
  
  2a264111
- Merge branch 'jansa' into 'master' · 8ded8df6
  Tobin authored Nov 07, 2019
```
Jansa

See merge request !178
```
  8ded8df6
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 6f7e5ea8
  Jansa Jose authored Nov 07, 2019
  
  6f7e5ea8
- webservc · e8ce27e5
  Jansa Jose authored Nov 07, 2019
  
  e8ce27e5
06 Nov, 2019 10 commits
- Merge branch 'jansa' into 'master' · 005970c7
  Tobin authored Nov 06, 2019
```
Jansa

See merge request !176
```
  005970c7
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 1adf934c
  Jansa Jose authored Nov 06, 2019
  
  1adf934c
- eventdetails change · bb126035
  Jansa Jose authored Nov 06, 2019
  
  bb126035
- Merge branch 'jansa' into 'master' · 88c7c327
  Tobin authored Nov 06, 2019
```
Jansa

See merge request !174
```
  88c7c327
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · f359bcc4
  Jansa Jose authored Nov 06, 2019
  
  f359bcc4
- event details · c1f1c235
  Jansa Jose authored Nov 06, 2019
  
  c1f1c235
- Merge branch 'jansa' into 'master' · 4f2472d1
  Tobin authored Nov 06, 2019
```
Jansa

See merge request !172
```
  4f2472d1
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · a0d26d80
  Jansa Jose authored Nov 06, 2019
  
  a0d26d80
- changes in editevent and getevent · d8d84992
  Jansa Jose authored Nov 06, 2019
  
  d8d84992
- Merge branch 'jansa' into 'master' · 81f8fd20
  Tobin authored Nov 06, 2019
```
Jansa

See merge request !170
```
  81f8fd20