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

Architecture fix by re-sorting the classes #6825

Merged
merged 18 commits into from
Sep 2, 2020
Merged

Architecture fix by re-sorting the classes #6825

merged 18 commits into from
Sep 2, 2020

Conversation

tobiasdiez
Copy link
Member

@tobiasdiez tobiasdiez commented Aug 31, 2020 •
edited
Loading

To be merged after JabCon. Fixes #6697

  • Change in CHANGELOG.md described (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked documentation: Is the information available and up to date? If not created an issue at https://github.com/JabRef/user-documentation/issues or, even better, submitted a pull request to the documentation repository.

@tobiasdiez tobiasdiez mentioned this pull request Sep 1, 2020
Closed
5 tasks
@tobiasdiez
Move stuff and change tests
9012653
@tobiasdiez
Merge branch 'master' of https://github.com/JabRef/jabref into archFix
6b21fb9 
� Conflicts:
�	src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
�	src/main/java/org/jabref/preferences/JabRefPreferences.java
@tobiasdiez
Fix build
1ae6c30
@github-actions
Copy link
Contributor

github-actions bot commented Sep 1, 2020

The JabRef maintainers will add the following name to the AUTHORS file. In case you want to use a different one, please comment here and adjust your name in your git configuration for future commits.

m-mauersberger

@tobiasdiez tobiasdiez marked this pull request as ready for review September 1, 2020 23:37
@github-actions
Copy link
Contributor

github-actions bot commented Sep 2, 2020

The JabRef maintainers will add the following name to the AUTHORS file. In case you want to use a different one, please comment here and adjust your name in your git configuration for future commits.

chenyuheng

@tobiasdiez tobiasdiez added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Sep 2, 2020
@koppor koppor merged commit 1b35f8c into master Sep 2, 2020
@koppor koppor deleted the archFix branch September 2, 2020 11:40
@koppor koppor mentioned this pull request Sep 2, 2020
Merged
Siedlerchr added a commit that referenced this pull request Sep 2, 2020
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into writebackupToTemp
d1f9c3b 
* upstream/master:
  Arch fix (#6825)
@koppor koppor changed the title Arch fix Architecture fix by re-sorting the classes Sep 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@koppor koppor koppor approved these changes

Assignees
No one assigned
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Failing architecture tests
2 participants
@tobiasdiez @koppor