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

WIP: Resolve "Статистика по активностям" #232

Draft
arefiev1997 wants to merge 11 commits from 93-activites-analytics into dev
pull from: 93-activites-analytics
merge into: romanov73:dev
Conversation 2 Commits 11 Files Changed 19 +403 -7
arefiev1997 commented 2019-05-22 03:41:56 +04:00 (Migrated from gitlab.com)
Copy Link

Closes #93

Closes #93
arefiev1997 commented 2019-05-22 03:41:57 +04:00 (Migrated from gitlab.com)
Copy Link

changed milestone to %6

changed milestone to %6
arefiev1997 commented 2019-06-11 01:20:44 +04:00 (Migrated from gitlab.com)
Copy Link

added 160 commits

Compare with previous version

added 160 commits <ul><li>59bc0dbd...9ba4476f - 149 commits from branch <code>dev</code></li><li>d1182ea7 - Merge remote-tracking branch &#39;origin/dev&#39; into 93-activites-analytics</li><li>ea0b8fba - Merge remote-tracking branch &#39;origin/dev&#39; into 93-activites-analytics</li><li>ed7707c4 - #93 users activity by date</li><li>2adaf774 - #93 removed comment</li><li>44e3fc2c - #93 fixes</li><li>9bec1d08 - #93 completed count</li><li>a28b3ea5 - #93 resolve stashed conflicts</li><li>0bb9d577 - #93 merged with dev</li><li>015a1d7f - #93 merged with dev</li><li>cbae48c2 - #93 users activities analytycs</li><li>e81ee4d3 - #93 codestyle</li></ul> [Compare with previous version](/romanov73/ng-tracker/merge_requests/105/diffs?diff_id=44795529&start_sha=59bc0dbd347b9fa7d7939a039295b8f013001ebe)
This pull request has changes conflicting with the target branch.
  • src/main/java/ru/ulstu/grant/service/GrantService.java
  • src/main/java/ru/ulstu/paper/service/PaperService.java
  • src/main/java/ru/ulstu/project/service/ProjectService.java
  • src/main/java/ru/ulstu/user/controller/UserController.java
  • src/main/java/ru/ulstu/user/controller/UserMvcController.java
  • src/main/java/ru/ulstu/user/service/UserService.java
  • src/main/resources/db/changelog-master.xml
  • src/main/resources/public/js/users.js
View command line instructions.

Checkout

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

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?