Skip to content
  • Projects
  • Groups
  • Snippets
  • Help

Codecrew / Moya

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 30
  • Merge Requests 2
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Closed
Merge Request !358 opened Feb 05, 2017 by Tuukka Kivilahti@tkfftk

WIP: Angular2pages

Luo menuitemin joka ei ohjaa keskeneräiselle sivulle, älä mergeä vielä!

Edited Apr 01, 2018
Request to merge tkfftk:angular2pages into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.codecrew.fi/tkfftk/moya.git angular2pages
git checkout -b tkfftk/moya-angular2pages FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff tkfftk/moya-angular2pages

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Closed

The changes were not merged into master.

  • Discussion 15
  • Commits 32
  • Changes 217
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Tuukka Kivilahti @tkfftk

    Added 9 commits:

    • 938c55a5...eb3e2291 - 6 commits from branch codecrew:master
    • b72d119c - routetest, for pull
    • b6c17fe8 - Merge branch 'master' of gitlab.codecrew.fi:codecrew/moya into angular2pages
    • 038ef2d4 - fixed test and navigation testing
    Feb 08, 2017

    Added 9 commits:

    • 938c55a5...eb3e2291 - 6 commits from branch codecrew:master
    • b72d119c - routetest, for pull
    • b6c17fe8 - Merge branch 'master' of gitlab.codecrew.fi:codecrew/moya into angular2pages
    • 038ef2d4 - fixed test and navigation testing
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • effdbdd6 - jotain unohtui
    Feb 10, 2017

    Added 1 commit:

    • effdbdd6 - jotain unohtui
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • 4220309c - menu navigation
    Feb 13, 2017

    Added 1 commit:

    • 4220309c - menu navigation
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Title changed from Angular2pages to WIP: Angular2pages

    Feb 13, 2017

    Title changed from Angular2pages to WIP: Angular2pages

    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 2 commits:

    • 0fd24bc6 - väliaikakommit, ennen hrm rikkomisia
    • e42bb3af - cache and viplist using that cache
    Feb 17, 2017

    Added 2 commits:

    • 0fd24bc6 - väliaikakommit, ennen hrm rikkomisia
    • e42bb3af - cache and viplist using that cache
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • 86e81059 - publish -> publishLast, now the last query is 'replayed' if there is some late subscriber
    Feb 17, 2017

    Added 1 commit:

    • 86e81059 - publish -> publishLast, now the last query is 'replayed' if there is some late subscriber
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • 9d99e0fd - removed cache from angular zone detection, so it does not trigger change detection on cleanup
    Feb 17, 2017

    Added 1 commit:

    • 9d99e0fd - removed cache from angular zone detection, so it does not trigger change detection on cleanup
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 49 commits:

    • 9d99e0fd...15355127 - 35 commits from branch codecrew:master
    • 8de19119 - ng new moya-angular
    • 4048b71e - pom.xml, now intellij idea know's what's going on
    • 97cf9ad3 - inital test done
    • 39dcfa86 - readme
    • 4b7d9b19 - routetest, for pull
    • 9a117212 - fixed test and navigation testing
    • 622edeef - jotain unohtui
    • ecfb8d0a - menu navigation
    • 1e06ef0e - väliaikakommit, ennen hrm rikkomisia
    • d165e980 - cache and viplist using that cache
    • c5184859 - publish -> publishLast, now the last query is 'replayed' if there is some late subscriber
    • 1229cf09 - removed cache from angular zone detection, so it does not trigger change detection on cleanup
    • c1998669 - nothing important
    • d51e420e - test div table
    May 11, 2017

    Added 49 commits:

    • 9d99e0fd...15355127 - 35 commits from branch codecrew:master
    • 8de19119 - ng new moya-angular
    • 4048b71e - pom.xml, now intellij idea know's what's going on
    • 97cf9ad3 - inital test done
    • 39dcfa86 - readme
    • 4b7d9b19 - routetest, for pull
    • 9a117212 - fixed test and navigation testing
    • 622edeef - jotain unohtui
    • ecfb8d0a - menu navigation
    • 1e06ef0e - väliaikakommit, ennen hrm rikkomisia
    • d165e980 - cache and viplist using that cache
    • c5184859 - publish -> publishLast, now the last query is 'replayed' if there is some late subscriber
    • 1229cf09 - removed cache from angular zone detection, so it does not trigger change detection on cleanup
    • c1998669 - nothing important
    • d51e420e - test div table
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • 1ee4566f - litle stuff
    May 12, 2017

    Added 1 commit:

    • 1ee4566f - litle stuff
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 2 commits:

    • d66ee618 - moya-angular-common now contains common stuffendalen
    • 9d2ec2e6 - added readme
    May 12, 2017

    Added 2 commits:

    • d66ee618 - moya-angular-common now contains common stuffendalen
    • 9d2ec2e6 - added readme
    Toggle commit list
  • Tuomas Riihimäki @tuomari

    Added 1 commit:

    • 353dd98c - Tunkh!
    May 12, 2017

    Added 1 commit:

    • 353dd98c - Tunkh!
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • e5e0b74b - removed melody, added MoyaNG to urls
    May 12, 2017

    Added 1 commit:

    • e5e0b74b - removed melody, added MoyaNG to urls
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • e7c8f091 - deploy to some other URL
    May 12, 2017

    Added 1 commit:

    • e7c8f091 - deploy to some other URL
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 2 commits:

    • 138730e1 - Moya OLD -module to angular moya
    • fb3c09f4 - hä, ei nää puuttunut sieltä
    May 12, 2017

    Added 2 commits:

    • 138730e1 - Moya OLD -module to angular moya
    • fb3c09f4 - hä, ei nää puuttunut sieltä
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • 3f397436 - virpest fixed and some minor changes to stuff
    May 12, 2017

    Added 1 commit:

    • 3f397436 - virpest fixed and some minor changes to stuff
    Toggle commit list
  • Tuomas Riihimäki @tuomari

    Added 1 commit:

    • f691cad1 - Prettyfaces redirect for moya-angular + random stuff
    May 12, 2017

    Added 1 commit:

    • f691cad1 - Prettyfaces redirect for moya-angular + random stuff
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • a75bd57c - cleanup, and regex fix
    May 12, 2017

    Added 1 commit:

    • a75bd57c - cleanup, and regex fix
    Toggle commit list
  • Jenkins @jenkins commented May 13, 2017
    Developer

    Build triggered.

  • Jenkins @jenkins commented May 13, 2017
    Developer

    Build Started: https://jenkins.codecrew.fi/job/moya-master/100/

  • Jenkins @jenkins commented May 13, 2017
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/moya-master/100/

  • Tuukka Kivilahti @tkfftk

    added 1 commit

    • 200495bc - ohjelman runkoa

    Compare with previous version

    May 13, 2017

    added 1 commit

    • 200495bc - ohjelman runkoa

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented May 13, 2017
    Developer

    Build triggered.

  • Jenkins @jenkins commented May 13, 2017
    Developer

    Build Started: https://jenkins.codecrew.fi/job/moya-master/101/

  • Jenkins @jenkins commented May 13, 2017
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/moya-master/101/

  • Tuukka Kivilahti @tkfftk

    added 2 commits

    • 40040842 - some stuff before lint
    • 4bc0dc94 - sass and some ui stuff

    Compare with previous version

    May 14, 2017

    added 2 commits

    • 40040842 - some stuff before lint
    • 4bc0dc94 - sass and some ui stuff

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented May 14, 2017
    Developer

    Build triggered.

  • Jenkins @jenkins commented May 14, 2017
    Developer

    Build Started: https://jenkins.codecrew.fi/job/moya-master/102/

  • Jenkins @jenkins commented May 14, 2017
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/moya-master/102/

  • Tuukka Kivilahti @tkfftk

    added 1 commit

    • 8c5cfb02 - added logo

    Compare with previous version

    May 14, 2017

    added 1 commit

    • 8c5cfb02 - added logo

    Compare with previous version

    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    added 1 commit

    • 2d910117 - minor change

    Compare with previous version

    May 14, 2017

    added 1 commit

    • 2d910117 - minor change

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented May 14, 2017
    Developer

    Build triggered.

  • Jenkins @jenkins commented May 14, 2017
    Developer

    Build Started: https://jenkins.codecrew.fi/job/moya-master/103/

  • Jenkins @jenkins commented May 14, 2017
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/moya-master/103/

  • Tuukka Kivilahti @tkfftk

    added 2 commits

    • ad375ccd - väliaikacommit
    • c9622107 - some untested changes, to give onja some code

    Compare with previous version

    Jan 07, 2018

    added 2 commits

    • ad375ccd - väliaikacommit
    • c9622107 - some untested changes, to give onja some code

    Compare with previous version

    Toggle commit list
  • Jenkins @jenkins commented Jan 19, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Jan 19, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/moya-master/122/

  • Jenkins @jenkins commented Jan 19, 2018
    Developer

    Build finished. Tests FAILED. Build results available at: https://jenkins.codecrew.fi/job/moya-master/122/

  • Tuukka Kivilahti @tkfftk

    closed

    Apr 01, 2018

    closed

    Toggle commit list
  • Write
  • Preview
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
3
3 participants
Reference: codecrew/moya!358