Skip to content

merge master into ui_consistency_polish#1

Closed
calixtus wants to merge 43 commits into
calixtus:ui_consistency_polishfrom
JabRef:master
Closed

merge master into ui_consistency_polish#1
calixtus wants to merge 43 commits into
calixtus:ui_consistency_polishfrom
JabRef:master

Conversation

@calixtus

Copy link
Copy Markdown
Owner

Somethings not working right with git, cannot merge BibTexMLImporterTestArticle2.bib

Ka0o0 and others added 30 commits December 11, 2019 17:48
Fix #2868 - keep source groups selected after drag and drop
* Travis integration

* Bugfix for issue 5037: made several methods on JabRefGUI and second position Variables in JabRefPreferences to support bugfix

* made comments and corrected Checkstyle

* added my change/bugfix to Changelog

* removed .travis.yml

* made suggested Changes from tobiasdiez

* replaced JabrefPreferences with mainStage at printWindowState(), renamed method testExternalCoordinates with isWindowPositionOutOfBounds(), Deleted unused Variables at JabrefPreferences due to a correction in openWindow (at JabRefGUI)
* Changes string representation in ImportCustomEntryTypesDialog and removes unnecessary label on ImportCustomEntryTypesDialog.fxml

* updates CHANGELOG.MD
* New translations JabRef_en.properties (French)

* New translations JabRef_en.properties (Spanish)

* New translations JabRef_en.properties (Greek)

* New translations JabRef_en.properties (Polish)

* New translations JabRef_en.properties (Turkish)

* New translations JabRef_en.properties (Tagalog)

* New translations JabRef_en.properties (Swedish)

* New translations JabRef_en.properties (Spanish)

* New translations JabRef_en.properties (Russian)

* New translations JabRef_en.properties (Portuguese, Brazilian)

* New translations JabRef_en.properties (Portuguese)

* New translations JabRef_en.properties (Persian)

* New translations JabRef_en.properties (Japanese)

* New translations JabRef_en.properties (Italian)

* New translations JabRef_en.properties (Indonesian)

* New translations JabRef_en.properties (German)

* New translations JabRef_en.properties (French)

* New translations JabRef_en.properties (Dutch)

* New translations JabRef_en.properties (Danish)

* New translations JabRef_en.properties (Chinese Simplified)

* New translations JabRef_en.properties (Norwegian)

* New translations JabRef_en.properties (Vietnamese)
Co-authored-by: Julien Bénard
Co-authored-by: Lucas Beretti
Co-authored-by: Venceslas Roullier
* Update changelog for 5.0-beta

* Release v5.0-beta

* Fix Version number to 5.0.1

* Set dev to false on tag builds

* i suck...

* wertzhujiklö

* evaluate the dev property

* Fix Unreleased link in CHANGELOG.md (and fix order of link list)

* Fix release date

* Trigger build with tag

* Try ?? to get patch when releasing

* Correct release date

* Update GitVersion.yml
* New translations JabRef_en.properties (Turkish)

* New translations JabRef_en.properties (Spanish)

* New translations JabRef_en.properties (Japanese)

* New translations JabRef_en.properties (German)

* New translations JabRef_en.properties (French)
calixtus and others added 12 commits December 16, 2019 18:13
* Reworked persistent column sort order

* Fixes storing of the correct value

* Refactored for simplicity, fixed hardwired icon-column width, added JavaDoc, added test

* Fixed some comments and added entry in CHANGELOG.md

* Spelling

* Changed datatype in migragtions, added comment

* Refactored ICON_COLUMNS from ArrayList to EnumSet
Has been integrated now in jdk14
Bumps [classgraph](https://github.com/classgraph/classgraph) from 4.8.58 to 4.8.59.
- [Release notes](https://github.com/classgraph/classgraph/releases)
- [Commits](classgraph/classgraph@classgraph-4.8.58...classgraph-4.8.59)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Bumps [mockito-core](https://github.com/mockito/mockito) from 3.2.0 to 3.2.4.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v3.2.0...v3.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Various fixes to the dark theme

* Removed not working fix

* CHANGELOG.md

* Finetuning groupColumnRegion
* Dismiss changes hides change message

* Show added entries in change dialog

* Improve message when current value is null

* Remove unused reference file

* Apply post-load actions before comparing with currently load database
- wait between calls to avoid 403
- remove assertion of entry not returned anymore
@calixtus calixtus closed this Dec 21, 2019
calixtus pushed a commit that referenced this pull request Jul 30, 2020
… CSS file, started on import functionality
calixtus pushed a commit that referenced this pull request Jul 30, 2020
calixtus pushed a commit that referenced this pull request Jul 30, 2020
calixtus pushed a commit that referenced this pull request Jul 30, 2020
calixtus pushed a commit that referenced this pull request Jul 30, 2020
calixtus pushed a commit that referenced this pull request Jul 30, 2020
calixtus pushed a commit that referenced this pull request Jul 30, 2020
calixtus added a commit that referenced this pull request Aug 31, 2020
* feat/#1 Add CSS file type, add button in preferences to import custom CSS file, started on import functionality

* feat/#1 Change so that the log messages uses format specifiers instead of string concatenation

* feat/#1 Add RadioButton for toggling custom theme

* feat/#1 Add preference for setting path to custom CSS theme

* feat/#1 Load custom CSS if toggled

* feat/#1 Add missing language keys

* feat/#1 Remove check if current theme is applied again, check is remove since we don't need it

* feat/#1 Save path to custom CSS file in program preferences

* Add functionality to let the user import custom CSS file JabRef#5790

* Add CSS file type, add button in preferences to import a custom CSS file, started on import functionality

* Change so that the log uses format specifiers instead of string concatenation

* Add RadioButton for toggling custom theme

* Add preference for setting the path to custom CSS theme

* Load custom CSS if toggled

* Add missing language keys

* Remove check if the current theme is applied again, the check is removed since we don't need it

* Save path to the custom CSS file in program preferences

* fix/#5 Add checks so that the theme change notification is only shown once, disable custom theme radio button i no custom theme has been imported

* Remove added stuff from merge conflict

* Add export current theme JabRef#5790

* Add method for saving theme to file

* Add modal for selection witch theme to export as CSS

* Add missing language lines

* Add information about import/export of themes, JabRef#5790

* Fix CodaCy and checkstyle issues, JabRef#5790

* Add fixes from code review, JabRef#5790

* Remove unused import JabRef#5790

* Move the import/export buttons to the Appearance tab JabRef#5790

* Fixed merge errors

* Fixed easy remarks

* Introduced AppereancePreferences and changed some visual elements

* Refactored ExportThemeDialog

* Fixed merge error

* Removed export theme logic and added validation

* CHANGELOG.md

* Removed obsolete viewmodel class

* Refactored io.File to nio.Path, use of JabRefPreferences and removed vmOption

* Refactored ThemeLoader object class to enum with static util methods

* Fixed overlooked merge error

* Refactored static methods to object methods

* Checkstyle

Co-authored-by: Nils Streijffert <nils.streijffert@gmail.com>
Co-authored-by: Christoph <siedlerkiller@gmail.com>
calixtus pushed a commit that referenced this pull request Nov 15, 2022
…ubgroups (JabRef#9286)

* Closes issue #1, opens issues #3, #4

* Adjusted removeGroupNoSubgroups to keep consistent with other removeGroup__ methods

* Update context menu each time it is opened, to reflect any changes that may have been made to subgroups
Adjusted removeSubgroups.setOnAction to be consistent with other action events

* Update CHANGELOG.md

* Removed "Remove subgroups" and "Sort subgroups" options when no subgroups present

* Removed context submenu addition from event listener

* Fixed JavaDoc for removeGroupNoSubgroups

* Added remove text to language file

* Fixed popup when deleting group with no subgroups

Co-authored-by: Christoph <siedlerkiller@gmail.com>
calixtus pushed a commit that referenced this pull request Mar 27, 2023
calixtus pushed a commit that referenced this pull request Mar 27, 2023
Don't accept the pull request and start the testing when password changes
have been implemented.
calixtus pushed a commit that referenced this pull request Mar 27, 2023
calixtus pushed a commit that referenced this pull request Mar 27, 2023
calixtus pushed a commit that referenced this pull request Mar 27, 2023
calixtus pushed a commit that referenced this pull request Mar 27, 2023
(Feat): #1 Added test for storage of proxy preferences
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants