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

Preprint merge #2345

Merged
merged 271 commits into from
Dec 7, 2021
Merged

Preprint merge #2345

merged 271 commits into from
Dec 7, 2021

Conversation

ajrbyers
Copy link
Member

Merges the Repository branch into master.

ajrbyers added 30 commits June 25, 2020 13:24
@ajrbyers
Added accesses to admin.
99c625b
@ajrbyers
Updated models for displaying metrics.
643d48b
@ajrbyers
Updated author decorator.
f207645
@ajrbyers
Updated author_article view. Not finished yet but WIP.
8b27b70
@ajrbyers
Added About page.
10fbfb1
@ajrbyers
First pass at manager page.
223f6e0
@ajrbyers
Display additional fields on metadata blocks.
03a4849
@ajrbyers
Fixed is_article_preprint_editor decorator.
591fdd4
@ajrbyers
Updated preprints_manager_article url.
393f585
@ajrbyers
Updated preprints submission transactional email.
6e19cb2
@ajrbyers
Created an metadata_form element
5e8033c
@ajrbyers
Added edit metadata view/url/stuff.
40f1655
@ajrbyers
Added help text to formset.
43d8285
@ajrbyers
More work on the manager page.
3693659
@ajrbyers
YAY! THIS IS A USEFUL COMMIT MESSAGE.
4b58aa4 
Fixes file upload and mime-type setting. Also fixes handle_delete_version.
@ajrbyers
Set file size on save.
2010d78
@ajrbyers
Adding migrations
e01a0df
@ajrbyers
Added to workflow.
15d8b49
@ajrbyers
Updated some display elements.
5c1c083
@ajrbyers
Reset migrations.
a77c1cf
@ajrbyers
Completes last commit.
67d19f1
@ajrbyers
Added a new generic site_url tag.
c2f84e7
@ajrbyers
Added some tweaks to repo models.
4e1339f
@ajrbyers
Moved tree.js to correct location.
ccdd9ee
@ajrbyers
If a repo has no logo, display its name.
9c0301f
@ajrbyers
Added repository settings file.
f14f8a8
@ajrbyers
Reset migrations. Notification now works.
fd56eb1
@ajrbyers
Fix publication event raise.
f0ec3cc
@ajrbyers
Fixes contact link.
48fe176
@ajrbyers
Moved notification template.
8633547
@ajrbyers ajrbyers requested a review from mauromsl October 11, 2021 11:49
@ajrbyers
Copy link
Member Author

There are some conflicts to resolve here.

ajrbyers and others added 10 commits October 11, 2021 12:54
@ajrbyers
Merge branch 'master' into preprint-merge
f05fb21
@tingletech
merge migraions after master merged to preprint-merge
c340dfa
@tingletech
'block' tag with name 'css' appears more than once
68593d9 
django.template.exceptions.TemplateSyntaxError:
@ajrbyers
Added manager order and delete views.
1fd47be
@hardyoyo
Move call for ON_WORKFLOW_ELEMENT_COMPLETE to follow article.save
20aba57 
In submit_review, raise the event for ON_WORKFLOW_ELEMENT_COMPLETE to
immediately after the article.save, to avoid a possible race condition
which might cause an article to be in the review queue but without an
entry in the workflowlog.

Fixes #2515
@hardyoyo
reduce number of columns in header for DOIs on author_article template
230e042
@ajrbyers
Fixed event kwargs for ON_PREPRINT_PUB
26767d0
@tingletech
add a full_name to preprint.Author
a24011d 
fixes #2528
@alainna
author->acct last name update
767ad2d 
preprint author last name field should go to account last name field
@tingletech
use first.full_name rather than all.0.author.full_name
f61f00c 
fixes #2575
ajrbyers
ajrbyers commented Nov 10, 2021
View reviewed changes
@ajrbyers
Copy link
Member Author

test this please

mauromsl
mauromsl requested changes Nov 16, 2021
View reviewed changes
@ajrbyers
Copy link
Member Author

In discussion with @mauromsl we agreed that a test for the repo site should be added to make sure the pres/journal/repo domain/path middleware is operating as expected.

@ajrbyers ajrbyers merged commit ee4714c into master Dec 7, 2021
@ajrbyers ajrbyers deleted the preprint-merge branch December 7, 2021 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mauromsl mauromsl mauromsl requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ajrbyers @mauromsl @hardyoyo @tingletech @myucekul @justingonder @alainna