Commits · 3aeace48c03d8ef37783b0f37c93ff808c0171e2 · Antti Väyrynen / Moya

08 Nov, 2014 2 commits

Merge branch 'feature/userlog-and-testfix' into 'master' · 3aeace48

userlog, testfix and breakglass cleanup

- Add user information to SLF4J MDC logging context, so user information can be attached to log rows. MDC is ignored if the logging implementation does not support MDC.
- Fix the code that caused JSON related test to fail. Also add another test to be sure.
- Clean up after jvm-breakglass introspection tool

There also seems to be an eclipse file in the repository and the file changed. Might not be relevant.

See merge request !127

committed Nov 08, 2014

3aeace48 Browse Files

Merge branch 'billExceptionFix' into 'master' · d2ba7174
```
Bill exception fix

blob

See merge request !126
```
Tuomas Riihimäki committed Nov 08, 2014
d2ba7174 Browse Files

07 Nov, 2014 5 commits
- also fix the code that failed the test before · 67bd2ad5
  Juho Juopperi committed Nov 07, 2014
  
  67bd2ad5 Browse Files
- logging stuff · c3a40db9
  Juho Juopperi committed Nov 07, 2014
  
  c3a40db9 Browse Files
- better? · 8549e634
  Tuukka Kivilahti committed Nov 07, 2014
  
  8549e634
- Merge branch 'maven_pomfix' into 'master' · 59df6736
```
Maven pomfix

Pomfix so we can compile this with maven and still use it with glassfish

See merge request !125
```
  Tuomas Riihimäki committed Nov 07, 2014
  59df6736 Browse Files
- Merge branch 'insomnia_2014' into 'master' · e1d9738e
```
Insomnia 2014

Insomnian muutokset tuotantoon

See merge request !124
```
  Tuomas Riihimäki committed Nov 07, 2014
  e1d9738e Browse Files
29 Oct, 2014 4 commits
- toi oli täällä, palautetaan se · 185d0d62
  Tuukka Kivilahti committed Oct 29, 2014
  
  185d0d62
- maven korjailuija, vähän siirtoa yms. · 9b0f6492
  Tuukka Kivilahti committed Oct 29, 2014
  
  9b0f6492 Browse Files
- Merge remote-tracking branch 'origin/insomnia_2014' · 36553704
  Tuukka Kivilahti committed Oct 29, 2014
  
  36553704 Browse Files
- pompompom · fa043ff8
  Tuukka Kivilahti committed Oct 29, 2014
  
  fa043ff8 Browse Files
25 Oct, 2014 25 commits
- logging mdc · 85063dd5
  Juho Juopperi committed Oct 25, 2014
  
  85063dd5 Browse Files
- Merge branch 'insomnia_2014' of gitlab.codecrew.fi:codecrew/moya into insomnia_2014 · c82cc14c
  Juho Juopperi committed Oct 25, 2014
  
  c82cc14c Browse Files
- repl servlet · cc5a533b
  Juho Juopperi committed Oct 25, 2014
  
  cc5a533b Browse Files
- timezonefix · bff63de0
  Tuukka Kivilahti committed Oct 25, 2014
  
  bff63de0 Browse Files
- Merge branch 'insomnia_2014' of codecrew.fi:codecrew/moya into insomnia_2014 · f7540040
  Tuukka Kivilahti committed Oct 25, 2014
  
  f7540040 Browse Files
- stuff · b68a5c2d
  Tuukka Kivilahti committed Oct 25, 2014
  
  b68a5c2d
- Merge branch 'insomnia_2014' of gitlab.codecrew.fi:codecrew/moya into ins16 · d8aa668e
  Tuomas Riihimäki committed Oct 25, 2014
  
  d8aa668e Browse Files
- Sanitize username · 3900e062
```
Do not login with anonymous when username has a trailing space.
```
  Tuomas Riihimäki committed Oct 25, 2014
  3900e062 Browse Files
- repl · 1ee59d69
  Juho Juopperi committed Oct 25, 2014
  
  1ee59d69 Browse Files
- Merge branch 'insomnia_2014' of codecrew.fi:codecrew/moya into insomnia_2014 · e788d87d
  Tuukka Kivilahti committed Oct 25, 2014
  
  e788d87d Browse Files
- näitä tarvitaan · 9e9ed67b
  Tuukka Kivilahti committed Oct 25, 2014
  
  9e9ed67b
- logging stuff · e9d4b28b
  Juho Juopperi committed Oct 25, 2014
  
  e9d4b28b
- ruokatilauksien maksu crediiteillä ja laskutauhkaa · f0988ecb
  Tuukka Kivilahti committed Oct 25, 2014
  
  f0988ecb Browse Files
- Merge branch 'insomnia_2014' of codecrew.fi:codecrew/moya into insomnia_2014 · a44542ec
  Tuukka Kivilahti committed Oct 25, 2014
  
  a44542ec Browse Files
- ruokatilauksen maksuasiaa · abad39a1
  Tuukka Kivilahti committed Oct 25, 2014
  
  abad39a1 Browse Files
- Merge branch 'insomnia_2014' of gitlab.codecrew.fi:codecrew/moya into insomnia_2014 · 9f445e93
  Juho Juopperi committed Oct 25, 2014
  
  9f445e93 Browse Files
- have slf4j-api dependency, have logback-classic as provided and comment out status servlet · 72631c69
  Juho Juopperi committed Oct 25, 2014
  
  72631c69 Browse Files
- logback for glassfish - broken · b904dabf
  Juho Juopperi committed Oct 25, 2014
  
  b904dabf
- Merge branch 'insomnia_2014' of codecrew.fi:codecrew/moya into insomnia_2014 · e9da7339
  Tuukka Kivilahti committed Oct 25, 2014
  
  e9da7339 Browse Files
- and littlebit moar foodstuff · 7e1c24f2
  Tuukka Kivilahti committed Oct 25, 2014
  
  7e1c24f2 Browse Files
- ruokatilauskorjauksia pukkaa · 3dee93f4
  Tuukka Kivilahti committed Oct 25, 2014
  
  3dee93f4 Browse Files
- photo bug fix · 117cd4c8
  Tuukka Kivilahti committed Oct 25, 2014
  
  117cd4c8 Browse Files
- Check for null. Nullpointers can be safely avoided an they clutter the log · 1e666de8
  Tuomas Riihimäki committed Oct 25, 2014
  
  1e666de8
- Merge branch 'insomnia_2014' of gitlab.codecrew.fi:codecrew/moya into ins16 · d7548936
  Tuomas Riihimäki committed Oct 25, 2014
  
  d7548936 Browse Files
- Add primefaces-all-themes as dependency · d46efe97
  Tuomas Riihimäki committed Oct 25, 2014
  
  d46efe97 Browse Files
24 Oct, 2014 2 commits
- lots of stuff · 6ebe8612
  Tuukka Kivilahti committed Oct 24, 2014
  
  6ebe8612
- Merge branch 'tkfftk/multibarcode' into 'master' · ca930820
```
Tkfftk/multibarcode

Ekaa insomniasta

See merge request !123
```
  Tuomas Riihimäki committed Oct 24, 2014
  ca930820 Browse Files
23 Oct, 2014 2 commits
- asdf · c5bbd5e2
  Tuukka Kivilahti committed Oct 23, 2014
  
  c5bbd5e2 Browse Files
- Logitusta ja nullcheck · dcb02092
  Tuomas Riihimäki committed Oct 23, 2014
  
  dcb02092