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

Merge master into javafx branch #1377

Merged
merged 142 commits into from
May 10, 2016
Merged

Merge master into javafx branch #1377

merged 142 commits into from
May 10, 2016

Conversation

tobiasdiez
Copy link
Member

<describe the changes you have made here: what, why, ...>

  • Change in CHANGELOG.md described
  • Tests created for changes
  • Screenshots added (for bigger UI changes)

tobiasdiez and others added 30 commits April 19, 2016 15:41
@tobiasdiez
Implement JabRef#1233: group side pane fills space
ac93ee0
@tobiasdiez
Remove shrink/expand buttons in group pane
d48c175
@simonharrer
Fix JabRef#1091 apply and ensure correct import sort order (JabRef#1229)
34f900a
@tobiasdiez
Merge pull request JabRef#1236 from tobiasdiez/groupFill
4fa6324 
Group pane automatically takes up remaning space in side pane
@oscargus @simonharrer
Removed leftovers from option to edit in table cells (JabRef#1240)
990b0e5
@oscargus
Added integrity checker to detect HTML encoded characters in fields (J…
d7aa242 
…abRef#1238)
@stefan-kolb
Fixes JabRef#1234 Trigger entry update explicitly
2e5be6d
@stefan-kolb
Rename private method
0ea7781
@stefan-kolb
Merge branch 'master' of https://github.com/JabRef/jabref
86fd38e
@oscargus
Fixed so the resulting type does not become Misc when merging two ent…
094f11d 
…ries with identical types (JabRef#1244)
@stefan-kolb
Changelog
8ea1202
@stefan-kolb
Directly set the value on the entry and hope for a good event propaga…
5e1ce66 
…tion...
@tobiasdiez
Replace general get/put/remove metadata calls with typed versions
625d17d
@matthiasgeiger
Merge pull request JabRef#1243 from JabRef/fix-1234
ea64bba 
Fixes JabRef#1234 Trigger entry update explicitly
@melTr
Small errors
294a788
@tobiasdiez
Merge pull request JabRef#1259 from melTr/patch-3
5279406 
Fix small errors in French language file
@tobiasdiez
Merge pull request JabRef#1250 from tobiasdiez/groupAutomatic
863a9fc 
Replace general get/put/remove metadata calls with typed versions
@tobiasdiez
Remove some unused code in ImportInspector
1422db7
@tobiasdiez
Merge pull request JabRef#1262 from tobiasdiez/metadataTyped
b2c9689 
Remove some unused code in ImportInspector
@stefan-kolb
Fix JabRef#1268 Canceling an import into current/new database still t…
3f160e8 
…riggers an import
@oscargus
Improved integrity check dialog
8a031fa
@simonharrer
Create tests to fix JabRef#473 (JabRef#1269)
34494bb 
* Fix JabRef#473
* Remove MySQL and PostgreSQL file export
* obsolete keys are printed in exception message
@tobiasdiez @simonharrer
Cleanup now uses active preferences (JabRef#1261)
1fde2f0 
* Pass JabRefPreferences to panes via constructor

* Cleanup process now uses current preferences
@hakova
Updated jabref_tr.properties
9029541 
Translated the newest entries to Turkish
@matthiasgeiger
Merge pull request JabRef#1274 from hakova/patch-9
aeac25b 
Updated jabref_tr.properties
@koppor
Syntaxfix
ea62aae 
[ci skip]
@tobiasdiez
Entries are no longer saved in ExplictGroup
8a9cec3
@tobiasdiez
Convert old ExplicitGroups to new format
96cec57
@tobiasdiez
Add Changelog and modify translations
744c296
@tobiasdiez
Tried to fix JabRef#1251, but all tests pass (JabRef#1278)
f248162
simonharrer and others added 28 commits May 9, 2016 14:56
@simonharrer
Update .travis.yml
a989638
@simonharrer
Fix JabRef#1302: Create codecov yml based on suggestion from codecov.io
2da1c98
@simonharrer
Fix JabRef#1327: PDF cleanup retains order of linked files
e34be5a
@simonharrer
Remove unused import
56e3c4c
@simonharrer
Minor improvements
1f5d843
@simonharrer
Fix JabRef#1122: Groups highlighting is enabled by default now
c040f5b
@tobiasdiez
Normalize page cleanup also replaces em dash (JabRef#1348)
c1d1069
@simonharrer
Use Objects.equals
57d90d1
@simonharrer
Use Map.putIfAbsent
4223bc6
@simonharrer
Use lambdas instead of anonymous classes
3b0d38e
@simonharrer
Use lambdas instead of anonymous methods
8d6305e
@simonharrer
More refactorings
d9bfbbf
@simonharrer
More refactorings
e5ac61c
@simonharrer
Fix JabRef#1313
9442498
@simonharrer
Revert "Fix JabRef#1313"
4ece35b 
This reverts commit 9442498.
@simonharrer @tobiasdiez
Fix JabRef#1313: Remove UI as the checkbox is no longer backed by a c…
dd96a7b 
…onfig option (JabRef#1369)
@chochreiner @stefan-kolb
Preliminary fix for JabRef#1340 (JabRef#1344)
8de514a
@stefan-kolb
Fix link
8cb3b25
@simonharrer
Removed possibility to automatically add braces via Option - Preferen… (
34fbe76 
JabRef#1368)

* Removed possibility to automatically add braces via Option - Preferences - File - Store the following fields with braces around capital letters. Please use save actions instead for adding braces automatically.

* Remove unused imports
@stefan-kolb
Win install (JabRef#1367)
0b55a7f 
* Resolves JabRef#1364 Windows: install to APPDATA directory for non-admin users
@simonharrer
Add integrity check detecting booktitles ending with "conference on" … (
b512d96 
JabRef#1287)

* Add integrity check detecting booktitles ending with "conference on" which is a typical error upon downloading .bib entries from the web
* Script to remove any annoying git markers
* Fix issue with dash instead of underscore in l10n key
@simonharrer
Merge branch 'integritycheckdialog' of github.com:oscargus/jabref int…
1493330 
…o oscargus-integritycheckdialog
@simonharrer
Merge branch 'oscargus-integritycheckdialog'
4f1f07d
@simonharrer
Better integrity check: allow single dash for biblatex users in the p…
2e13dca 
…ages field
@simonharrer
Fix JabRef#1365: Default label pattern back to "[auth][year]"
50fe6d7
@chriba
fix-796
e35766d
@simonharrer
Merge pull request JabRef#947 from bartsch-dev/fix-796
5e257cc 
Fix for undoing deletion/cutting multiple entries
@tobiasdiez
Merge master
86fdb4d
@tobiasdiez tobiasdiez merged commit 3fe2645 into JabRef:javafx May 10, 2016
@tobiasdiez tobiasdiez deleted the mergeMaster branch May 10, 2016 22:12
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.