Commits · 9165c2e330743a9440204bf2590ec7a2b5c21b87 · Codecrew / Moya · GitLab

01 Apr, 2018 26 commits
- merge conflict resolve · 9165c2e3
  Aino Leppänen committed Apr 01, 2018
  
  9165c2e3 Browse Files
- merge conflicts · 875e9c45
  Aino Leppänen committed Apr 01, 2018
  
  875e9c45 Browse Files
- Merge branch 'feature/i18n-for-angular' into 'master' · 1cbc86e7
```
Feature/i18n for angular

See merge request !395
```
  Antti Väyrynen committed Apr 01, 2018
  1cbc86e7 Browse Files
- Merge branch 'feature/i18n-for-angular' of gitlab.codecrew.fi:codecrew/moya into… · 396250da
```
… feature/i18n-for-angular
```
  Tuukka Kivilahti committed Apr 01, 2018
  396250da Browse Files
- Login component needs some UI work · 1e9c299b
  Aino Leppänen committed Apr 01, 2018
  
  1e9c299b Browse Files
- cleanup · 3e5da1d0
  Tuukka Kivilahti committed Apr 01, 2018
  
  3e5da1d0 Browse Files
- cleaning · 05a1b193
  Antti Väyrynen committed Apr 01, 2018
  
  05a1b193 Browse Files
- Old moya module to info · be8b1fee
  Aino Leppänen committed Apr 01, 2018
  
  be8b1fee Browse Files
- bug · e24385dc
  Tuukka Kivilahti committed Apr 01, 2018
  
  e24385dc Browse Files
- changes from commits · 0fee3c89
  Tuukka Kivilahti committed Apr 01, 2018
  
  0fee3c89 Browse Files
- removed console log · 86220215
  Aino Leppänen committed Apr 01, 2018
  
  86220215 Browse Files
- Admin page routing · c132de9b
  Aino Leppänen committed Apr 01, 2018
  
  c132de9b Browse Files
- moved viplist to correct location · cc6f71f5
  Tuukka Kivilahti committed Apr 01, 2018
  
  cc6f71f5 Browse Files
- Pipes module import to OldMoyaModule · a95b5af4
  Aino Leppänen committed Apr 01, 2018
  
  a95b5af4 Browse Files
- fixed xeii's comments · 0d127765
  Tuukka Kivilahti committed Apr 01, 2018
  
  0d127765
- Pipes module for lazy loaded modules · 40d8531e
  Aino Leppänen committed Apr 01, 2018
  
  40d8531e Browse Files
- added left menu module · 50b37ad9
  Aino Leppänen committed Apr 01, 2018
  
  50b37ad9 Browse Files
- removed debug line · 04696394
  Aino Leppänen committed Apr 01, 2018
  
  04696394 Browse Files
- Routing almost works · 1f97a538
  Aino Leppänen committed Apr 01, 2018
  
  1f97a538 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/i18n-for-angular · 9a876f0a
  Tuukka Kivilahti committed Apr 01, 2018
  
  9a876f0a Browse Files
- actual merge conflict resolving · ac3368d1
  Aino Leppänen committed Apr 01, 2018
  
  ac3368d1 Browse Files
- merge conflicts · a2cf0b68
  Aino Leppänen committed Apr 01, 2018
  
  a2cf0b68 Browse Files
- Misc stuff · a7951e5f
  Aino Leppänen committed Apr 01, 2018
  
  a7951e5f Browse Files
- Misc stuff · 66dfe12c
  Aino Leppänen committed Apr 01, 2018
  
  66dfe12c Browse Files
- Merge branch 'nfcTagLogo' into 'master' · b1f00ba6
```
rest support for nfc tag logo android

See merge request !389
```
  Tuomas Riihimäki committed Apr 01, 2018
  b1f00ba6 Browse Files
- changes from comments · 45a74c6b
  Tuukka Kivilahti committed Apr 01, 2018
  
  45a74c6b Browse Files
31 Mar, 2018 14 commits
- docs · 73882464
  Tuukka Kivilahti committed Mar 31, 2018
  
  73882464 Browse Files
- Merge remote-tracking branch 'origin/master' into feature/i18n-for-angular · 0fceae8c
  Tuukka Kivilahti committed Mar 31, 2018
  
  0fceae8c Browse Files
- tested and working · 06233429
  Tuukka Kivilahti committed Mar 31, 2018
  
  06233429
- Localization for moya · a7a7f15f
  Tuukka Kivilahti committed Mar 31, 2018
  
  a7a7f15f Browse Files
- Ng cli conflict fix · fd14d31a
  Aino Leppänen committed Mar 31, 2018
  
  fd14d31a Browse Files
- new routing modules · 57e1624c
  Aino Leppänen committed Mar 31, 2018
  
  57e1624c Browse Files
- Added moya prefix to angular cli, created app routing module · 63c49442
  Aino Leppänen committed Mar 31, 2018
  
  63c49442
- Ng cli conflict fix · 8fb70c94
  Aino Leppänen committed Mar 31, 2018
  
  8fb70c94 Browse Files
- new routing modules · def08d69
  Aino Leppänen committed Mar 31, 2018
  
  def08d69 Browse Files
- Added moya prefix to angular cli, created app routing module · defb84a8
  Aino Leppänen committed Mar 31, 2018
  
  defb84a8 Browse Files
- Merge branch 'fixdbcompile' into 'master' · ec6e2af9
```
Workaround for Java endPosTable bug

See merge request !394
```
  Tuomas Riihimäki committed Mar 31, 2018
  ec6e2af9
- Workaround for Java endPosTable bug · 75ca5685
  Anssi Kolehmainen committed Mar 31, 2018
  
  75ca5685 Browse Files
- Merge branch 'angular2pages' into 'master' · 22c3ff77
```
Angular2pages

See merge request !393
```
  Tuomas Riihimäki committed Mar 31, 2018
  22c3ff77 Browse Files
- let's not leave comments · 41a44f19
  Tuukka Kivilahti committed Mar 31, 2018
  
  41a44f19 Browse Files