Skip to content

Commit

Permalink
Merge branch 'poc/TUP-318-plugin-image-gallery' into dev/tup-cms
Browse files Browse the repository at this point in the history
  • Loading branch information
wesleyboar committed Jun 15, 2023
2 parents abf8e14 + b435eb3 commit 7b1b6cf
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 1 deletion.
24 changes: 23 additions & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ djangocms-picture = "3.0.0"
djangocms-snippet = "3.0.0"
djangocms-style = "3.0.0"
djangocms-text-ckeditor = "^5.1"
djangocms-tacc-image-gallery = { git = "https://github.com/TACC/Core-CMS-Plugin-Image-Gallery.git", rev = "v0.1.2" }
djangocms-transfer = "1.0.0"
djangocms-video = "3.0.0"
django-test-without-migrations = "0.6"
Expand Down
1 change: 1 addition & 0 deletions taccsite_cms/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ def gettext(s): return s
'taccsite_cms.contrib.bootstrap4_djangocms_picture',

# TACC CMS Plugins
'djangocms_tacc_image_gallery',
# TODO: Use https://github.com/wesleyboar/Core-CMS-Plugin-System-Monitor
'taccsite_cms.contrib.taccsite_system_monitor',

Expand Down

0 comments on commit 7b1b6cf

Please sign in to comment.