Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3089 jsoup #3108

Merged
merged 32 commits into from
May 11, 2016
Merged

3089 jsoup #3108

merged 32 commits into from
May 11, 2016

Conversation

scolapasta
Copy link
Contributor

@scolapasta scolapasta commented May 10, 2016 •
edited
Loading

RFI Checklist

1. Related Issues

#3089 Edit Dataset: Pass field contents through JSoup for filtering

2. Pull Request Checklist

  • [N/A] Functionality completed as described in FRD (bug fix)
  • [N/A] Dependencies, risks, assumptions in FRD addressed
  • Unit tests completed
  • Deployment requirements identified (e.g., SQL scripts, indexing)
  • schema.xml update
  • Documentation completed
  • All code checkins completed

3. Review Checklist

After the pull request has been submitted, fill out this section.

  • Code review completed or waived
  • Testing requirements completed
  • Usability testing completed or waived
  • Support testing completed or waived
  • Merged with develop branch and resolved conflicts

landreev and others added 23 commits April 18, 2016 01:23
@landreev
First push into the Harvesting branch.
cda1b54 
This is a rudimentary framework for the harvesting client (incomplete!)
@landreev
Initial framework for the Harvesting REST API.
91315ed
@landreev
Removed unused imports from the harvester service bean.
b6845e0
@landreev
new /api/harvest/status method with JSON output.
340b944
@landreev
Refactored the code, replacing "HarvestingDataverseConfig" with "Harv…
e4b90e5 
…estingClient".
@landreev
more refactoring;
6315e19 
added a Command for retrieving a HarvstingClient;
more fixes;
@landreev
API further reorganized;
54b5cea 
proper Commands added for retrieving, creating, modifying and deleting Harvesting Clients.
@landreev
Bug fixes;
c4b12b1 
Improved diagnostics in the Harvesting API;
@sekmiller
Updated Bundle for Dataset Publish popups
58ab1cf
@landreev
experimental oai harvesting implementation based on lyncode XOAI.
3ccd3a0
@sekmiller
#3089 Fix links created for notifications
edce3df
@sekmiller
#3089 Saved Search and linked dataverses
d3e23b2
@sekmiller
Simplify Success Message build
d69980c
@sekmiller
Dataset Linking Success Message
0d5bd94
@landreev
Further development of the harvesting client;
d711374 
Bug fixes;
Completed transition to managing harvesting by configured clients, not by dataverses that have harvested content.
@sekmiller
Remove Root DV Name from Support Link Title
aef0d7d
@sekmiller
Fix BundleUtilTest
09454b2
@scolapasta
fix for escaping linked titles on My Data page
edec682
@scolapasta
fix for escaping linked titles in Citation (added new DataCitation cl…
f4cc04f 
…ass)
@scolapasta
changed a call for citation to get html version
da23b73
@pdurbin
Indexing: make "citation" plaintext, add "citationHtml" #3089
5d0d634 
- Updated Search API Guide to better reflect reality.
  - Added note about "citationHtml" for back compat
  - `file_content_type` and `score` added a while ago
  - `publicationDate` not `publication_date_s`
  - different facets showing
@scolapasta
some cleanup in DataCitation code
70c355d
@scolapasta
search include fragment now shows new citationHtml
74a8d56
@coveralls
Copy link

Coverage Status

Coverage increased (+0.0002%) to 5.014% when pulling 74a8d56 on 3089-jsoup into bb0a5d8 on develop.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.0002%) to 5.014% when pulling 15e89e4 on 3089-jsoup into bb0a5d8 on develop.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.0002%) to 5.014% when pulling 8651ee8 on 3089-jsoup into bb0a5d8 on develop.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.0002%) to 5.014% when pulling a7fdea3 on 3089-jsoup into bb0a5d8 on develop.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.0002%) to 5.014% when pulling bd9c1a1 on 3089-jsoup into bb0a5d8 on develop.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.0002%) to 5.014% when pulling 4181948 on 3089-jsoup into bb0a5d8 on develop.

landreev added 4 commits May 11, 2016 15:05
@landreev
Committing a quick CORS header fix into the patch branch.
43e2193 
Will update #1136 to reflect this.
@landreev
resolving a (weird?) merge conflict on the branch?
815ef30 
Merge branch '3089-jsoup' of github.com:IQSS/dataverse_temp into 3089-jsoup

Conflicts:
	src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
@landreev
Revert "resolving a (weird?) merge conflict on the branch?"
dde14c5 
This reverts commit 815ef30, reversing
changes made to 4181948.
@landreev
Trying again, with the infamous CORS header patch.
13c89ed
@coveralls
Copy link

Coverage Status

Coverage increased (+0.0002%) to 5.014% when pulling dde14c5 on 3089-jsoup into bb0a5d8 on develop.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.0001%) to 5.014% when pulling 13c89ed on 3089-jsoup into bb0a5d8 on develop.

@scolapasta scolapasta merged commit aa1b8c6 into develop May 11, 2016
pdurbin added a commit that referenced this pull request May 12, 2016
@pdurbin
Merge branch 'develop' into 2939-shib
fe5b00d 
Conflicts from #3108 (3089-jsoup):
	src/main/java/Bundle.properties
	src/main/webapp/dataverseuser.xhtml
	src/test/java/edu/harvard/iq/dataverse/util/BundleUtilTest.java

- Had to fix welcome notification on signup (no more
  notification.welcome1 and notification.welcome2)
- Apply dataverse.saved.search.success fix from 09454b2
@pdurbin pdurbin mentioned this pull request May 12, 2016
Merged
11 tasks
pdurbin added a commit that referenced this pull request May 12, 2016
@pdurbin
Merge branch 'develop' into 1012-private-url #3111 #1012
dd6ceb1 
Conflicts with #3108 (3089-jsoup):
src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java
src/main/java/edu/harvard/iq/dataverse/RolePermissionFragment.java

- All AssignRoleCommand constructors need privateUrlToken parameter.
@scolapasta scolapasta added this to the 4.3.1 milestone May 12, 2016
@kcondon kcondon assigned scolapasta and unassigned kcondon May 12, 2016
@pdurbin pdurbin deleted the 3089-jsoup branch May 31, 2016 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@scolapasta scolapasta

Labels
None yet
Projects
None yet
Milestone
4.3.1
Development

Successfully merging this pull request may close these issues.
6 participants
@scolapasta @coveralls @kcondon @landreev @sekmiller @pdurbin