Commits · 3e46f5b9d4f00e84e99bd73516923f18bcf6a5a6 · Codecrew / Moya

06 Oct, 2012 19 commits
- imports · 3e46f5b9
  Juho Juopperi committed Oct 06, 2012
  
  3e46f5b9 Browse Files
- logic bug · cd23bcbd
  Juho Juopperi committed Oct 06, 2012
  
  cd23bcbd Browse Files
- ungeneralize type · 06d2196e
  Juho Juopperi committed Oct 06, 2012
  
  06d2196e Browse Files
- make it compile · 7aa09958
  Juho Juopperi committed Oct 06, 2012
  
  7aa09958
- Merge branch 'master' of codecrew.fi:bortal · 7d3c93fe
  Juho Juopperi committed Oct 06, 2012
  
  7d3c93fe Browse Files
- fix jsf errors · c586a8ac
  Juho Juopperi committed Oct 06, 2012
  
  c586a8ac
- Merge branch 'master' of codecrew.fi:bortal · 71e44b57
```
Conflicts:
	code/LanBortalWeb/WebContent/WEB-INF/web.xml
	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/FoodShopView.java
```
  Tuomas Riihimäki committed Oct 06, 2012
  71e44b57 Browse Files
- Foodwavea. · 4e4b9d82
  Tuomas Riihimäki committed Oct 06, 2012
  
  4e4b9d82
- etusivulle muutoksia... · 3e3852ef
  Petri Järvisalo committed Oct 06, 2012
  
  3e3852ef Browse Files
- fix jsf warnings · 5730f5af
  Juho Juopperi committed Oct 06, 2012
  
  5730f5af
- Merge branch 'master' of codecrew.fi:bortal · fb55fae7
  Tuukka Kivilahti, TKffTK committed Oct 06, 2012
  
  fb55fae7 Browse Files
- Merge branch 'master' of codecrew.fi:bortal · 558d52a0
```
Conflicts:
	code/LanBortalWeb/WebContent/permissionDenied.xhtml
	code/LanBortalWeb/WebContent/resources/cditools/bills/list.xhtml
```
  Tuukka Kivilahti, TKffTK committed Oct 06, 2012
  558d52a0 Browse Files
- generated stuff · becb1269
  Juho Juopperi committed Oct 06, 2012
  
  becb1269 Browse Files
- can haz · 139d54b3
  Tuukka Kivilahti, TKffTK committed Oct 06, 2012
  
  139d54b3
- java7 -> java6 build ent · b8065ab6
  Juho Juopperi committed Oct 06, 2012
  
  b8065ab6
- Merge branch 'master' of codecrew.fi:bortal · 22cfdbac
```
Conflicts:
	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/map/MapManageView.java
	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/AuthView.java
```
  Juho Juopperi committed Oct 06, 2012
  22cfdbac
- fix · 5d752d89
  Juho Juopperi committed Oct 06, 2012
  
  5d752d89 Browse Files
- can haz save · 42a59ade
  Tuukka Kivilahti, TKffTK committed Oct 06, 2012
  
  42a59ade
- fix jsf errors · 2ae1f001
  Juho Juopperi committed Oct 06, 2012
  
  2ae1f001
04 Oct, 2012 3 commits
- Moved BarcodeBean to utils and renamed to BarcodeUtils · 20c3a322
  Tuomas Riihimäki committed Oct 04, 2012
  
  20c3a322
- Merge branch 'master' of codecrew.fi:bortal · 386610f4
```
Conflicts:
	code/LanBortalWeb/WebContent/resources/cditools/role/edit.xhtml
```
  Tuomas Riihimäki committed Oct 04, 2012
  386610f4 Browse Files
- Random stuff. · b197f1a6
  Tuomas Riihimäki committed Oct 04, 2012
  
  b197f1a6
01 Oct, 2012 1 commit
- Added EAN13 barcode for usercard (lower part of the card) · e1670d23
  Petri Järvisalo committed Oct 01, 2012
  
  e1670d23
15 Sep, 2012 1 commit
- Add case insensitive usenamecheck to user creation. · 0cbebcb7
  Tuomas Riihimäki committed Sep 15, 2012
  
  0cbebcb7 Browse Files
13 Sep, 2012 7 commits
- I changed settings to point to default workspaces jdk, it was mainly for mac. · 25cc7ecc
```
minor modification to css styles:
 - tabnav.css is moved and will be loaded separately for templates.
```
  Petri Järvisalo committed Sep 13, 2012
  25cc7ecc Browse Files
- Added template property to LanEventPropertyKey · 6ebf064c
  Tuomas Riihimäki committed Sep 13, 2012
  
  6ebf064c Browse Files
- Hurrdurr.. Classpathfiksailua.. Mäkit ei hanskaa 1.7 · d047d181
  Tuomas Riihimäki committed Sep 13, 2012
  
  d047d181
- Merge branch 'master' of codecrew.fi:bortal · 80b1ad1f
  Tuomas Riihimäki committed Sep 13, 2012
  
  80b1ad1f Browse Files
- Don't show checkout.fi when bill is paid · c050bba7
  Tuomas Riihimäki committed Sep 13, 2012
  
  c050bba7
- Merge branch 'master' of codecrew.fi:bortal · b99fa2c8
```
Conflicts:
	code/LanBortalWeb/WebContent/resources/style/insomnia2/css/tyyli.css
```
  Petri Järvisalo committed Sep 13, 2012
  b99fa2c8
- new template + minor changes to some views. · f1f40b33
  Petri Järvisalo committed Sep 13, 2012
  
  f1f40b33
12 Sep, 2012 1 commit
- Initial SSH UI · 5aa5fbb8
  Tuomas Riihimäki committed Sep 12, 2012
  
  5aa5fbb8
11 Sep, 2012 1 commit
- Logijuttua, showBill:n billLines.. · 052eee2e
  Tuomas Riihimäki committed Sep 11, 2012
  
  052eee2e
10 Sep, 2012 1 commit

Äääää.. En osaa tehdä pieniä committeja.. :) · ac499fc7

  - Lisätty EventUser oliolle creator ja createtime kentät HUOM! KANTAMUUTOS!
  - Rajoitettu käyttäjälistausta vain tapahtuman käyttäjiin. Haku toimii koko kannasta.
  - Checkoutjuttuja.
  - SearchPredicate facadejuttuja

committed Sep 10, 2012

ac499fc7

09 Sep, 2012 5 commits
- * Lisätty primefaces calendar lokalisointi suomeksi · e51e4d76
```
  * Lisätty syntymäpäiväkenttä käyttäjätietoihin.
  * Muutettu käyttäjän syntymäpäivä Calendar -> Date

P.S. Edellisessä
```
  Tuomas Riihimäki committed Sep 09, 2012
  e51e4d76
- Merge branch 'master' of codecrew.fi:bortal · adef6888
  Tuomas Riihimäki committed Sep 09, 2012
  
  adef6888 Browse Files
- Random... · 01ddfb13
  Tuomas Riihimäki committed Sep 09, 2012
  
  01ddfb13
- Added Reader.type · 47b599f9
  Tuomas Riihimäki committed Sep 09, 2012
  
  47b599f9
- barcode reader for shopToUser + sound effects · 0f1ab868
  Petri Järvisalo committed Sep 09, 2012
  
  0f1ab868
08 Sep, 2012 1 commit
- implemented user barcode reader for shop · 3bdb6c29
  Petri Järvisalo committed Sep 08, 2012
  
  3bdb6c29