Commits · c3cb60cf5590d73b91a26b64487f326da6d0ea31 · Riina Antikainen / Moya

29 Jan, 2015 32 commits
- Check that returned place belongs to this event · c3cb60cf
```
Also unbuying of place should be restricted to MANAGE_OTHERS
```
  Tuomas Riihimäki committed Jan 29, 2015
  c3cb60cf Browse Files
- Merge branch 'xmlnames' into 'master' · 1c9ac393
```
Xmlnames

See merge request !240
```
  Tuukka Kivilahti committed Jan 29, 2015
  1c9ac393 Browse Files
- Remove name fields from XMLElement annotations. gson does not parse them correct… · a150bced
```
…ly and android app explodes..
```
  Tuomas Riihimäki committed Jan 29, 2015
  a150bced Browse Files
- Merge branch 'viplistToInfo' into 'master' · e101c7ce
```
Viplist to info

menu

See merge request !239
```
  Tuomas Riihimäki committed Jan 29, 2015
  e101c7ce Browse Files
- asdf · 6caf19fd
  Tuukka Kivilahti committed Jan 29, 2015
  
  6caf19fd Browse Files
- asdf · b2862722
  Tuukka Kivilahti committed Jan 29, 2015
  
  b2862722 Browse Files
- Merge branch 'asdasd' into 'master' · 2c3e6382
```
Rest fix

See merge request !237
```
  Tuukka Kivilahti committed Jan 29, 2015
  2c3e6382 Browse Files
- Merge branch 'viplistToInfo' into 'master' · f73d55d4
```
Viplist to info

info viplist

See merge request !238
```
  Tuomas Riihimäki committed Jan 29, 2015
  f73d55d4 Browse Files
- vipliststuff · f0ff3d9a
  Tuukka Kivilahti committed Jan 29, 2015
  
  f0ff3d9a Browse Files
- All places might not have a map · bf90958f
  Tuomas Riihimäki committed Jan 29, 2015
  
  bf90958f Browse Files
- Bump respojo version · d39c210f
  Tuomas Riihimäki committed Jan 29, 2015
  
  d39c210f
- Merge branch 'placeSummaryBugFix' into 'master' · 2b540791
```
Place summary bug fix

quickfix

See merge request !235
```
  Tuomas Riihimäki committed Jan 29, 2015
  2b540791 Browse Files
- Merge branch 'ticketSpamCommentedOut' into 'master' · 9fbaf389
```
Ticket spam commented out

see title

See merge request !236
```
  Tuomas Riihimäki committed Jan 29, 2015
  9fbaf389 Browse Files
- fixin place summary stuff · 48636c0c
  Tuukka Kivilahti committed Jan 29, 2015
  
  48636c0c Browse Files
- Merge branch 'dev' into 'master' · fe5f76a6
```
Changed the json element name to match variable name in UserReservationRestPojo

Because of possible magic.

See merge request !234
```
  Tuomas Riihimäki committed Jan 29, 2015
  fe5f76a6 Browse Files
- Changed the json element name to match variable name. · 9642e790
  Juho Salli committed Jan 29, 2015
  
  9642e790 Browse Files
- see branch · c1512dc5
  Tuukka Kivilahti committed Jan 29, 2015
  
  c1512dc5 Browse Files
- Merge branch 'feature/update-broken-testng' into 'master' · c9d654f8
```
Update testng to 6.8.17 as 6.8.15 has a bug and running tests throws an exception

Running TestSuite

Configuring TestNG with: org.apache.maven.surefire.testng.conf.TestNG652Configurator@2a098129

org.apache.maven.surefire.util.SurefireReflectionException: java.lang.reflect.InvocationTargetException; nested exception is java.lang.reflect.InvocationTargetException: null

java.lang.reflect.InvocationTargetException

...

See merge request !233
```
  Tuukka Kivilahti committed Jan 29, 2015
  c9d654f8 Browse Files
- Merge branch 'feature/build-sh' into 'master' · 7e1cd38b
```
build.sh

Just a build.sh script

./build.sh

./build.sh clean compile

/path/to/build.sh clean install

etc...

See merge request !232
```
  Tuukka Kivilahti committed Jan 29, 2015
  7e1cd38b Browse Files
- add build.sh script · 0f5806c8
  Juho Juopperi committed Jan 29, 2015
  
  0f5806c8
- testng 6.8.15 threw an exception. testng 6.8.17 works. updated · 5eeb98e7
  Juho Juopperi committed Jan 29, 2015
  
  5eeb98e7
- Merge branch 'timeoutBug' into 'master' · 2fe2f5a2
```
Timeout bug

aasdfasdfasdf

See merge request !230
```
  Tuomas Riihimäki committed Jan 29, 2015
  2fe2f5a2 Browse Files
- Merge branch 'rnd2' into 'master' · 33687797
```
Minor fix, noticed from logs

See merge request !231
```
  Tuukka Kivilahti committed Jan 29, 2015
  33687797 Browse Files
- Skiplist uses Comparable interface, and HttpSession does not implement it. · 62c3e065
  Tuomas Riihimäki committed Jan 29, 2015
  
  62c3e065 Browse Files
- this should work · 77c3e1e4
  Tuukka Kivilahti committed Jan 29, 2015
  
  77c3e1e4 Browse Files
- this should work · 0357ee83
  Tuukka Kivilahti committed Jan 29, 2015
  
  0357ee83
- Merge branch 'onlyShowOwn' into 'master' · 6445984b
```
Only show own

blobbista

See merge request !228
```
  Tuomas Riihimäki committed Jan 29, 2015
  6445984b Browse Files
- Merge branch 'rnd2' into 'master' · df1c38da
```
Rekisteriseloste via same protocol as we are calling moya

See merge request !229
```
  Tuukka Kivilahti committed Jan 29, 2015
  df1c38da Browse Files
- If rekisteriseloste url is harcoded to be over http, chrome does not like it. · 3e810ded
```
Request with http when using http and https when using https
```
  Tuomas Riihimäki committed Jan 29, 2015
  3e810ded Browse Files
- Merge remote-tracking branch 'origin/master' into onlyShowOwn · fdf4bd86
  Tuukka Kivilahti committed Jan 29, 2015
  
  fdf4bd86 Browse Files
- blaah, moar stuff · e7c57c72
  Tuukka Kivilahti committed Jan 29, 2015
  
  e7c57c72 Browse Files
- pieniaKorjailuja · f5f56775
  Tuukka Kivilahti committed Jan 29, 2015
  
  f5f56775 Browse Files
28 Jan, 2015 6 commits
- only show own stuff in cardlessINcomingView · 4fcdefa5
  Tuukka Kivilahti committed Jan 28, 2015
  
  4fcdefa5 Browse Files
- Merge branch 'multispam' into 'master' · 3c4eebfa
```
Multispam

multibuggagespammer

See merge request !227
```
  Tuomas Riihimäki committed Jan 28, 2015
  3c4eebfa Browse Files
- Merge remote-tracking branch 'origin/master' into multispam · 23c49195
  Tuukka Kivilahti committed Jan 28, 2015
  
  23c49195 Browse Files
- branch tells it all · b284c103
  Tuukka Kivilahti committed Jan 28, 2015
  
  b284c103 Browse Files
- Merge branch 'assykorjailuja' into 'master' · 6a4d2c23
```
Assykorjailuja

pikafixei

See merge request !226
```
  Juho Salli committed Jan 28, 2015
  6a4d2c23 Browse Files
- zero padding added · 9ce826bb
  Tuukka Kivilahti committed Jan 28, 2015
  
  9ce826bb Browse Files
27 Jan, 2015 2 commits
- email also to tikcet thustasdfasdf · 6036986f
  Tuukka Kivilahti committed Jan 27, 2015
  
  6036986f Browse Files
- Merge branch 'viplist' into 'master' · 25e294c8
```
Viplist

Viplist deploy version

See merge request !225
```
  Tuukka Kivilahti committed Jan 27, 2015
  25e294c8 Browse Files