Commits · 229ba32b15a1a014749e28e8bf6ea07c8c3effea · TimeOut / TimeOutAdmin · GitLab

14 Nov, 2019 16 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
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · e52b719e
  Jansa Jose authored Nov 14, 2019
  
  e52b719e
- J: flight trawex api · 446bd9b9
  Jansa Jose authored Nov 14, 2019
  
  446bd9b9
13 Nov, 2019 15 commits
- t : category api issue · 7646b619
  Tobin authored Nov 13, 2019
  
  7646b619
- t : payment gateway issue fix (Saved Card) · b20e8213
  Tobin authored Nov 13, 2019
  
  b20e8213
- t : currency symbol in booking summary · 9eb9da97
  Tobin authored Nov 13, 2019
  
  9eb9da97
- t : token spelling mistake · 72e3a332
  Tobin authored Nov 13, 2019
  
  72e3a332
- t : status for booking summary api · b7dc2014
  Tobin authored Nov 13, 2019
  
  b7dc2014
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 621b272c
  Jansa Jose authored Nov 13, 2019
  
  621b272c
- t : payment changes · f60c20b3
  Tobin authored Nov 13, 2019
  
  f60c20b3
- J: event list Details error · cd86dbba
  Jansa Jose authored Nov 13, 2019
  
  cd86dbba
- J: Organizer model checker list api · 8005f3c8
  Jansa Jose authored Nov 13, 2019
  
  8005f3c8
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 39a6cb63
  Tobin authored Nov 13, 2019
```
# Conflicts:
#	application/models/Organizer_model.php
```
  39a6cb63
- t: crone tab changes for pending approval events · a6b23afb
  Tobin authored Nov 13, 2019
  
  a6b23afb
- J: flight trawex api and organiser,event buking list changes · b8d4112f
  Jansa Jose authored Nov 13, 2019
  
  b8d4112f
- t: checker checking and booking list issue · 4e2bad43
  Tobin authored Nov 13, 2019
  
  4e2bad43
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · ba8c6548
  Jansa Jose authored Nov 13, 2019
  
  ba8c6548
- J: checker Organiser SignIn changes · 7b6c9744
  Jansa Jose authored Nov 13, 2019
  
  7b6c9744
12 Nov, 2019 9 commits
- t : checker api migration from api to orag · 113f1a0f
  Tobin authored Nov 12, 2019
  
  113f1a0f
- t : organizer login issue fix (status) · b6a5d60e
  Tobin authored Nov 12, 2019
  
  b6a5d60e
- t : organizer user name and email comfit issues · eacdb596
  Tobin authored Nov 12, 2019
  
  eacdb596
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 11a6cadb
  Jansa Jose authored Nov 12, 2019
  
  11a6cadb
- j: checker api name issue · 1b9bf912
  Jansa Jose authored Nov 12, 2019
  
  1b9bf912
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 0660eedd
  Tobin authored Nov 12, 2019
  
  0660eedd
- T: Checker bug fixing · 34bf48e9
  Tobin authored Nov 12, 2019
  
  34bf48e9
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · b15e42a7
  Jansa Jose authored Nov 12, 2019
  
  b15e42a7
- J: checker login issue · a80a746c
  Jansa Jose authored Nov 12, 2019
  
  a80a746c