1. 31 Oct, 2012 2 commits
    • Merge branch 'newui' into newui-merge · 009a807d
      Conflicts:
      	code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/CardPrintBean.java
      	code/LanBortalWeb/WebContent/WEB-INF/web.xml
      	code/LanBortalWeb/WebContent/resources/style/insomnia2/css/general.css
      	code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n.properties
      	code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties
      	code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties
      	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/shop/ProductShopView.java
      	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserValidator.java
      	code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/user/UserView.java
      Tuomas Riihimäki committed
    • map save bug · bcb6bbae
      Tuomas Riihimäki committed
  2. 29 Oct, 2012 1 commit
  3. 28 Oct, 2012 1 commit
  4. 27 Oct, 2012 36 commits