Commit 95cd663
committed
Merge branch 'develop' into PFUpdates
# Conflicts:
# pom.xml
# src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java
# src/main/webapp/file.xhtml
# src/main/webapp/filesFragment.xhtml
# src/main/webapp/metadataFragment.xhtml
# src/main/webapp/resources/css/structure.css
# src/main/webapp/search-include-fragment.xhtml19 files changed
Lines changed: 223 additions & 689 deletions
File tree
- doc/sphinx-guides/source/installation
- modules/dataverse-parent
- src
- main
- java/edu/harvard/iq/dataverse
- api
- dataaccess
- pidproviders/doi
- util
- webapp
- resources/css
- test/java/edu/harvard/iq/dataverse
- api
- pidproviders/doi/datacite
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
935 | 935 | | |
936 | 936 | | |
937 | 937 | | |
938 | | - | |
| 938 | + | |
939 | 939 | | |
940 | 940 | | |
941 | | - | |
942 | | - | |
| 941 | + | |
| 942 | + | |
943 | 943 | | |
944 | 944 | | |
945 | 945 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
152 | 152 | | |
153 | 153 | | |
154 | 154 | | |
155 | | - | |
| 155 | + | |
156 | 156 | | |
157 | 157 | | |
158 | 158 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
109 | 109 | | |
110 | 110 | | |
111 | 111 | | |
112 | | - | |
113 | | - | |
114 | 112 | | |
115 | | - | |
116 | 113 | | |
117 | 114 | | |
118 | 115 | | |
| |||
169 | 166 | | |
170 | 167 | | |
171 | 168 | | |
172 | | - | |
173 | 169 | | |
174 | 170 | | |
175 | 171 | | |
| |||
4738 | 4734 | | |
4739 | 4735 | | |
4740 | 4736 | | |
4741 | | - | |
4742 | | - | |
4743 | | - | |
4744 | | - | |
4745 | 4737 | | |
4746 | 4738 | | |
4747 | 4739 | | |
4748 | 4740 | | |
4749 | 4741 | | |
4750 | | - | |
4751 | | - | |
4752 | 4742 | | |
4753 | 4743 | | |
4754 | 4744 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
508 | 508 | | |
509 | 509 | | |
510 | 510 | | |
511 | | - | |
512 | 511 | | |
513 | 512 | | |
514 | 513 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
58 | | - | |
| 58 | + | |
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
| |||
This file was deleted.
0 commit comments