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

v23.12.1 testing into staging #232

Merged
merged 60 commits into from
Dec 15, 2023
Merged

v23.12.1 testing into staging #232

merged 60 commits into from
Dec 15, 2023

Conversation

lakikowolfe
Copy link
Collaborator

@lakikowolfe lakikowolfe commented Dec 14, 2023 •
edited
Loading

merge v23.12.1 testing branch into main branch and deploy to staging.

https://sagebionetworks.jira.com/browse/FDS-1364

lakikowolfe and others added 30 commits August 28, 2023 11:29
@lakikowolfe
tweaks to get app working
e9fc262
@lakikowolfe
use forceUpdate=T
bfbf764
@lakikowolfe
merge deployment workflow from main
c86d596
@lakikowolfe
Merge pull request #218 from Sage-Bionetworks/dev-fds-46-launch-error
84925be 
FDS-46 fix launch error
@lakikowolfe
point at dev dfamodules
179c165
@lakikowolfe
Merge pull request #219 from Sage-Bionetworks/update-dfamodules
0c33aa1 
update dfamodules
@lakikowolfe
use pre-commit
740d110
@lakikowolfe
Merge pull request #220 from Sage-Bionetworks/fds-959-precommit
eca17ac 
FDS 959 implement precommit
@lakikowolfe
update renv
5f6dbf6
@lakikowolfe
select a dcc landing page ui
0b95b64
@lakikowolfe
formatting
3f20587
@lakikowolfe
move dcc_config download to global.R
da62529
@lakikowolfe
integrate dfamodules dcc selection module w landing page and dash
b9955cc
@lakikowolfe
remove unnecissary variable creation
55288c6
@lakikowolfe
refactor administrator to accept reactive inputs
67561e5
@lakikowolfe
increment version
8195cc0
@lakikowolfe
update dfamodules to development version 23.10.1
0bc6647
@lakikowolfe
Merge pull request #221 from Sage-Bionetworks/integrate-select-dcc
a441877 
Integrate select dcc module with data flow app
@lakikowolfe
remove -beta from version
2aa4184
@lakikowolfe
remove -beta from version
3c2b34f
@lakikowolfe
generate data flow model that contains attributes outlined in rfc
c97c5ef
@lakikowolfe
use new data model
4c6bb55
@lakikowolfe
use multi-tenant version of dfamodules
fa26ee6
@lakikowolfe
Merge pull request #223 from Sage-Bionetworks/fds-1213-rfc-data-model
4db0727 
FDS-1213 Integrate new data model into Data Flow App
@lakikowolfe
move tab update to data flow app from dcc selection module
70b9d49
@lakikowolfe
initialize waiter pkg
b55f139
@lakikowolfe
update to most recent version of dev dfamodules
0fabdda
@lakikowolfe
Merge pull request #224 from Sage-Bionetworks/fds-1254-tab-update
8aeecf3 
Move tab update on button click from dcc selection module to data flow app
@lakikowolfe
wip: dashboard load waiter screen
2194856
@lakikowolfe
clean up
2eee642
@lakikowolfe
Merge pull request #226 from Sage-Bionetworks/fds-1208-dcc-selection-…
98bc81b 
…waiter

FDS-1208 Add a waiter screen after dcc selection
@lakikowolfe
waiter language
26320c4
@lakikowolfe
Merge branch 'dev-mt' of https://github.com/Sage-Bionetworks/release_…
5ecf9f4 
…administrator into dev-mt
@lakikowolfe
csv dataflow manifests
8c337e9
@lakikowolfe
Merge pull request #227 from Sage-Bionetworks/fds-1338-generate-new-data
b306efd 
Generate data flow manifests for FAIR Demo, HTAN, and INCLUDE
@lakikowolfe
remove old synapse manifest
c2a9b87
@lakikowolfe
remove erroneously added row num column
a1146eb
@lakikowolfe
update dfamodules version
2bc6431
@lakikowolfe
Merge pull request #228 from Sage-Bionetworks/fds-1338-generate-new-data
84f0825 
Fds 1338 generate new data 2
@lakikowolfe
use refactored mod_datatable_filters modules
f6a048d
@lakikowolfe
remove na replace
bedca27
@lakikowolfe
update renv.lock
8bdd863
@lakikowolfe
Merge pull request #229 from Sage-Bionetworks/fds-1403-fix-filtering
70f5a50 
Use refactored filtering module
@lakikowolfe
wip: refactor administrator
ca95bb7
@lakikowolfe
refactor administrator
53a42a9
@lakikowolfe
point app at configuration repo main branch
c830194
@lakikowolfe
update dfamodules version to feature branch
8d03a2d
@lakikowolfe
Merge branch 'dev-mt' into fds-1412-htan-demo-prep
0c9b258
@lakikowolfe
update renv.lock (fixed installation error)
21d9999
@lakikowolfe
Merge branch 'fds-1412-htan-demo-prep' of https://github.com/Sage-Bio…
3707f5a 
…networks/release_administrator into fds-1412-htan-demo-prep
@lakikowolfe
update renv.lock
cf31701
@lakikowolfe
point app at main branch of config repo
edf122b
@lakikowolfe
Merge pull request #230 from Sage-Bionetworks/fds-1412-htan-demo-prep
e1decca 
FDS-1412 htan demo prep (mostly fixing the administrator)
@lakikowolfe
Merge pull request #225 from Sage-Bionetworks/dev-mt
b7a0531 
Merge multitenant into dev
@lakikowolfe lakikowolfe marked this pull request as ready for review December 15, 2023 19:55
@lakikowolfe lakikowolfe merged commit 6a26d48 into main Dec 15, 2023
2 checks passed
@lakikowolfe lakikowolfe deleted the dev branch December 15, 2023 22:01
@lakikowolfe lakikowolfe restored the dev branch December 15, 2023 22:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@lakikowolfe