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

RDMO 2.2.0 #878

Draft
wants to merge 34 commits into
base: main
Choose a base branch
from
Draft

RDMO 2.2.0 #878

wants to merge 34 commits into from

Conversation

jochenklar
Copy link
Member

No description provided.

@coveralls
Copy link

coveralls commented Dec 12, 2023 •
edited

Coverage Status

coverage: 91.479% (-0.1%) from 91.591%
when pulling 14a8038 on dev-2.2.0
into c945d7d on main.

@jochenklar
Copy link
Member Author

Rebased to 2.1.1.

@MyPyDavid
Copy link
Member

rebased to 2.1.2 at 2dbdb49

@MyPyDavid
Copy link
Member

MyPyDavid commented Jan 18, 2024 •
edited

rebased to main at 14f94ed but a test is failing needed to re-run

test:

FAILED rdmo/projects/tests/test_viewset_project_snapshot.py::test_delete[7-1-guest-guest] - assert False

  • where False = <bound method Path.exists of PosixPath('/home/runner/work/rdmo/rdmo/testing/media_root/projects/1/values/238/rdmo-logo.svg')>()
    "config.settings">.MEDIA_ROOT

leucoryx and others added 21 commits February 28, 2024 09:09
@leucoryx
Update about_text_de.html
20f0f9d
@leucoryx
Update about_text_en.html
0fc2326
@Zack-83
Update home_text_de.html
de53126
@Zack-83
Update rdmo/core/templates/core/about_text_de.html
779fe14
localisation
5aacc1a
@jochenklar
Merge pull request #922 from leucoryx/patch-4
5b18950 
Update about_text_de.html
@jochenklar
Merge pull request #921 from leucoryx/patch-5
e41403c 
Update about_text_en.html
@Zack-83
Merge branch 'update_texts' into patch-4
0609fae
@Zack-83
Update rdmo/core/templates/core/about_text_en.html
480cd86
@Zack-83
Apply suggestions from code review
722710b
@Zack-83
Localisation
c99760f 
Patch 4
@mia-lgo
Update about_text_es.html
8361b16
@mia-lgo
Update footer_text_es.html
01400c6
@mia-lgo
Update home_text_es.html
64bc05e
@jochenklar
Fix export links in management, again (#915)
ea80fd2
@jochenklar
Remove local hosts from ALLOWED_HOSTS settings (#918)
6e3fcba
@jochenklar
Fix edit component for page and question set (#944)
d89ba8a
@MyPyDavid
feat: add simple view tag render_custom_inline_list
bb7acb8 
Co-authored-by: @jwindeck
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
@jochenklar
Fix whitespace
ae4086d
@jochenklar
Merge pull request #924 from rdmorganiser/update_texts
0f47522 
Update texts
@jochenklar
Merge pull request #945 from rdmorganiser/fix_export_link
7a60337 
Fix export links in management, again
jochenklar and others added 12 commits May 14, 2024 16:37
@jochenklar
Remove ALLOWED_HOSTS from settings
b3fb5f1
@jochenklar
Merge pull request #946 from rdmorganiser/update_settings
0b8c41e 
Remove local hosts from ALLOWED_HOSTS settings
@jochenklar
Merge pull request #947 from rdmorganiser/fix_page_management
f654664 
Fix edit component for page and question set (#944)
@MyPyDavid
fix: rename to catalog_section #977
cf6f4dc 
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
@MyPyDavid
tests: add initial tests for project navigation #977
47a504e 
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
@MyPyDavid
fix typo: rename uriPrefix to uri_prefix in Attributes.js
473da96 
Signed-off-by: David Wallace <david.wallace@tu-darmstadt.de>
@Zack-83
Second trial with zip() and join()
ce6532a
@jochenklar
Add ORCID icon/link to membership list in project
90ac678
@jochenklar
Fix join_values_inline
c1d86b6
@jochenklar
Fix ProjectDetailView if SOCIALACCOUNT is not enabled
dc48882
@jochenklar
Merge pull request #960 from rdmorganiser/feat-views-template-tags
c6a09a7 
Add a simple_tag for views to render a list of values
@jochenklar
Merge pull request #905 from rdmorganiser/orcid_integration
14a8038 
Add ORCID icon/link to membership list in project
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.

None yet
6 participants
@jochenklar @coveralls @MyPyDavid @leucoryx @Zack-83 @mia-lgo