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
Merged
Merge Request !323 opened Feb 06, 2016 by Tuukka Kivilahti@tkfftk

Help for ewery page

There is possibility to create global help on every page. This must be tested with multible events when put in production (or beforehand).

Edited Apr 09, 2016
Request to merge tkfftk:helpthingy2 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 helpthingy2
git checkout -b tkfftk/moya-helpthingy2 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-helpthingy2

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.

Merged

  • The changes were merged into master.
  • Discussion 5
  • Commits 5
  • Changes 20
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff Feb 07, 2016
    code/moya-database/src/main/java/fi/codecrew/moya/model/Help.java 0 → 100644
    32 */
    33 @Entity
    34 @Table(name = "helps")
    35 public class Help extends GenericEntity implements Cloneable {
    36
    37 private static final long serialVersionUID = 1L;
    38
    39 @Column(name = "path")
    40 private String path;
    41
    42 public Help(String path) {
    43 this.path = path;
    44 }
    45 public Help() {
    46
    47 }
    • Tuomas Riihimäki @tuomari commented Feb 07, 2016
      Owner

      indentation

  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on the diff Feb 07, 2016
    code/moya-database/src/main/java/fi/codecrew/moya/model/HelpText.java 0 → 100644
    24
    25 import fi.codecrew.moya.enums.ValidLocale;
    26
    27 import javax.persistence.*;
    28 import java.util.Calendar;
    29 import java.util.Date;
    30 import java.util.Locale;
    31
    32 /**
    33 * Group for lectures, so you can set limits how many of these the user can
    34 * choose
    35 */
    36 @Entity
    37 @Table(name = "help_texts")
    38 public class HelpText extends GenericEntity implements Cloneable {
    39
    • Tuomas Riihimäki @tuomari commented Feb 07, 2016
      Owner

      Joko Cloneable pois, tai clone() toteutus

  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on the diff Feb 07, 2016
    code/moya-database/src/main/java/fi/codecrew/moya/model/Help.java 0 → 100644
    22 */
    23 package fi.codecrew.moya.model;
    24
    25 import javax.persistence.Column;
    26 import javax.persistence.Entity;
    27 import javax.persistence.Table;
    28
    29 /**
    30 * Group for lectures, so you can set limits how many of these the user can
    31 * choose
    32 */
    33 @Entity
    34 @Table(name = "helps")
    35 public class Help extends GenericEntity implements Cloneable {
    36
    37 private static final long serialVersionUID = 1L;
    • Tuomas Riihimäki @tuomari commented Feb 07, 2016
      Owner

      Cloneable pois, tai clone() funktio

  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on the diff Feb 07, 2016
    code/moya-database/src/main/java/fi/codecrew/moya/model/HelpTextHistory.java 0 → 100644
    21 * and open the template in the editor.
    22 */
    23 package fi.codecrew.moya.model;
    24
    25 import javax.persistence.*;
    26 import java.util.Date;
    27
    28 /**
    29 * Group for lectures, so you can set limits how many of these the user can
    30 * choose
    31 */
    32 @Entity
    33 @Table(name = "help_text_histories")
    34 public class HelpTextHistory extends GenericEntity implements Cloneable {
    35
    36 private static final long serialVersionUID = 1L;
    • Tuomas Riihimäki @tuomari commented Feb 07, 2016
      Owner

      Cloneable pois tai clone() funktion toteutus

  • E653e45857f523ba676b9ae7a0bab5dd?s=80&d=identicon
    Tuomas Riihimäki
    @tuomari started a discussion on an outdated diff Feb 07, 2016
    code/moya-web/src/main/java/fi/codecrew/moya/web/ValidLocale.java → code/moya-utils/src/main/java/fi/codecrew/moya/enums/ValidLocale.java
    34 34 public Locale getLocale() {
    35 35 return locale;
    36 36 }
    37
    38 public static ValidLocale getDefaultLocale() {
    39 return ValidLocale.ENGLISH;
    40 }
    41
    42 public static ValidLocale findFromLocale(Locale locale) {
    43 for(ValidLocale l : values()) {
    44 if(l.getLocale().equals(locale)) {
    45 return l;
    46 }
    • Tuomas Riihimäki @tuomari commented Feb 07, 2016
      Owner

      Indentation

  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • a182d018 - mergerequest fixes
    Feb 21, 2016

    Added 1 commit:

    • a182d018 - mergerequest fixes
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • 87b3069b - mergerequestfixes
    Apr 09, 2016

    Added 1 commit:

    • 87b3069b - mergerequestfixes
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 10 commits:

    • 87b3069b...d83e9d33 - 6 commits from branch codecrew:master
    • 27d59c15 - database and basic functionality
    • dd17005a - help thingy, now there can be global help on every page
    • ed108d3b - mergerequest fixes
    • 0942632a - mergerequestfixes
    Apr 09, 2016

    Added 10 commits:

    • 87b3069b...d83e9d33 - 6 commits from branch codecrew:master
    • 27d59c15 - database and basic functionality
    • dd17005a - help thingy, now there can be global help on every page
    • ed108d3b - mergerequest fixes
    • 0942632a - mergerequestfixes
    Toggle commit list
  • Tuukka Kivilahti @tkfftk

    Added 1 commit:

    • 9868f9ab - reverted
    Apr 09, 2016

    Added 1 commit:

    • 9868f9ab - reverted
    Toggle commit list
  • Tuomas Riihimäki @tuomari

    mentioned in commit 356d26bf

    Apr 09, 2016

    mentioned in commit 356d26bf

    Toggle commit list
  • Tuomas Riihimäki @tuomari

    Status changed to merged

    Apr 09, 2016

    Status changed to merged

    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
2
2 participants
Reference: codecrew/moya!323
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.