Labels Milestones

Resolve "Создать контроллер грантов" #151

Merged

tatyana_belousova merged 1 commits from 35- into master 6 years ago

Conversation 13 Commits 1 Files Changed 1

tatyana_belousova commented 6 years ago (Migrated from gitlab.com)

Closes #35

Closes #35

tatyana_belousova commented 6 years ago (Migrated from gitlab.com)

added 1 commit

• 42d33d1b - Create setters for GrantDto

Compare with previous version

added 1 commit <ul><li>42d33d1b - Create setters for GrantDto</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/24/diffs?diff_id=30093549&start_sha=469a3ad07d0e1964a3c12802130ebfd5bd9bd0ff)

tatyana_belousova commented 6 years ago (Migrated from gitlab.com)

added 5 commits

• eff5344a - Create GrantRepository
• edd38beb - Add function getNextDeadline()
• 9e5f3d72 - Add constructor
• c2a32d6c - Update ProjectDto
• a2fa5748 - Create Controller&Service

Compare with previous version

added 5 commits <ul><li>eff5344a - Create GrantRepository</li><li>edd38beb - Add function getNextDeadline()</li><li>9e5f3d72 - Add constructor</li><li>c2a32d6c - Update ProjectDto</li><li>a2fa5748 - Create Controller&amp;Service</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/24/diffs?diff_id=30115821&start_sha=42d33d1be8f2a6f203b2cf4d7b46831bfc404ae4)

tatyana_belousova commented 6 years ago (Migrated from gitlab.com)

added 6 commits

• 25278bcd - Create html fragments
• 307b640e - Create js for grants
• 410d0d96 - Create service&repository for Project
• 2f68339b - Add thymeleaf template
• d7721ce1 - Update classes
• fcbd9176 - Rename table grant to grants

Compare with previous version

added 6 commits <ul><li>25278bcd - Create html fragments</li><li>307b640e - Create js for grants</li><li>410d0d96 - Create service&amp;repository for Project</li><li>2f68339b - Add thymeleaf template</li><li>d7721ce1 - Update classes</li><li>fcbd9176 - Rename table grant to grants</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/24/diffs?diff_id=30164898&start_sha=a2fa574888e21a22fdd42e41756541210e1c2edd)

tatyana_belousova commented 6 years ago (Migrated from gitlab.com)

assigned to @tatyana_belousova

assigned to @tatyana_belousova

tatyana_belousova commented 6 years ago (Migrated from gitlab.com)

assigned to @romanov73

assigned to @romanov73

tatyana_belousova commented 6 years ago (Migrated from gitlab.com)

unmarked as a Work In Progress

unmarked as a **Work In Progress**

tatyana_belousova commented 6 years ago (Migrated from gitlab.com)

added 1 commit

• 18ad291e - Made button "delete grant" visible

Compare with previous version

added 1 commit <ul><li>18ad291e - Made button &quot;delete grant&quot; visible</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/24/diffs?diff_id=30165381&start_sha=fcbd91760d577e09c5538cafa8d2307f4318a8ac)

tatyana_belousova commented 6 years ago (Migrated from gitlab.com)

added 1 commit

• 816d115c - Hide button "Add Project" when project already exists (not perfect)

Compare with previous version

added 1 commit <ul><li>816d115c - Hide button &quot;Add Project&quot; when project already exists (not perfect)</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/24/diffs?diff_id=30166783&start_sha=18ad291e8269f0466ec9f96a3051f64a7f3063f6)

tatyana_belousova commented 6 years ago (Migrated from gitlab.com)

added 1 commit

• bcc64cda - Create model folder for grant

Compare with previous version

added 1 commit <ul><li>bcc64cda - Create model folder for grant</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/24/diffs?diff_id=30174227&start_sha=816d115cc87ad6312e42f768e92113e0fc0ea825)

romanov73 commented 6 years ago (Migrated from gitlab.com)

added 1 commit

• ce78f8ad - some refactor

Compare with previous version

added 1 commit <ul><li>ce78f8ad - some refactor</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/24/diffs?diff_id=30334300&start_sha=bcc64cda96abc23dfc45dd067895b02a5b2918d0)

romanov73 commented 6 years ago (Migrated from gitlab.com)

added 1 commit

• ebb036ee - some refactor

Compare with previous version

added 1 commit <ul><li>ebb036ee - some refactor</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/24/diffs?diff_id=30334443&start_sha=ce78f8ad667612618df6921a9b7fde2c702ff10c)

romanov73 commented 6 years ago (Migrated from gitlab.com)

mentioned in commit 7a490ef7a5

mentioned in commit 7a490ef7a5bdce06bfb54b60d8ea53951c61d01b

romanov73 commented 6 years ago (Migrated from gitlab.com)

merged

merged

The pull request has been merged as 7a490ef7a5.

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b 35- master

git pull origin 35-

Step 2:

Merge the changes and update on Gitea.

git checkout master

git merge --no-ff 35-

git push origin master

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels   

backend

  

bug

  

frontend

  

выполнить первой

  

выполняется

  

конференции

  

события

  

статьи

No Label

backend

bug

frontend

выполнить первой

выполняется

конференции

события

статьи

Milestone

Set milestone

Clear milestone

No items

No Milestone

Гранты

Projects

Set Project

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: romanov73/ng-tracker#151

Write Preview

Loading…

Cancel

Save

There is no content yet.