Commits · master · Learning and Work / managing-money-api

28 Aug, 2018 1 commit
- Merge branch 'dev' into 'master' · c3546d9f
  Jack Stupple authored Aug 28, 2018
```
Fix user patch

See merge request !4
```
  c3546d9f
23 Aug, 2018 6 commits
- whoops · 2d2b1b4a
  Jack Stupple authored Aug 23, 2018
  
  2d2b1b4a
- Merge branch 'dev' into 'master' · b04bf090
  Jack Stupple authored Aug 23, 2018
```
Go live! 🎉

See merge request !3
```
  b04bf090
- import resource categories and resources · 0b57f9b0
  Jack Stupple authored Aug 23, 2018
  
  0b57f9b0
- ensure resource categories are accurate · daee56fd
  Jack Stupple authored Aug 23, 2018
  
  daee56fd
- add length to email to allow for unique index · 2137ba63
  Jack Stupple authored Aug 23, 2018
  
  2137ba63
- admin area for resources · 57296b80
  Jack Stupple authored Aug 23, 2018
  
  57296b80
20 Aug, 2018 10 commits
- tweak jakes copy · fb0f02a7
  Jack Stupple authored Aug 20, 2018
  
  fb0f02a7
- update resources import · 6856f7cd
  Jack Stupple authored Aug 20, 2018
  
  6856f7cd
- whoops · 8a435e3d
  Jack Stupple authored Aug 20, 2018
  
  8a435e3d
- If the language change causes a currency change then start again - otherwise... · 3d71cb9c
  Jack Stupple authored Aug 20, 2018
```
If the language change causes a currency change then start again - otherwise you will start at like 16k p/m salary in GBP
```
  3d71cb9c
- select language first - otherwise eur is selected for some reason · 9e9d8766
  Jack Stupple authored Aug 20, 2018
  
  9e9d8766
- match the correct currency for base modifiers · 192d1d1b
  Jack Stupple authored Aug 20, 2018
  
  192d1d1b
- language doesn't aways exist · 07192616
  Jack Stupple authored Aug 20, 2018
  
  07192616
- remove currency from player where possible · 44e8e6ae
  Jack Stupple authored Aug 20, 2018
  
  44e8e6ae
- typo in the question · 546e0369
  Jack Stupple authored Aug 20, 2018
  
  546e0369
- make currency source from language · b951f44f
  Jack Stupple authored Aug 20, 2018
  
  b951f44f
10 Aug, 2018 2 commits
- correct missing ctegories · 9a0a2fcc
  Jack Stupple authored Aug 10, 2018
  
  9a0a2fcc
- add all translations · 91555259
  Jack Stupple authored Aug 10, 2018
  
  91555259
06 Aug, 2018 2 commits
- Merge branch 'dev' of gitlab.modern-english.co.uk:lnw/managing-money-api into dev · 6e1f23ee
  Jack Stupple authored Aug 06, 2018
  
  6e1f23ee
- jamal translations · b7e17c1a
  Jack Stupple authored Aug 06, 2018
  
  b7e17c1a
13 Jul, 2018 12 commits
- Merge branch 'dev' into 'master' · 0bf8f98e
  Jack Stupple authored Jul 13, 2018
```
v1.0.1

See merge request !2
```
  0bf8f98e
- v1.0.1 · b5265005
  Jack Stupple authored Jul 13, 2018
  
  b5265005
- Merge branch 'master' into 'dev' · 84173a8b
  Jack Stupple authored Jul 13, 2018
```
# Conflicts:
#   bootstrap/app.php
```
  84173a8b
- remove api namespace · 3dcf4f4e
  Jack Stupple authored Jul 13, 2018
  
  3dcf4f4e
- Merge branch 'dev' into 'master' · ba68e65c
  Jack Stupple authored Jul 13, 2018
```
v1.0.0

See merge request !1
```
  ba68e65c
- v1.0.0 · 8b9f4b4e
  Jack Stupple authored Jul 13, 2018
  
  8b9f4b4e
- show ann and jamal but dont progress · dbac367f
  Jack Stupple authored Jul 13, 2018
  
  dbac367f
- no and de shouldnt be enabled · 7b691eda
  Jack Stupple authored Jul 13, 2018
  
  7b691eda
- additional logging · 502b2b9f
  Jack Stupple authored Jul 13, 2018
  
  502b2b9f
- case insentive modifier categories · 06da89fd
  Jack Stupple authored Jul 13, 2018
  
  06da89fd
- disable currencies unsupported at the moment and only emily and jake · a3046ab6
  Jack Stupple authored Jul 13, 2018
  
  a3046ab6
- jake and emily · a48b3ef5
  Jack Stupple authored Jul 13, 2018
  
  a48b3ef5
09 Jul, 2018 5 commits
- do not allow missing modifier categories · 5bf2162d
  Jack Stupple authored Jul 09, 2018
  
  5bf2162d
- changes to languages · eb53246a
  Jack Stupple authored Jul 09, 2018
  
  eb53246a
- match income outgoing with correct labels · c1820924
  Jack Stupple authored Jul 09, 2018
  
  c1820924
- consistent labelling · e5b33018
  Jack Stupple authored Jul 09, 2018
  
  e5b33018
- massive update to imports to allow for multple currencies · 34d0e013
  Jack Stupple authored Jul 09, 2018
  
  34d0e013
27 Jun, 2018 2 commits
- tweak to the logic (sorry, wrking on stage) · 2c09c5a6
  Jack Stupple authored Jun 27, 2018
  
  2c09c5a6
- allow update of currency_id · 4abce408
  Jack Stupple authored Jun 27, 2018
  
  4abce408