Skip to content

[ISDK-84] Ranking service#44

Closed
imkven wants to merge 33 commits into
developfrom
feature/ISDK-84/ranking-service
Closed

[ISDK-84] Ranking service#44
imkven wants to merge 33 commits into
developfrom
feature/ISDK-84/ranking-service

Conversation

@imkven

@imkven imkven commented Oct 31, 2017

Copy link
Copy Markdown
Contributor

No description provided.

imkven added 22 commits October 2, 2017 12:44
# Conflicts:
#	src/pages/achievements/view/achievements-view.page.ts
#	src/pages/activities-classic/list/activities-classic-list.page.ts
#	src/pages/activities/list/list.page.ts
#	src/pages/activities/list/popup.ts
#	src/pages/assessments/assessments.page.ts
#	src/pages/assessments/group/assessments-group.page.ts
#	src/pages/assessments/popup/items-popup.page.ts
#	src/pages/events/checkin/event-checkin.page.ts
#	src/pages/events/list/list.page.ts
#	src/pages/events/view/events-view.page.ts
#	src/pages/forget-password/forget-password.ts
#	src/pages/gallery/gallery.ts
#	src/pages/levels/list/list.ts
#	src/pages/login/login.ts
#	src/pages/magic-link/magic-link.ts
#	src/pages/rankings/list/rankings.page.ts
#	src/pages/rankings/view/ranking-badges.ts
#	src/pages/rankings/view/ranking-details.page.ts
#	src/pages/registration/register.page.ts
#	src/pages/registration/registration.page.ts
#	src/pages/reset-password/reset-password.ts
#	src/pages/settings/leaderboard/leaderboard-settings.page.ts
#	src/pages/settings/settings.page.ts
#	src/pages/team/team.ts
#	src/pages/term-condition/term-condition.page.ts
# Conflicts:
#	src/pages/assessments/assessments.page.ts
#	src/pages/assessments/group/assessments-group.page.ts
#	src/pages/settings/leaderboard/leaderboard-settings.page.ts
#	src/pages/settings/settings.page.ts
# Conflicts:
#	src/pages/assessments/assessments.page.ts
#	src/pages/assessments/group/assessments-group.page.ts
# Conflicts:
#	src/app/app.module.ts
#	src/pages/forget-password/forget-password.ts
#	src/pages/login/login.ts
#	src/pages/registration/register.page.ts
#	src/pages/registration/registration.page.ts
#	src/pages/reset-password/reset-password.ts
#	src/pages/term-condition/term-condition.page.ts
# Conflicts:
#	src/app/app.module.ts
#	src/pages/forget-password/forget-password.ts
#	src/pages/login/login.ts
#	src/pages/registration/register.page.ts
#	src/pages/registration/registration.page.ts
#	src/pages/reset-password/reset-password.ts
#	src/pages/settings/settings.page.ts
#	src/pages/term-condition/term-condition.page.ts
@imkven imkven closed this Nov 10, 2017
@imkven

imkven commented Nov 10, 2017

Copy link
Copy Markdown
Contributor Author

Since this branch very stays behind from develop. I have created new branch for this ticket.
#48

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant