Commits · 1f97a538f4dc2f667009f94ce1f7dba8cb1500e2 · Linnea Samila / Moya · GitLab

01 Apr, 2018 5 commits
- Routing almost works · 1f97a538
  Aino Leppänen committed Apr 01, 2018
  
  1f97a538 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
31 Mar, 2018 13 commits
- 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 Browse Files
- 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
- angular-common poies · 9a7f45de
  Tuukka Kivilahti committed Mar 31, 2018
  
  9a7f45de Browse Files
- Merge remote-tracking branch 'origin/master' into angular2pages · 5fff6694
  Tuukka Kivilahti committed Mar 31, 2018
  
  5fff6694 Browse Files
- vanha hakemisto poies · 938b0868
  Tuukka Kivilahti committed Mar 31, 2018
  
  938b0868 Browse Files
30 Mar, 2018 2 commits
- Downgraded angular back to 5.2.9, removed preserve symlinks flag from npm scripts. · 0d3478d6
  Aino Leppänen committed Mar 30, 2018
  
  0d3478d6 Browse Files
- not sure what is here, should be something almost working · 0f676826
  Tuukka Kivilahti committed Mar 30, 2018
  
  0f676826
01 Mar, 2018 2 commits
- update to angular-6-beta · 76bb82c8
  Tuukka Kivilahti committed Mar 01, 2018
  
  76bb82c8
- fixed template, and old moya component · a9ab48ed
  Tuukka Kivilahti committed Mar 01, 2018
  
  a9ab48ed Browse Files
22 Feb, 2018 2 commits
- bug fixes · 7d53d60e
  Tuukka Kivilahti committed Feb 22, 2018
  
  7d53d60e Browse Files
- refactor · 4936c494
  Tuukka Kivilahti committed Feb 22, 2018
  
  4936c494 Browse Files
17 Feb, 2018 3 commits
- Merge branch 'sessionfix' into 'master' · 341df336
```
Verify that there exists a session on normal user entry

See merge request !391
```
  Tuukka Kivilahti committed Feb 17, 2018
  341df336 Browse Files
- Merge branch 'dep-bump' into 'master' · d530453d
```
Bump dependency versions

See merge request !390
```
  Tuukka Kivilahti committed Feb 17, 2018
  d530453d Browse Files
- nagular 5 is now working · c87cf192
  Tuukka Kivilahti committed Feb 17, 2018
  
  c87cf192
13 Feb, 2018 1 commit
- Verify that there exists a session on normal user entry · a946dbb0
  Tuomas Riihimäki committed Feb 13, 2018
  
  a946dbb0 Browse Files
10 Feb, 2018 12 commits
- upgrade and bug fix caused by bug in ng cli · 29ceaba7
  Tuukka Kivilahti committed Feb 10, 2018
  
  29ceaba7 Browse Files
- working test version · 3f479bc0
  Tuukka Kivilahti committed Feb 10, 2018
  
  3f479bc0 Browse Files
- some untested changes, to give onja some code · 45a70c54
  Tuukka Kivilahti committed Feb 10, 2018
  
  45a70c54
- väliaikacommit · 798dac1c
  Tuukka Kivilahti committed Feb 10, 2018
  
  798dac1c Browse Files
- minor change · f6cf18d8
  Tuukka Kivilahti committed Feb 10, 2018
  
  f6cf18d8 Browse Files
- added logo · b402ab85
  Tuukka Kivilahti committed Feb 10, 2018
  
  b402ab85 Browse Files
- sass and some ui stuff · 3ce47fa0
  Tuukka Kivilahti committed Feb 10, 2018
  
  3ce47fa0
- some stuff before lint · 8c372a50
  Tuukka Kivilahti committed Feb 10, 2018
  
  8c372a50
- ohjelman runkoa · 2eabd5d2
  Tuukka Kivilahti committed Feb 10, 2018
  
  2eabd5d2 Browse Files
- cleanup, and regex fix · d4c5104c
  Tuukka Kivilahti committed Feb 10, 2018
  
  d4c5104c Browse Files
- Prettyfaces redirect for moya-angular + random stuff · 1c68242b
  Tuomas Riihimäki committed Feb 10, 2018
  
  1c68242b Browse Files
- virpest fixed and some minor changes to stuff · f0306ea8
  Tuukka Kivilahti committed Feb 10, 2018
  
  f0306ea8 Browse Files