Commits · 62c5355981fbb60c9fdcf6c68d8f26b287846b8f · Codecrew / Moya

11 May, 2014 2 commits
- front-end implementation for network assoc · 62c53559
  Antti Tönkyrä committed May 11, 2014
  
  62c53559 Browse Files
- Base EJB layer implementation for association · f8f8fcfa
  Antti Tönkyrä committed May 11, 2014
  
  f8f8fcfa Browse Files
10 May, 2014 5 commits
- uppercase abbreviations... · 4726db02
  Antti Tönkyrä committed May 10, 2014
  
  4726db02 Browse Files
- Network association permissions · 461d6ca2
  Antti Tönkyrä committed May 10, 2014
  
  461d6ca2 Browse Files
- database objects for network association · 6a83170a
  Antti Tönkyrä committed May 10, 2014
  
  6a83170a Browse Files
- Fix incorrect PrimeFaces artifact name · 907192cb
  Antti Tönkyrä committed May 10, 2014
  
  907192cb Browse Files
- Merge branch 'accountpermission' into 'master' · f943a05c
```
Card state filter, and ui fixes

 * Added permission for user to view accountevents.
 * Added filtering by PrintedCard.state
 * Added login for template
 * Update eventusers card after purchase and role modifications.

Kattonu: @tkfftk
```
  Tuukka Kivilahti committed May 10, 2014
  f943a05c Browse Files
09 May, 2014 1 commit
- .. Nullpointer when marking bill paid if groupmembership is null for user · 8662ee4b
  Tuomas Riihimäki committed May 09, 2014
  
  8662ee4b Browse Files
08 May, 2014 5 commits
- Add some 18n and fix a typo · b4d89987
  Tuomas Riihimäki committed May 08, 2014
  
  b4d89987
- Add logout button to template. ( was lost in previous loginbox-fix) · 4f036c5a
  Tuomas Riihimäki committed May 08, 2014
  
  4f036c5a Browse Files
- Typo in UserPermissions · e383c0b0
  Tuomas Riihimäki committed May 08, 2014
  
  e383c0b0
- Update users card after adding role or product purchase · ae54a0df
  Tuomas Riihimäki committed May 08, 2014
  
  ae54a0df Browse Files
- Card state filtering for eventusers · d052d87d
  Tuomas Riihimäki committed May 08, 2014
  
  d052d87d Browse Files
03 May, 2014 1 commit
- Fix users accountevent listing permission. · 957e503e
  Tuomas Riihimäki committed May 03, 2014
  
  957e503e Browse Files
28 Apr, 2014 12 commits
- Merge branch 'randomfixes' into 'master' · aa1d190a
```
Randomfixes

Few minor random fixes.

* invitestuff
* Primefaces 5.0-RC2
* etc
```
  Juho Salli committed Apr 28, 2014
  aa1d190a Browse Files
- some updates for automagically created .settings · fd5b3512
  Tuomas Riihimäki committed Apr 28, 2014
  
  fd5b3512 Browse Files
- Prettify login · 8dd484b9
  Tuomas Riihimäki committed Apr 28, 2014
  
  8dd484b9 Browse Files
- Ilmeinen typo... userselector.xhtml-tiedostossa · de441eb5
  Tuomas Riihimäki committed Apr 28, 2014
  
  de441eb5 Browse Files
- Primefaces 5.0-RC2 · 7d5f018b
  Tuomas Riihimäki committed Apr 28, 2014
  
  7d5f018b Browse Files
- Remove old actionlog/messagelist page reference, which gives a nullpointer in adminview · c082628a
  Tuomas Riihimäki committed Apr 28, 2014
  
  c082628a Browse Files
- Invite stuff: · 1edf8ff4
```
 * Login after accepting invite
 * Allow accepting of invite with existing user
 * Minor auth validation stuff
```
  Tuomas Riihimäki committed Apr 28, 2014
  1edf8ff4
- Some more specific logging for rest in hostnamefilter · 82b831f5
  Tuomas Riihimäki committed Apr 28, 2014
  
  82b831f5 Browse Files
- Update terminal web properties · cdf2ddae
  Tuomas Riihimäki committed Apr 28, 2014
  
  cdf2ddae
- Allow logging from invite · 17f9617d
  Tuomas Riihimäki committed Apr 28, 2014
  
  17f9617d Browse Files
- Rest query logging for hostnamefilter · 79da8f01
  Tuomas Riihimäki committed Apr 28, 2014
  
  79da8f01 Browse Files
- More logging for rest errors · 57c727a8
  Tuomas Riihimäki committed Apr 28, 2014
  
  57c727a8 Browse Files
17 Apr, 2014 3 commits
- Merge branch 'credTransferFix' into 'master' · 72df7970
```
Cred Transfer Fix

* Minor ui fixes.
* Add possibility to skip user in credit import
```
  Antti Tönkyrä committed Apr 17, 2014
  72df7970 Browse Files
- Minor fixes for credit transfer and possibility to skip user · b556ad01
  Tuomas Riihimäki committed Apr 17, 2014
  
  b556ad01 Browse Files
- Add empty role as first on event edit default role selection · 79b27989
  Tuomas Riihimäki committed Apr 17, 2014
  
  79b27989 Browse Files
16 Apr, 2014 1 commit

Merge branch 'shopCountAsValue' into 'master' · 4fb7141b

Shop Count As Value

Kaupan lukumääräarvojen syöttäminen myös numerona.
Korjattu myös bugi jossa ei voinut ostaa kuin 99 tuotetta.

Kattonut @tkfftk

committed Apr 16, 2014

4fb7141b Browse Files

15 Apr, 2014 5 commits

cange maxIntegerDigits -> maxFractionDigits in product shop. This was most likel… · 6ff1be2d
```
…y not intended originally
```
Tuomas Riihimäki committed Apr 15, 2014
6ff1be2d Browse Files
Merge branch 'master' into shopCountAsValue · 27af0ea3
```
Conflicts:
	code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/shop/ProductShopView.java
```
Tuomas Riihimäki committed Apr 15, 2014
27af0ea3 Browse Files
Merge branch 'permissionfix' into 'master' · 9e7b0f57
```
Permissionfix

Minor permissionstuff with event management. One possible nullpointer
```
Tuukka Kivilahti committed Apr 15, 2014
9e7b0f57 Browse Files
Merge branch 'testsetup' into 'master' · 7376c82a
```
Testsetup

Initial test setup for bean project
```
Tuukka Kivilahti committed Apr 15, 2014
7376c82a Browse Files

Merge branch 'credittransfer' into 'master' · f5cda4a9

Credit transfer (and some other stuff)

Tuli taas vähän turhan iso, mutta

 * Käyttäjien ID export tapahtumasta käyttäjäkorin kautta
  * Puolipisteellä erotettu lista User.Id:itä
 * Käyttäjien import edellisestä exportista tapahtumaan.
 * Tehty loppuun credittisiirto tapahtumasta toiseen. ( Käyttäjäkorin kautta. )
 * Fiksailtu ja uudelleenkirjoitettu osittain käyttäjien listaus
(paginointi ja sorttaus primefacesin päälle)
 * Pieniä viilauksia tilitapahtuman esittämiseen. ( descriptionit )
 * Ei luoda ihan aina automaattisesti uutta käyttäjää tapahtumaan.

committed Apr 15, 2014

f5cda4a9 Browse Files

14 Apr, 2014 1 commit
- Permission and nullpointer fixes · 0ad14370
  Tuomas Riihimäki committed Apr 14, 2014
  
  0ad14370 Browse Files
12 Apr, 2014 4 commits
- Initial test setup for bean project · 665ef471
  Tuomas Riihimäki committed Apr 12, 2014
  
  665ef471
- Merge branch 'master' into 'master' · 2b2d50ee
```
paikkakoodia ja infoilua

Tarttis oppia käyttää brancheja, mut täsä o
```
  Tuomas Riihimäki committed Apr 12, 2014
  2b2d50ee Browse Files
- Add possibility for admin to enter product count as number in shop · 40a6e261
  Tuomas Riihimäki committed Apr 12, 2014
  
  40a6e261 Browse Files
- Add possibility to enter product count as a number in user shop. · 48abfe98
  Tuomas Riihimäki committed Apr 12, 2014
  
  48abfe98