Commits · 3ee8e00acf352e265ec9c410df0b51f1ae4256ee · TimeOut / TimeOutAdmin

14 Nov, 2019 5 commits
- 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
- 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 20 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
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · ce2bbd5c
  Tobin authored Nov 12, 2019
  
  ce2bbd5c
- missing files changes · 9ac53d8a
  Tobin authored Nov 12, 2019
  
  9ac53d8a
- Merge branch 'jansa' into 'master' · 837bdfe0
  Tobin authored Nov 12, 2019
```
Jansa

See merge request !198
```
  837bdfe0
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 81d1e48f
  Jansa Jose authored Nov 12, 2019
  
  81d1e48f
- add country code in getLanguage · 5c5c8508
  Jansa Jose authored Nov 12, 2019
  
  5c5c8508
- Merge branch 'dev_production' into 'master' · 81f2ba66
  Tobin authored Nov 12, 2019
```
# Conflicts:
#   application/config/database.php
```
  81f2ba66
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 951586c1
  Tobin authored Nov 12, 2019
  
  951586c1
- dc · 391ba383
  Tobin authored Nov 12, 2019
  
  391ba383
- Merge branch 'jansa' into 'master' · fa656788
  Tobin authored Nov 12, 2019
```
Jansa

See merge request !196
```
  fa656788
- dc · 995bd4f7
  Jansa Jose authored Nov 12, 2019
  
  995bd4f7
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 4760d1b6
  Jansa Jose authored Nov 12, 2019
  
  4760d1b6