Commits · 6892ae7f26ac1b4445eb51437a46a906f8136da6 · TimeOut / TimeOutAdmin

31 Oct, 2019 8 commits
- dc · 6892ae7f
  Tobin authored Oct 31, 2019
  
  6892ae7f
- dc · 6e77756c
  Tobin authored Oct 31, 2019
  
  6e77756c
- dc · 2a3e1ff2
  Tobin authored Oct 31, 2019
  
  2a3e1ff2
- dc · 05175fc2
  Tobin authored Oct 31, 2019
  
  05175fc2
- dc · f3c917b4
  Tobin authored Oct 31, 2019
  
  f3c917b4
- dc · 390065a0
  Tobin authored Oct 31, 2019
  
  390065a0
- dc · dbd651f6
  Tobin authored Oct 31, 2019
  
  dbd651f6
- dc · 2155f3a3
  Tobin authored Oct 31, 2019
  
  2155f3a3
30 Oct, 2019 3 commits
- dc · f1628688
  Tobin authored Oct 30, 2019
  
  f1628688
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · edfb145e
  Tobin authored Oct 30, 2019
  
  edfb145e
- dc · 8152bae9
  Tobin authored Oct 30, 2019
  
  8152bae9
28 Oct, 2019 8 commits
- Merge branch 'jansa' into 'master' · 8bafb0d0
  Tobin authored Oct 28, 2019
```
Jansa

See merge request !145
```
  8bafb0d0
- dc · b050e20a
  Tobin authored Oct 28, 2019
  
  b050e20a
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 734aac41
  Jansa Jose authored Oct 28, 2019
  
  734aac41
- edit organization details · 498899be
  Jansa Jose authored Oct 28, 2019
  
  498899be
- dc · dfd8333e
  Tobin authored Oct 28, 2019
  
  dfd8333e
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 4f9cf5da
  Tobin authored Oct 28, 2019
  
  4f9cf5da
- dc · 5be3d254
  Tobin authored Oct 28, 2019
  
  5be3d254
- Merge branch 'uat_staging' into 'master' · 8ee352ca
  Tobin authored Oct 28, 2019
```
Uat staging

See merge request !140
```
  8ee352ca
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 5 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