summaryrefslogtreecommitdiffstats
path: root/res
AgeCommit message (Collapse)Author
2020-05-10Merge remote-tracking branch 'upstream/2.2' into 2.3Be
2020-05-10Update browsing through library to use new controlsFayaaz Ahmed
2020-05-10Roland DJ-505: Remove explicit master supportJan Holthuis
Explicit master is currently not working correctly. Until this has been fixed, the support for it is removed from this mapping to prevent users from activating it by mistake. Zulip Discussion: https://mixxx.zulipchat.com/#narrow/stream/109171-development/topic/explicit.20master.20behavior/near/196993295
2020-05-06Fix Shade first talkover button. It has no number suffix due to legacy resons.Daniel Schürmann
2020-05-05fr_FR kbd cfg : Fix Chan2 - hotclue_4 & loop_outd-j-a-y
2020-05-03Merge pull request #2711 from esbrandt/2.3-string-updateDaniel Schürmann
2.3 string update
2020-05-03Merge pull request #2619 from ronso0/play-indicatorsDaniel Schürmann
Skins :: separate play button / play_indicator + related improvements
2020-05-02Merge branch 'master' into stacked-layout-fixronso0
2020-04-30i18: Pull latest translations from ↵S.Brandt
https://www.transifex.com/mixxx-dj-software/mixxxdj/mixxx2-3/. Compile QM files out of TS files that are used by the localized app
2020-04-30i18n: Add Maori (mi-NZ) to the list of available languagesS.Brandt
2020-04-30i18n: Update translation template. Found 2518 source text(s) (2 new and 2516 ↵S.Brandt
already existing). Removed 3 obsolete entries
2020-04-30i18: Pull latest translations from ↵S.Brandt
https://www.transifex.com/mixxx-dj-software/mixxxdj/mixxx2-3/. Compile QM files out of TS files that are used by the localized app
2020-04-30Merge remote-tracking branch 'upstream/master' into 2.3-string-updateS.Brandt
2020-04-28Use btn_beatloop for effects, since the hotcue button is now transparentDaniel Schürmann
2020-04-28Fix various typosluz.paz
Found via codespell v1.17.0.dev0 ``` codespell -q 3 -S *.ts,*.po,*.rtf,./.git,./src/library,./lib,./build/wix -L ba,chang,ect,everytime,german,hace,iff,jus,ith,lokal,nd,ons,pevent,pparent,preverse,seeked,sheat,sinc,splitted,substract,thru,tim,uint ```
2020-04-28Roland DJ-505: Update for explicit sync_master change from #2376Jan Holthuis
2020-04-25Merge pull request #2647 from ronso0/tango-remove-classicJan Holthuis
Tango: ClubTwist theme is default, remove Classic theme
2020-04-25i18: Pull latest translations from ↵S.Brandt
https://www.transifex.com/mixxx-dj-software/mixxxdj/mixxx2-3/. Compile QM files out of TS files that are used by the localized app
2020-04-25Update translation template. Found 2519 source text(s) (180 new and 2339 ↵S.Brandt
already existing). Removed 135 obsolete entries
2020-04-23Merge pull request #2685 from Be-ing/remove_colormapper_string_hackBe
ColorMapperJSProxy: remove hack for using strings as keys
2020-04-22Merge pull request #2322 from ronso0/components-fx-focus-feedbackBe
add 'has_controller_focus' control to midi-components Fx mapping
2020-04-22Merge remote-tracking branch 'upstream/2.2'Be
2020-04-22Reduced sensitivity of jog pitch bendJorge Marcos
The default jog sensitivity is too high, this should be closer to the default Serato behaviour (so it has a better response and is easier to beatmatch with).
2020-04-21common-controller-scripts.js: fix unresolved merge conflictBe
2020-04-21Merge remote-tracking branch 'upstream/2.2'Be
2020-04-20Tango: fix width of HeadMix sliderronso0
2020-04-19ColorMapperJSProxy: remove hack for using strings as keysBe
Keys must be JS numbers.
2020-04-18Merge branch 'master' of github.com:mixxxdj/mixxx into ↵Jan Holthuis
track-colors-from-controller
2020-04-17Merge pull request #2594 from Swiftb0y/tapButtonFixJan Holthuis
Fixed bpm.tapButton in common-controller-script.js
2020-04-17add controller focus control to effectchainslot & componentsronso0
2020-04-17Merge pull request #2612 from hacksdump/context-menuBe
Quick action context menu for WTrackProperty
2020-04-16Merge branch 'master' of github.com:mixxxdj/mixxx into ↵Jan Holthuis
track-colors-from-controller
2020-04-15Merge branch 'master' into play-indicatorsronso0
2020-04-15Merge pull request #2616 from ronso0/passthrough-coverJan Holthuis
show Passthrough cover on track overview
2020-04-15Tango: use green for Deck 3/4 text labels and waveform backgroundsronso0
2020-04-15Merge remote-tracking branch 'mixxx/master' into tango-remove-classicronso0
2020-04-15Merge pull request #2611 from ronso0/skin-descriptionJan Holthuis
Show Skin description in Pref > Interface
2020-04-15update skin descriptions & skin version numbersronso0
2020-04-15Tango: remove Passthrough hint from VC toggle & Play buttonronso0
2020-04-15passthrough cover: add default & skin stylesronso0
2020-04-15Merge pull request #2598 from ronso0/no-focus-lib-feature-buttonsJan Holthuis
disallow focusing library feature buttons with Tab
2020-04-15Merge pull request #2632 from ronso0/searchbox-fixesJan Holthuis
Searchbox fixes
2020-04-15Merge pull request #2628 from ronso0/lib-button-statesJan Holthuis
fix GUI states of Library feature buttons
2020-04-12Merge branch 'master' into context-menuHarshit Maurya
2020-04-11WTrackMenu: add Shade styleHarshit Maurya
2020-04-11WTrackMenu: add LateNight styleHarshit Maurya
2020-04-10Tango: ClubTwist theme is default, remove Classic themeronso0
2020-04-10remove stacked layout workarounds from skinsronso0
2020-04-10WTrackMenu: add Deere styleHarshit Maurya
2020-04-10WTrackMenu: fix Tango styleHarshit Maurya