Merge branch 'w2p-44239_pagination-optimization' into w2p-44024_simple-search-with-select (d833aa1b) · Commits · vtechworks / Dspace7 Angular · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

Dspace7 Angular
- Activity
- Members
- Labels
- Releases
- Package Registry
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

code.vt.edu will be down for maintenance from 0530-0630 EDT Wednesday, March 26th

d833aa1b

Commit d833aa1b authored 7 years ago by

Lotte Hofstede

Downloads
- Plain Diff

Merge branch 'w2p-44239_pagination-optimization' into w2p-44024_simple-search-with-select

Conflicts:
	src/app/search-page/search-page.component.ts

parents b853a005 e632e9d8

Branches

Tags

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/app/collection-page/collection-page.component.html 1 addition, 1 deletion

src/app/collection-page/collection-page.component.html
src/app/home/top-level-community-list/top-level-community-list.component.html 1 addition, 5 deletions

...el-community-list/top-level-community-list.component.html
src/app/home/top-level-community-list/top-level-community-list.component.ts 16 additions, 33 deletions

...evel-community-list/top-level-community-list.component.ts
src/app/search-page/search-page.component.ts 5 additions, 1 deletion

src/app/search-page/search-page.component.ts
src/app/shared/empty.util.spec.ts 2 additions, 2 deletions

src/app/shared/empty.util.spec.ts
src/app/shared/empty.util.ts 6 additions, 2 deletions

src/app/shared/empty.util.ts
src/app/shared/pagination/pagination.component.html 2 additions, 2 deletions

src/app/shared/pagination/pagination.component.html
src/app/shared/pagination/pagination.component.scss 3 additions, 0 deletions

src/app/shared/pagination/pagination.component.scss
src/app/shared/pagination/pagination.component.spec.ts 16 additions, 16 deletions

src/app/shared/pagination/pagination.component.spec.ts
src/app/shared/pagination/pagination.component.ts 82 additions, 41 deletions

src/app/shared/pagination/pagination.component.ts

with 134 additions and 103 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment