Commits · c04bc9623ab93a5328481b58496dc3e4e810000c · TimeOut / TimeOutAdmin

09 May, 2019 8 commits
- web api category image change · c04bc962
  Jansa Jose authored May 09, 2019
  
  c04bc962
- arabic translation · 25b97e4b
  Jansa Jose authored May 09, 2019
  
  25b97e4b
- web api changes · 24784ddf
  Jansa Jose authored May 09, 2019
  
  24784ddf
- Merge branch 'jansa' of https://gitlab.techware.co.in/timeout/timeOut into tobin · dac51e58
  Tobin authored May 09, 2019
  
  dac51e58
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 189c0e8d
  Tobin authored May 09, 2019
  
  189c0e8d
- dc · ad0a97c3
  Tobin authored May 09, 2019
  
  ad0a97c3
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 64016f7a
  Jansa Jose authored May 09, 2019
  
  64016f7a
- category arabic icon · cf617154
  Jansa Jose authored May 09, 2019
  
  cf617154
08 May, 2019 9 commits
- Merge branch 'jansa' into 'master' · 465b7d9d
  Tobin authored May 08, 2019
```
Jansa

See merge request !45
```
  465b7d9d
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · ad03ecd3
  Jansa Jose authored May 08, 2019
  
  ad03ecd3
- booking and event api · a52f59bc
  Jansa Jose authored May 08, 2019
  
  a52f59bc
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 4f9a1319
  Tobin authored May 08, 2019
  
  4f9a1319
- dc · ea211a88
  Tobin authored May 08, 2019
  
  ea211a88
- Merge branch 'jansa' into 'master' · 5135c1d9
  Tobin authored May 08, 2019
```
Jansa

See merge request !42
```
  5135c1d9
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 9e81086b
  Jansa Jose authored May 08, 2019
  
  9e81086b
- status issues fixing · e7430cac
  Jansa Jose authored May 08, 2019
  
  e7430cac
- dc · 452a540d
  Tobin authored May 08, 2019
  
  452a540d
07 May, 2019 5 commits
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 4aaf92aa
  Tobin authored May 07, 2019
  
  4aaf92aa
- dc · 7f1256e9
  Tobin authored May 07, 2019
  
  7f1256e9
- Merge branch 'jansa' into 'master' · 00848737
  Tobin authored May 07, 2019
```
Jansa

See merge request !40
```
  00848737
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · fcf74925
  Jansa Jose authored May 07, 2019
```
# Conflicts:
#	application/models/Webservice_model.php
```
  fcf74925
- crone job · 142ad8d2
  Jansa Jose authored May 07, 2019
  
  142ad8d2
06 May, 2019 2 commits
- dc · cf4b3c77
  Tobin authored May 06, 2019
  
  cf4b3c77
- dc · f9008b14
  Tobin authored May 06, 2019
  
  f9008b14
03 May, 2019 1 commit
- dc · 90058168
  Tobin authored May 03, 2019
  
  90058168
02 May, 2019 1 commit
- dc · 1a377254
  Tobin authored May 02, 2019
  
  1a377254
30 Apr, 2019 2 commits
- dc · 0a6e2ead
  Tobin authored Apr 30, 2019
  
  0a6e2ead
- dc · 5a0ef2d5
  Tobin authored Apr 30, 2019
  
  5a0ef2d5
29 Apr, 2019 4 commits
- dc · fadf0e11
  Tobin authored Apr 29, 2019
  
  fadf0e11
- dc · d1a9fd49
  Tobin authored Apr 29, 2019
  
  d1a9fd49
- dc · 913cb26b
  Tobin authored Apr 29, 2019
  
  913cb26b
- dc · 73bb6b29
  Tobin authored Apr 29, 2019
  
  73bb6b29
24 Apr, 2019 1 commit
- dc · 6ead949a
  Tobin authored Apr 24, 2019
  
  6ead949a
22 Apr, 2019 1 commit
- DC · 5fb74265
  Tobin authored Apr 22, 2019
  
  5fb74265
16 Apr, 2019 1 commit
- dc · b0a45db3
  Tobin authored Apr 16, 2019
  
  b0a45db3
12 Apr, 2019 1 commit
- dc · c4787b65
  Tobin authored Apr 12, 2019
  
  c4787b65
10 Apr, 2019 2 commits
- dc · 64817b13
  Tobin authored Apr 10, 2019
  
  64817b13
- dc · 78f2ab76
  Tobin authored Apr 10, 2019
  
  78f2ab76
09 Apr, 2019 1 commit
- dc · 40f8354a
  Tobin authored Apr 09, 2019
  
  40f8354a
08 Apr, 2019 1 commit
- dc · c82f55e5
  Tobin authored Apr 08, 2019
  
  c82f55e5