romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

WIP: Resolve "Создание проекта из гранта" #240

Draft
a.vasin wants to merge 2 commits from 99-project-from-grant into dev
pull from: 99-project-from-grant
merge into: romanov73:dev
Conversation 4 Commits 2 Files Changed 6 +35 -9
a.vasin commented 2019-06-04 13:31:48 +04:00 (Migrated from gitlab.com)
Copy Link

Closes #99

Closes #99
a.vasin commented 2019-06-04 13:31:49 +04:00 (Migrated from gitlab.com)
Copy Link

changed milestone to %3

changed milestone to %3
a.vasin commented 2019-06-05 08:42:20 +04:00 (Migrated from gitlab.com)
Copy Link

added 25 commits

Compare with previous version

added 25 commits <ul><li>b1e101c9 - #101 db event edited</li><li>279cc0e1 - #101 project model edited</li><li>eceb8ec5 - #101 project model edited</li><li>eb30d07d - #101 project deadlines on timeline</li><li>192adbfa - #101 no projects message</li><li>9013d792 - #101 grant attach</li><li>632c6299 - #101 files attach modified</li><li>4498b712 - #101 project tests</li><li>9388302a - #101 project tests</li><li>a7b48e15 - #101 project tests</li><li>1224cc7a - Merge branch &#39;dev&#39; of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline</li><li>291f4e1e - #101 db edited</li><li>a5ac2bcb - Merge branch &#39;dev&#39; of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline</li><li>267bd5b0 - #101 event service edited</li><li>961a6a31 - #101 event service edited</li><li>7edb9d2a - #101 event service edited</li><li>38478835 - #101 event service edited</li><li>ae8dc58a - #101 event service edited</li><li>e6dc2abd - #101 event service edited</li><li>db3252d8 - #101 event service edited</li><li>bde4ac5f - #101 event service edited</li><li>dc52968d - Merge branch &#39;101-projecgt-timeline&#39; of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline</li><li>482964fe - #101 EventService edited</li><li>bdff81d2 - #101 tests edited</li><li>26c1b789 - 99 unique name</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/113/diffs?diff_id=44146811&start_sha=a878f8c22ca04636449f0d33feb99354cd213540)
a.vasin commented 2019-06-05 08:48:43 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>997e7776 - #99 project dashboard edited</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/113/diffs?diff_id=44147013&start_sha=26c1b7896092700c88a7345a9e9cf73a4ef1e1fa)
a.vasin commented 2019-06-12 08:45:37 +04:00 (Migrated from gitlab.com)
Copy Link

assigned to @a.vasin

assigned to @a.vasin
This pull request has changes conflicting with the target branch.
  • src/main/java/ru/ulstu/project/service/ProjectService.java
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 99-project-from-grant:99-project-from-grant
git checkout 99-project-from-grant
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
backend

   
bug

   
frontend

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

   
выполняется

   
конференции

   
события

   
статьи
No Label
backend
bug
frontend
выполнить первой
выполняется
конференции
события
статьи
Milestone
Clear milestone
No items
No Milestone
Проекты
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
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#240
No description provided.
Delete Branch "99-project-from-grant"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?