Commits · 3852e0aaa413b417ec357f864e19a1142fdeb03a · TimeOut / TimeOutAdmin

25 Oct, 2019 8 commits
- Merge branch 'master' into 'dev_production' · 3852e0aa
  Tobin authored Oct 25, 2019
```
Master

See merge request !135
```
  3852e0aa
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 7aae725e
  Tobin authored Oct 25, 2019
  
  7aae725e
- dc · cb59fe3a
  Tobin authored Oct 25, 2019
  
  cb59fe3a
- Merge branch 'master' into 'dev_production' · 219bb552
  Tobin authored Oct 25, 2019
```
Master

See merge request !134
```
  219bb552
- Update left-menu.php · 9133fc55
  Tobin authored Oct 25, 2019
  
  9133fc55
- dc · c6c2f069
  Tobin authored Oct 25, 2019
  
  c6c2f069
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 739e9062
  Tobin authored Oct 25, 2019
```
# Conflicts:
#	application/controllers/Api.php
#	application/models/Api_model.php
```
  739e9062
- dc · 1750c8ca
  Tobin authored Oct 25, 2019
  
  1750c8ca
24 Oct, 2019 12 commits
- Merge branch 'master' into 'dev_production' · 6bac8003
  Tobin authored Oct 24, 2019
```
Master

See merge request !133
```
  6bac8003
- Merge branch 'jansa' into 'master' · 35e64468
  Tobin authored Oct 24, 2019
```
Jansa

See merge request !132
```
  35e64468
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 4afa3c8b
  Jansa Jose authored Oct 24, 2019
  
  4afa3c8b
- eventdetails · 85fb92a4
  Jansa Jose authored Oct 24, 2019
  
  85fb92a4
- Merge branch 'master' into 'dev_production' · 7b38ebcb
  Tobin authored Oct 24, 2019
```
Master

See merge request !131
```
  7b38ebcb
- Merge branch 'jansa' into 'master' · de777aba
  Tobin authored Oct 24, 2019
```
Jansa

See merge request !129
```
  de777aba
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · ed0cbadd
  Jansa Jose authored Oct 24, 2019
  
  ed0cbadd
- getEvent and venuedetails · 1ffcb4d7
  Jansa Jose authored Oct 24, 2019
  
  1ffcb4d7
- Merge branch 'master' into 'dev_production' · a22953df
  Tobin authored Oct 24, 2019
```
Master

See merge request !130
```
  a22953df
- Merge branch 'jansa' into 'master' · b3b601b6
  Tobin authored Oct 24, 2019
```
Jansa

See merge request !128
```
  b3b601b6
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 88ed6cf0
  Jansa Jose authored Oct 24, 2019
  
  88ed6cf0
- deactive api · 1358a029
  Jansa Jose authored Oct 24, 2019
  
  1358a029
23 Oct, 2019 8 commits
- Merge branch 'master' into 'dev_production' · 48ea3159
  Tobin authored Oct 23, 2019
```
Master

See merge request !127
```
  48ea3159
- Merge branch 'jansa' into 'master' · 6996ca23
  Tobin authored Oct 23, 2019
```
Jansa

See merge request !126
```
  6996ca23
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 531ea270
  Jansa Jose authored Oct 23, 2019
  
  531ea270
- add event · 364d2108
  Jansa Jose authored Oct 23, 2019
  
  364d2108
- Merge branch 'master' into 'dev_production' · b4ef0c1d
  Tobin authored Oct 23, 2019
```
Master

See merge request !125
```
  b4ef0c1d
- Merge branch 'jansa' into 'master' · 6a8bd742
  Tobin authored Oct 23, 2019
```
Jansa

See merge request !124
```
  6a8bd742
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · d9adc9ce
  Jansa Jose authored Oct 23, 2019
  
  d9adc9ce
- addevent on add and language api changes · 84d2938a
  Jansa Jose authored Oct 23, 2019
  
  84d2938a
22 Oct, 2019 12 commits
- Merge branch 'master' into 'dev_production' · fd706ac7
  Tobin authored Oct 22, 2019
```
Master

See merge request !123
```
  fd706ac7
- Merge branch 'jansa' into 'master' · 53492239
  Tobin authored Oct 22, 2019
```
Jansa

See merge request !122
```
  53492239
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 32f9b1a6
  Jansa Jose authored Oct 22, 2019
  
  32f9b1a6
- bookinglist · a7fed54e
  Jansa Jose authored Oct 22, 2019
  
  a7fed54e
- Merge branch 'master' into 'dev_production' · 5281ec56
  Tobin authored Oct 22, 2019
```
Master

See merge request !121
```
  5281ec56
- Merge branch 'jansa' into 'master' · f74d8dc6
  Tobin authored Oct 22, 2019
```
Jansa

See merge request !120
```
  f74d8dc6
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 4023f926
  Jansa Jose authored Oct 22, 2019
  
  4023f926
- event id and signin api changes · 1e1224d1
  Jansa Jose authored Oct 22, 2019
  
  1e1224d1
- Merge branch 'master' into 'dev_production' · eb4d5857
  Tobin authored Oct 22, 2019
```
Master

See merge request !119
```
  eb4d5857
- Merge branch 'jansa' into 'master' · f56c5162
  Tobin authored Oct 22, 2019
```
Jansa

See merge request !118
```
  f56c5162
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · b320aa27
  Jansa Jose authored Oct 22, 2019
  
  b320aa27
- organizer api · 403ced80
  Jansa Jose authored Oct 22, 2019
  
  403ced80