Commits · bea352da8c24da6550c533d154eae5513141f29c · TimeOut / TimeOutAdmin

20 Nov, 2019 8 commits
- Merge branch 'master' into 'dev_production' · bea352da
  Jansa Jose authored Nov 20, 2019
```
Master

See merge request !208
```
  bea352da
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 2a2e2a54
  Jansa Jose authored Nov 20, 2019
  
  2a2e2a54
- J : update fcm token · 9c142931
  Jansa Jose authored Nov 20, 2019
  
  9c142931
- Merge branch 'master' into 'dev_production' · 79f46531
  Jansa Jose authored Nov 20, 2019
```
Master

See merge request !207
```
  79f46531
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 588b5092
  Tobin authored Nov 20, 2019
  
  588b5092
- dc · 85dd8131
  Tobin authored Nov 20, 2019
  
  85dd8131
- Merge branch 'master' into 'dev_production' · 0077915d
  Jansa Jose authored Nov 20, 2019
```
Master

See merge request !206
```
  0077915d
- J: push notification in webservice and api model · 5eb52171
  Jansa Jose authored Nov 20, 2019
  
  5eb52171
19 Nov, 2019 16 commits
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 6b1d8573
  Tobin authored Nov 19, 2019
  
  6b1d8573
- J: Push notification · 10549935
  Jansa Jose authored Nov 19, 2019
  
  10549935
- Merge branch 'master' into 'dev_production' · eee596b7
  Jansa Jose authored Nov 19, 2019
```
J: push notification

See merge request !205
```
  eee596b7
- J: push notification · 657ea2d1
  Jansa Jose authored Nov 19, 2019
  
  657ea2d1
- t : profile edit · 1a71ff72
  Tobin authored Nov 19, 2019
  
  1a71ff72
- t : saved card changes · 67709031
  Tobin authored Nov 19, 2019
  
  67709031
- t : checker booking list bug fix · d7ad2cda
  Tobin authored Nov 19, 2019
  
  d7ad2cda
- Merge branch 'master' into 'dev_production' · 6f476794
  Jansa Jose authored Nov 19, 2019
```
J: get booking details error fix

See merge request !204
```
  6f476794
- J: get booking details error fix · 5ad225e0
  Jansa Jose authored Nov 19, 2019
  
  5ad225e0
- Merge branch 'master' into 'dev_production' · efcf38de
  Jansa Jose authored Nov 19, 2019
```
J: accept booking API in organizer app

See merge request !203
```
  efcf38de
- J: accept booking API in organizer app · 1a3b5ab6
  Jansa Jose authored Nov 19, 2019
  
  1a3b5ab6
- Merge branch 'master' into 'dev_production' · 63dbffbd
  Jansa Jose authored Nov 19, 2019
```
j: bug fix in edit event details

See merge request !202
```
  63dbffbd
- j: bug fix in edit event details · 09db3cdb
  Jansa Jose authored Nov 19, 2019
  
  09db3cdb
- Merge branch 'master' into 'dev_production' · 8bc59552
  Jansa Jose authored Nov 19, 2019
```
Master

See merge request !201
```
  8bc59552
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · c391942d
  Jansa Jose authored Nov 19, 2019
  
  c391942d
- J: edit event layout issue · 5740da74
  Jansa Jose authored Nov 19, 2019
  
  5740da74
15 Nov, 2019 2 commits
- t : payment issues · 22bf80eb
  Tobin authored Nov 15, 2019
  
  22bf80eb
- t : api payment issue fix · c4d84bf6
  Tobin authored Nov 15, 2019
  
  c4d84bf6
14 Nov, 2019 14 commits
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 229ba32b
  Tobin authored Nov 14, 2019
  
  229ba32b
- t : Api payment changes · ee950788
  Jansa Jose authored Nov 14, 2019
  
  ee950788
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 1f179eea
  Jansa Jose authored Nov 14, 2019
  
  1f179eea
- J: change Password in organizer model · 57aadde1
  Jansa Jose authored Nov 14, 2019
  
  57aadde1
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · d4334952
  Tobin authored Nov 14, 2019
  
  d4334952
- t : label change in staff page · 3fd96f4c
  Tobin authored Nov 14, 2019
  
  3fd96f4c
- J: change pwd in organizer model and get near by users in webservice model · 13f33b82
  Jansa Jose authored Nov 14, 2019
  
  13f33b82
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 10243b56
  Jansa Jose authored Nov 14, 2019
```
# Conflicts:
#	application/models/Validation_app_model.php
```
  10243b56
- J:validation model · 7bd0190b
  Jansa Jose authored Nov 14, 2019
  
  7bd0190b
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 3ee8e00a
  Tobin authored Nov 14, 2019
  
  3ee8e00a
- t : booking issue fixing · a6760102
  Tobin authored Nov 14, 2019
  
  a6760102
- J: validation app model changes · 3f512914
  Jansa Jose authored Nov 14, 2019
  
  3f512914
- J: update user location and flight apis · fedae876
  Jansa Jose authored Nov 14, 2019
  
  fedae876
- t : payment with add card · c5455fd6
  Tobin authored Nov 14, 2019
  
  c5455fd6