Commits · 36e3ed1d20c06c66fae3efa2975bdab3dda556b0 · TimeOut / TimeOutAdmin

28 Oct, 2019 5 commits
- Update database.php · 36e3ed1d
  Tobin authored Oct 28, 2019
  
  36e3ed1d
- Add new file · e0c2fef8
  Tobin authored Oct 28, 2019
  
  e0c2fef8
- Add new directory · 655a17e9
  Tobin authored Oct 28, 2019
  
  655a17e9
- Delete timeout_run_sql.sql · adcd64ba
  Tobin authored Oct 28, 2019
  
  adcd64ba
- Delete timeOutBackup.sql · d6a91172
  Tobin authored Oct 28, 2019
  
  d6a91172
25 Oct, 2019 16 commits
- Merge branch 'master' into 'dev_production' · 08d5cc49
  Tobin authored Oct 25, 2019
```
Master

See merge request !139
```
  08d5cc49
- Merge branch 'jansa' into 'master' · e2a1085a
  Tobin authored Oct 25, 2019
```
Jansa

See merge request !138
```
  e2a1085a
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 39bb4d96
  Jansa Jose authored Oct 25, 2019
  
  39bb4d96
- geteventDetails · cab053ff
  Jansa Jose authored Oct 25, 2019
  
  cab053ff
- Merge branch 'master' into 'dev_production' · bf93a835
  Tobin authored Oct 25, 2019
```
Master

See merge request !137
```
  bf93a835
- Merge branch 'jansa' into 'master' · afd14530
  Tobin authored Oct 25, 2019
```
Jansa

See merge request !136
```
  afd14530
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 8f3541db
  Jansa Jose authored Oct 25, 2019
  
  8f3541db
- getEventDetails api · fdf69b24
  Jansa Jose authored Oct 25, 2019
  
  fdf69b24
- 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 7 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