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

WIP: Resolve "Реализация проверки выполнения показателей" #220

Draft
tatyana_belousova wants to merge 11 commits from 44-check-complete-deadlines into dev
pull from: 44-check-complete-deadlines
merge into: romanov73:dev
Conversation 14 Commits 11 Files Changed 6 +20 -17
tatyana_belousova commented 2019-05-12 15:51:30 +04:00 (Migrated from gitlab.com)
Copy Link

Closes #44

Closes #44
tatyana_belousova commented 2019-05-12 15:51:30 +04:00 (Migrated from gitlab.com)
Copy Link

changed milestone to %4

changed milestone to %4
tatyana_belousova commented 2019-05-12 23:27:30 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>c612e35a - #44 add check for papers</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/93/diffs?diff_id=41834004&start_sha=ff7f535980ed6a34695b0f36665f61d65e06cb57)
tatyana_belousova commented 2019-05-13 16:29:44 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>395cf57c - #44 finish with papers</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/93/diffs?diff_id=41891480&start_sha=c612e35ad9f8dd80a17af9ad18f4f3f45f260600)
tatyana_belousova commented 2019-05-14 23:42:59 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>72923312 - #44 add title to paper status fragment</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/93/diffs?diff_id=42078671&start_sha=395cf57cc1e7a5c58d0c86c66b6feb4355b7c75a)
tatyana_belousova commented 2019-05-14 23:44:09 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>8747ac16 - #44 change icon for grant</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/93/diffs?diff_id=42078735&start_sha=72923312b73aca732e235e34783c957b6d495342)
tatyana_belousova commented 2019-05-14 23:46:23 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>8c13adb4 - #44 replace paper status fragment</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/93/diffs?diff_id=42078849&start_sha=8747ac1619e72d027a7d50027112e5034e1e1afe)
tatyana_belousova commented 2019-05-14 23:48:56 +04:00 (Migrated from gitlab.com)
Copy Link

unmarked as a Work In Progress

unmarked as a **Work In Progress**
tatyana_belousova commented 2019-05-14 23:55:16 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>9ca8d15b - #44 update fragment in conference</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/93/diffs?diff_id=42079372&start_sha=8c13adb4aa831ec43905e5ee6519c32fd6e20ff0)
tatyana_belousova commented 2019-05-15 00:00:22 +04:00 (Migrated from gitlab.com)
Copy Link

assigned to @romanov73

assigned to @romanov73
romanov73 commented 2019-05-16 07:50:33 +04:00 (Migrated from gitlab.com)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>1d19472f - #44 small icons</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/93/diffs?diff_id=42211137&start_sha=9ca8d15b8f7c01c528023d5756269ddc7ee9b4f3)
romanov73 commented 2019-05-16 08:04:10 +04:00 (Migrated from gitlab.com)
Copy Link

МР пока не буду заливать, нужны еще проекты

МР пока не буду заливать, нужны еще проекты
tatyana_belousova commented 2019-05-16 12:28:19 +04:00 (Migrated from gitlab.com)
Copy Link

marked as a Work In Progress

marked as a **Work In Progress**
tatyana_belousova commented 2019-05-16 12:28:37 +04:00 (Migrated from gitlab.com)
Copy Link

unassigned @romanov73

unassigned @romanov73
tatyana_belousova commented 2019-06-05 11:56:41 +04:00 (Migrated from gitlab.com)
Copy Link

added 206 commits

  • 1d19472f...44824e53 - 194 commits from branch dev
  • 1bf1ad91 - Merge branch 'dev' into 44-check-complete-deadlines
  • ecda9232 - #103 create blank classes
  • b1c090b0 - #103 add selenium-support library
  • 16885cc9 - #103 update overriding method
  • 3e9bbb35 - #103 create tests for create, update and delete functions
  • 47131f1f - #103 add tests for papers
  • 0cd8003d - #103 add tests for deadline
  • c7770270 - #103 merge with dev
  • 1ff38fc8 - #103 merge with dev
  • 24d3c2ef - Merge branch '103-integr-tests-grant' into 44-check-complete-deadlines
  • 8b263e7e - #44 fix link to papers
  • 858b4b96 - Merge remote-tracking branch 'origin/44-check-complete-deadlines' into 44-check-complete-deadlines

Compare with previous version

added 206 commits <ul><li>1d19472f...44824e53 - 194 commits from branch <code>dev</code></li><li>1bf1ad91 - Merge branch &#39;dev&#39; into 44-check-complete-deadlines</li><li>ecda9232 - #103 create blank classes</li><li>b1c090b0 - #103 add selenium-support library</li><li>16885cc9 - #103 update overriding method</li><li>3e9bbb35 - #103 create tests for create, update and delete functions</li><li>47131f1f - #103 add tests for papers</li><li>0cd8003d - #103 add tests for deadline</li><li>c7770270 - #103 merge with dev</li><li>1ff38fc8 - #103 merge with dev</li><li>24d3c2ef - Merge branch &#39;103-integr-tests-grant&#39; into 44-check-complete-deadlines</li><li>8b263e7e - #44 fix link to papers</li><li>858b4b96 - Merge remote-tracking branch &#39;origin/44-check-complete-deadlines&#39; into 44-check-complete-deadlines</li></ul> [Compare with previous version](https://gitlab.com/romanov73/ng-tracker/merge_requests/93/diffs?diff_id=44157293&start_sha=1d19472f82f3376bb0f0f944451aa7d74a698d0c)
This pull request has changes conflicting with the target branch.
  • src/main/resources/templates/conferences/conference.html
  • src/main/resources/templates/grants/fragments/grantLineFragment.html
  • src/main/resources/templates/papers/fragments/paperDashboardFragment.html
  • src/main/resources/templates/papers/fragments/paperLineFragment.html
  • src/main/resources/templates/papers/fragments/paperStatusFragment.html
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 44-check-complete-deadlines:44-check-complete-deadlines
git checkout 44-check-complete-deadlines
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#220
No description provided.
Delete Branch "44-check-complete-deadlines"

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?