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

chore: master down merge 24 Apr 2024 #338

Open
wants to merge 130 commits into
base: develop
Choose a base branch
from
Open

chore: master down merge 24 Apr 2024 #338

Changes from all commits
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
5e21ae2
Merge pull request #193 from NCIP/develop
msfitzsimons Apr 26, 2017
9f4167d
Merge pull request #194 from NCIP/develop
msfitzsimons Apr 26, 2017
89aba16
Merge pull request #195 from NCIP/develop
msfitzsimons Apr 26, 2017
0b351cd
Merge pull request #198 from NCIP/develop
msfitzsimons May 9, 2017
6789e77
Merge pull request #200 from NCIP/develop
msfitzsimons May 23, 2017
25ded13
Merge pull request #201 from NCIP/develop
msfitzsimons May 23, 2017
1315fef
Merge pull request #202 from NCIP/develop
msfitzsimons May 23, 2017
c2f33e4
Merge pull request #204 from NCIP/develop
msfitzsimons Jun 29, 2017
e0ed788
Merge pull request #205 from NCIP/develop
msfitzsimons Jun 29, 2017
573628a
Merge pull request #206 from NCIP/develop
msfitzsimons Jul 5, 2017
d3a5383
Merge pull request #207 from NCIP/develop
msfitzsimons Jul 5, 2017
c7ef7e2
Merge pull request #210 from NCIP/develop
msfitzsimons Jul 10, 2017
55561ff
Merge pull request #211 from NCIP/develop
msfitzsimons Jul 11, 2017
f2be4b0
Merge pull request #212 from NCIP/develop
msfitzsimons Jul 17, 2017
d728a78
Merge pull request #213 from NCIP/develop
msfitzsimons Jul 17, 2017
0a9a3f8
Merge pull request #215 from NCIP/develop
msfitzsimons Aug 22, 2017
3dae46c
Merge pull request #216 from NCIP/develop
msfitzsimons Aug 22, 2017
6f9d9b5
Merge pull request #217 from NCIP/develop
wwysoc2 Sep 8, 2017
1cdb400
Merge pull request #220 from NCIP/develop
wwysoc2 Oct 24, 2017
0e02f19
Merge pull request #224 from NCIP/develop
msfitzsimons Nov 16, 2017
2b8b56b
Merge pull request #231 from NCIP/develop
msfitzsimons Dec 14, 2017
758ad22
Merge pull request #232 from NCIP/develop
msfitzsimons Dec 14, 2017
659db30
Merge pull request #233 from NCIP/develop
msfitzsimons Dec 15, 2017
bd485e6
Merge pull request #234 from NCIP/develop
msfitzsimons Dec 18, 2017
7e2fd8d
Merge pull request #237 from NCIP/develop
msfitzsimons Dec 21, 2017
1f0ae8d
Merge pull request #238 from NCIP/develop
wwysoc2 Dec 22, 2017
8d199cb
Merge pull request #244 from NCIP/develop
wwysoc2 Jan 20, 2018
637c0bd
Merge pull request #245 from NCIP/develop
wwysoc2 Jan 22, 2018
52cd5f9
Merge pull request #247 from NCIP/develop
msfitzsimons Feb 15, 2018
aed83a9
Merge pull request #248 from NCIP/develop
msfitzsimons Feb 16, 2018
945e995
Merge pull request #250 from NCIP/develop
msfitzsimons Apr 5, 2018
549c8b3
Merge pull request #255 from NCIP/develop
msfitzsimons Apr 23, 2018
93ce7f4
Merge pull request #257 from NCIP/develop
msfitzsimons May 4, 2018
bd08f06
Merge pull request #260 from NCIP/develop
msfitzsimons May 21, 2018
cd74f62
Merge pull request #261 from NCIP/develop
msfitzsimons May 21, 2018
02f696d
Merge pull request #265 from NCIP/develop
msfitzsimons Jun 13, 2018
6ad006e
Merge pull request #266 from NCIP/develop
msfitzsimons Jun 14, 2018
494ce55
Merge pull request #269 from NCIP/develop
wwysoc2 Jul 12, 2018
fd34666
Merge pull request #271 from NCIP/develop
msfitzsimons Aug 23, 2018
12bc93d
Merge pull request #5 from NCI-GDC/develop
wwysoc2 Nov 7, 2018
8aba348
Merge pull request #6 from NCI-GDC/develop
wwysoc2 Nov 7, 2018
0a66776
Merge pull request #7 from NCI-GDC/develop
msfitzsimons Nov 8, 2018
a002e39
Merge pull request #11 from NCI-GDC/develop
msfitzsimons Dec 18, 2018
2d90b5c
Merge pull request #12 from NCI-GDC/develop
wwysoc2 Dec 19, 2018
5cddc3b
Merge pull request #21 from NCI-GDC/develop
msfitzsimons Feb 20, 2019
574ff6f
Merge pull request #22 from NCI-GDC/develop
msfitzsimons Mar 1, 2019
4784dc0
Merge pull request #24 from NCI-GDC/develop
msfitzsimons Mar 26, 2019
61db416
Merge pull request #27 from NCI-GDC/develop
msfitzsimons Apr 17, 2019
007a047
Merge pull request #31 from NCI-GDC/develop
msfitzsimons Jun 5, 2019
c52f2aa
Merge pull request #32 from NCI-GDC/develop
msfitzsimons Jun 6, 2019
78b4362
Merge pull request #33 from NCI-GDC/develop
msfitzsimons Jun 12, 2019
33296b0
Merge pull request #35 from NCI-GDC/develop
msfitzsimons Jul 8, 2019
416cc70
Merge pull request #36 from NCI-GDC/develop
msfitzsimons Jul 8, 2019
39981c7
Merge pull request #39 from NCI-GDC/develop
msfitzsimons Jul 31, 2019
40f453a
Merge pull request #42 from NCI-GDC/develop
msfitzsimons Sep 17, 2019
89fc04f
Merge pull request #47 from NCI-GDC/develop
msfitzsimons Nov 6, 2019
b9fa017
Merge pull request #49 from NCI-GDC/develop
msfitzsimons Nov 11, 2019
e554022
Merge pull request #52 from NCI-GDC/develop
wwysoc2 Dec 10, 2019
addeea7
Merge pull request #56 from NCI-GDC/develop
wwysoc2 Jan 17, 2020
2eca1a9
Merge pull request #59 from NCI-GDC/develop
wwysoc2 Jan 30, 2020
96e41b5
Merge pull request #61 from NCI-GDC/develop
wwysoc2 Mar 10, 2020
538f836
Merge pull request #63 from NCI-GDC/develop
wwysoc2 Mar 10, 2020
d226e97
Merge pull request #65 from NCI-GDC/develop
wwysoc2 Mar 12, 2020
5c41976
Merge pull request #67 from NCI-GDC/develop
wwysoc2 Apr 8, 2020
fe27a19
Merge pull request #68 from NCI-GDC/develop
wwysoc2 Apr 9, 2020
550ee1c
Merge pull request #72 from NCI-GDC/develop
wwysoc2 May 7, 2020
ca33c64
Very Bad Fish
samrichca Jun 11, 2020
411780c
Merge pull request #78 from NCI-GDC/develop
wwysoc2 Jul 2, 2020
c56a0a3
Merge pull request #79 from NCI-GDC/develop
wwysoc2 Jul 2, 2020
975b390
Merge pull request #81 from NCI-GDC/develop
wwysoc2 Jul 8, 2020
e0eb9b2
Merge pull request #85 from NCI-GDC/develop
wwysoc2 Jul 22, 2020
6b719ef
Merge pull request #87 from NCI-GDC/develop
wwysoc2 Jul 24, 2020
38747df
Merge pull request #90 from NCI-GDC/develop
wwysoc2 Aug 12, 2020
46e8aba
Merge pull request #91 from NCI-GDC/develop
wwysoc2 Aug 12, 2020
d6075e3
Merge pull request #93 from NCI-GDC/develop
wwysoc2 Aug 14, 2020
0cc2d60
Merge pull request #95 from NCI-GDC/develop
wwysoc2 Sep 8, 2020
f5dceee
Merge pull request #97 from NCI-GDC/develop
wwysoc2 Oct 29, 2020
f6d5a19
Merge pull request #98 from NCI-GDC/develop
wwysoc2 Oct 29, 2020
ff8e7a9
Merge pull request #99 from NCI-GDC/develop
wwysoc2 Nov 2, 2020
f7678f4
Merge pull request #100 from NCI-GDC/develop
wwysoc2 Nov 9, 2020
9d20819
Merge pull request #103 from NCI-GDC/develop
wwysoc2 Jan 5, 2021
e5f93e8
Merge pull request #106 from NCI-GDC/develop
wwysoc2 Feb 2, 2021
e0e8f2b
Merge pull request #108 from NCI-GDC/develop
wwysoc2 Feb 4, 2021
c7785a6
Merge pull request #111 from NCI-GDC/develop
wwysoc2 Feb 11, 2021
30b99dd
Merge pull request #116 from NCI-GDC/develop
wwysoc2 Mar 31, 2021
aada830
Merge pull request #120 from NCI-GDC/develop
wwysoc2 May 17, 2021
08379fb
Merge pull request #123 from NCI-GDC/develop
wwysoc2 Jun 22, 2021
66ebe65
Merge pull request #129 from NCI-GDC/develop
wwysoc2 Aug 23, 2021
b4a8bec
Merge pull request #133 from NCI-GDC/develop
wwysoc2 Sep 24, 2021
05c4607
Merge pull request #134 from NCI-GDC/develop
wwysoc2 Sep 24, 2021
8d469dd
Merge pull request #138 from NCI-GDC/develop
wwysoc2 Oct 29, 2021
e1943c7
Merge pull request #142 from NCI-GDC/develop
wwysoc2 Mar 29, 2022
b95ba5d
Merge pull request #145 from NCI-GDC/develop
bullenc May 3, 2022
8d4d7d6
Merge pull request #150 from NCI-GDC/develop
wwysoc2 Jun 1, 2022
4002f05
Merge pull request #156 from NCI-GDC/develop
wwysoc2 Jul 8, 2022
5f33c15
Merge pull request #160 from NCI-GDC/develop
bullenc Jul 27, 2022
6dbe706
Merge pull request #162 from NCI-GDC/develop
bullenc Jul 27, 2022
62247e8
Merge pull request #171 from NCI-GDC/develop
bullenc Sep 28, 2022
68fa1cf
Merge pull request #176 from NCI-GDC/develop
wwysoc2 Dec 5, 2022
f3f966d
Merge pull request #179 from NCI-GDC/develop
wwysoc2 Dec 12, 2022
3fc2d5a
Merge pull request #180 from NCI-GDC/develop
wwysoc2 Dec 12, 2022
742071e
Merge pull request #181 from NCI-GDC/develop
wwysoc2 Dec 12, 2022
d2c2714
Merge pull request #188 from NCI-GDC/develop
wwysoc2 Feb 2, 2023
2a5fd58
Merge pull request #191 from NCI-GDC/develop
wwysoc2 Feb 8, 2023
5aa11f7
Merge pull request #194 from NCI-GDC/develop
bullenc Mar 6, 2023
4dcbb0c
Merge pull request #198 from NCI-GDC/develop
wwysoc2 Mar 29, 2023
f21d245
Merge pull request #200 from NCI-GDC/develop
wwysoc2 Mar 30, 2023
d3a64ae
Merge pull request #208 from NCI-GDC/develop
wwysoc2 May 12, 2023
e4ed884
Merge pull request #210 from NCI-GDC/develop
wwysoc2 May 12, 2023
b6ed60d
Merge pull request #213 from NCI-GDC/develop
wwysoc2 May 31, 2023
d5e30f1
Merge pull request #216 from NCI-GDC/develop
wwysoc2 Jun 16, 2023
14542b4
Merge pull request #219 from NCI-GDC/develop
wwysoc2 Jul 31, 2023
612e1fc
Merge pull request #224 from NCI-GDC/develop
wwysoc2 Aug 31, 2023
af01512
Merge pull request #226 from NCI-GDC/develop
wwysoc2 Sep 1, 2023
cc92897
Merge pull request #229 from NCI-GDC/develop
bullenc Oct 30, 2023
ff85ea6
Merge pull request #235 from NCI-GDC/develop
bullenc Dec 5, 2023
ce3dbea
Merge pull request #309 from NCI-GDC/develop
wwysoc2 Feb 8, 2024
e6bb1c2
Merge pull request #311 from NCI-GDC/develop
wwysoc2 Feb 8, 2024
8c2ae7e
Merge pull request #316 from NCI-GDC/develop
wwysoc2 Feb 21, 2024
c522074
Merge pull request #318 from NCI-GDC/develop
wwysoc2 Feb 23, 2024
e694cb8
Merge pull request #321 from NCI-GDC/develop
wwysoc2 Mar 12, 2024
aab4d90
Merge pull request #327 from NCI-GDC/develop
bullenc Mar 29, 2024
025e916
DEV-2662 Bump version of lodash from 4.17.4 to 4.17.21
bilalbaqar Apr 19, 2024
fa3e1d9
update lodash to 4.17.21 in dictionary theme
Apr 22, 2024
90bf999
mkdocs change
bilalbaqar Apr 22, 2024
c8c99bd
Merge pull request #332 from NCI-GDC/hotfix/DEV-2661-bump-lodash
bilalbaqar Apr 23, 2024
05aa71d
- Updating lodash to 4.17.21
a-collet Apr 25, 2024
711b78a
Merge pull request #337 from NCI-GDC/hotfix/DEV-2661-404.html
a-collet Apr 25, 2024
b52d9ac
Merge remote-tracking branch 'refs/remotes/origin/master' into chore/…
a-collet Apr 25, 2024
40808db
- Removing diff with mkdocs.yml
a-collet Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion theme/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ <h1 class="no-auto-render">
</div>
</div>
</footer>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.4/lodash.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.js"></script>


<script src="/js/jquery-1.12.0.min.js"></script>
Expand Down