Commits · 5be3d254a6c50c5192c41283774c0124c44ed0bd · TimeOut / TimeOutAdmin

28 Oct, 2019 1 commit
- dc · 5be3d254
  Tobin authored Oct 28, 2019
  
  5be3d254
25 Oct, 2019 6 commits
- 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
- 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 9 commits
- 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 '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 '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 6 commits
- 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 '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 9 commits
- 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 '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 '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
18 Oct, 2019 6 commits
- Merge branch 'jansa' into 'master' · 286b4480
  Tobin authored Oct 18, 2019
```
Jansa

See merge request !116
```
  286b4480
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 1974180b
  Jansa Jose authored Oct 18, 2019
  
  1974180b
- session change · c9f46eff
  Jansa Jose authored Oct 18, 2019
  
  c9f46eff
- Merge branch 'jansa' into 'master' · 961917cf
  Tobin authored Oct 18, 2019
```
Jansa

See merge request !114
```
  961917cf
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 210ea914
  Jansa Jose authored Oct 18, 2019
  
  210ea914
- changes in oraganizer model · 4c86ee17
  Jansa Jose authored Oct 18, 2019
  
  4c86ee17
17 Oct, 2019 3 commits
- Merge branch 'jansa' into 'master' · 075df7e5
  Tobin authored Oct 17, 2019
```
Jansa

See merge request !112
```
  075df7e5
- changes · 9424e792
  Jansa Jose authored Oct 17, 2019
  
  9424e792
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 3d029ae4
  Jansa Jose authored Oct 17, 2019
  
  3d029ae4