Resolve merge conflicts with master branch#16

Closed

Holzhaus wants to merge 485 commits intoferranpujolcamins:migrate-to-QJSEnginefrom Holzhaus:migrate-to-QJSEngine

+25,964-8,841

This pull request is big! We're only showing the most recent 250 commits

Commits on Apr 6, 2020

Commits on Apr 7, 2020

re-sync recording state and GUI after (re)loading a skin
ronso0
committed
Recording: split up info labels, add skin styles
ronso0
committed
delay loading Analysis table until it's shown
ronso0
committed
Merge branch 'master' of github.com:mixxxdj/mixxx into cleanup-fixes
Holzhaus
committed
mixxx: Only destroy StatsManager singleton if it has been created
Holzhaus
committed
util/singleton: Add some debug assertions
Holzhaus
committed
Merge pull request mixxxdj#2394 from Be-ing/remove_script_tab
Holzhaus
authored
Merge branch 'master' of github.com:mixxxdj/mixxx into controller-fixes-part2
Holzhaus
committed
controllers/midi/midimessage: Use desc in MidiInputMapping == operator
Holzhaus
committed
controllers/midi/midimessage: Fix MidiInputMapping == operator
Holzhaus
committed
controllers/controllermanager: Add "(edited)" suffix to changed presets
Holzhaus
committed
controllers: Add some comments to undocumented classes
Holzhaus
committed
controllers/controllermanager: Remove obsolete importScript method
Holzhaus
committed
controllers: Always load scripts from mapping dir (with system as fallback)
Holzhaus
committed
controllers/dlgprefcontroller: Add "(built-in)" to system scripts
Holzhaus
committed
Merge pull request mixxxdj#2623 from Holzhaus/cleanup-fixes
uklotzde
authored
Merge pull request mixxxdj#2633 from Be-ing/update_hidapi
Be-ing
authored
controllers: Move script file search code into ControllerPreset class
Holzhaus
committed
Merge pull request mixxxdj#2625 from ronso0/latenight-mic-label
uklotzde
authored
controllers/controllerpreset: Remove leftover qDebug() statement
Holzhaus
committed
controllers/controllerpresetfilehandler: Use for loop instead of foreach
Holzhaus
committed
update macOS build environment to Qt 5.14.2
Be-ing
committed
Added Evan Dekker to the contributor list in the about box. Thank you very much.
daschuer
committed
Added Edward Kigwana to the contributor list in the about box, Thank you very much.
daschuer
committed
Added Simon Harst to the contributor list in the about box. Tank you very much.
daschuer
committed
controllers: Move controller script file handling to FileHandler classes
Holzhaus
committed

Commits on Apr 8, 2020

Commits on Apr 9, 2020

Commits on Apr 11, 2020

Commits on Apr 12, 2020

Commits on Apr 13, 2020

Commits on Apr 14, 2020

Commits on Apr 15, 2020

Commits on Apr 16, 2020

Commits on Apr 17, 2020