Code

Nested crates#1304

Code

Closed

gramanas wants to merge 48 commits intomixxxdj:jmigual-library-redesignmixxxdj/mixxx:jmigual-library-redesignfrom gramanas:NestedCratesgramanas/mixxx:NestedCratesCopy head branch name to clipboard

+2,446-1,063

Commits

Commits on Jun 7, 2017

• Add cratetreemodel.h

  gramanas

  committed
  f3ad479

  Copy full SHA for f3ad479

Commits on Jun 15, 2017

• Merge branch 'jmigual-library-redesign' of https://github.com/daschuer/mixxx into NestedCrates

  gramanas

  committed
  1fba5bc

  Copy full SHA for 1fba5bc

Commits on Jun 20, 2017

• Nested Crate Insertion with bad code

  gramanas

  committed
  3c09995

  Copy full SHA for 3c09995

• Merge branch 'jmigual-library-redesign' of https://github.com/daschuer/mixxx into NestedCrates

  gramanas

  committed
  1635ac3

  Copy full SHA for 1635ac3

Commits on Jul 5, 2017

• Add nested crates

  Show description for 2720d6c
  gramanas

  committed
  2720d6c

  Copy full SHA for 2720d6c

Commits on Jul 6, 2017

• Disguise sql columns as variables

  gramanas

  committed
  f3e474f

  Copy full SHA for f3e474f

• Merge branch 'jmigual-library-redesign' of https://github.com/daschuer/mixxx into NestedCrates

  gramanas

  committed
  bc97923

  Copy full SHA for bc97923

Commits on Jul 7, 2017

• Add 'Add new crate' that adds a crate to the top level

  gramanas

  committed
  8242c67

  Copy full SHA for 8242c67

Commits on Jul 15, 2017

• Merge branch 'jmigual-library-redesign' of https://github.com/mixxxdj/mixxx into NestedCrates

  gramanas

  committed
  596df84

  Copy full SHA for 596df84

Commits on Jul 16, 2017

• Move hierarchy functions into CrateHierarchy

  gramanas

  committed
  8d187b5

  Copy full SHA for 8d187b5

• Split CrateStorage file

  gramanas

  committed
  7cf56f3

  Copy full SHA for 7cf56f3

• Moved crateHierarchy to crateStorage

  Show description for f9946ec
  gramanas

  committed
  f9946ec

  Copy full SHA for f9946ec

Commits on Jul 18, 2017

• Merge branch 'jmigual-library-redesign' of https://github.com/mixxxdj/mixxx into NestedCrates

  gramanas

  committed
  d137704

  Copy full SHA for d137704

Commits on Jul 19, 2017

• Fix small mistakes and typos

  gramanas

  committed
  1d48fa5

  Copy full SHA for 1d48fa5

Commits on Jul 23, 2017

• Refactor CrateStorage

  Show description for 5587e1c
  gramanas

  committed
  5587e1c

  Copy full SHA for 5587e1c

Commits on Jul 27, 2017

• Select crates usinc the crate filter

  gramanas

  committed
  06d9cbe

  Copy full SHA for 06d9cbe

• First attempt at a recursive crate select via filter

  gramanas

  committed
  bf5cd72

  Copy full SHA for bf5cd72

Commits on Jul 29, 2017

• Duplicate crate, small fixes and typos, privacy at crateHierarchy

  Show description for 9948c55
  gramanas

  committed
  9948c55

  Copy full SHA for 9948c55

Commits on Jul 31, 2017

• Rename now avaliable. Fix typos

  Show description for 6fa0f83
  gramanas

  committed
  6fa0f83

  Copy full SHA for 6fa0f83

Commits on Aug 1, 2017

• insertCrate is now the only thing gui knows when inserting a crate

  gramanas

  committed
  add5459

  Copy full SHA for add5459

Commits on Aug 4, 2017

• Add recursive deletion, no filter in crate select anymore

  gramanas

  committed
  b0ca91d

  Copy full SHA for b0ca91d

• Toggle recursion in crate selection + small fixes

  gramanas

  committed
  6a7ac10

  Copy full SHA for 6a7ac10

Commits on Aug 5, 2017

• Fix bug with crateSelect, typos & small fixes

  gramanas

  committed
  9d74122

  Copy full SHA for 9d74122

• More small changes

  gramanas

  committed
  d380b51

  Copy full SHA for d380b51

Commits on Aug 7, 2017

• Fix renaming issue and small changes

  gramanas

  committed
  f2fc75a

  Copy full SHA for f2fc75a

• Introduce new more stable crate filter

  Show description for e7f6781
  gramanas

  committed
  e7f6781

  Copy full SHA for e7f6781

Commits on Aug 9, 2017

• RichtClick > add to crate on a track now shows paths, fix filter bug

  gramanas

  committed
  5f3daab

  Copy full SHA for 5f3daab

Commits on Aug 12, 2017

• Add crate summary

  gramanas

  committed
  82c3d45

  Copy full SHA for 82c3d45

Commits on Aug 15, 2017

• small code cleanup

  gramanas

  committed
  3bdecdb

  Copy full SHA for 3bdecdb

Commits on Aug 20, 2017

• Change naming conventions to work more like a file system

  Show description for 774ba58
  gramanas

  committed
  774ba58

  Copy full SHA for 774ba58

• Merge branch 'NestedCrates' of https://github.com/gramanas/mixxx into NestedCrates

  gramanas

  committed
  79ee638

  Copy full SHA for 79ee638

Commits on Aug 22, 2017

• Add moving capabilities to crates via right click option

  gramanas

  committed
  aa4d06f

  Copy full SHA for aa4d06f

• Enforce naming conventions

  gramanas

  committed
  d0591a9

  Copy full SHA for d0591a9

Commits on Aug 23, 2017

• Correct crate filter tests

  gramanas

  committed
  41d2e81

  Copy full SHA for 41d2e81

• Don't move a crate to it's parent

  gramanas

  committed
  59af9a9

  Copy full SHA for 59af9a9

Commits on Oct 11, 2017

• Fix bug...

  Show description for e8417d5
  gramanas

  committed
  e8417d5

  Copy full SHA for e8417d5

Commits on Oct 12, 2017

• Wrap moveCrate in a transaction

  gramanas

  committed
  8996708

  Copy full SHA for 8996708

• Merge branch 'NestedCrates' of https://github.com/gramanas/mixxx into NestedCrates

  gramanas

  committed
  14c2cfc

  Copy full SHA for 14c2cfc

• Merge branch 'jmigual-library-redesign' of https://github.com/mixxxdj/mixxx into NestedCrates

  gramanas

  committed
  311e22b

  Copy full SHA for 311e22b

Commits on Oct 14, 2017

• Fix bugs with move crate and with the merge problem

  gramanas

  committed
  23c2c9d

  Copy full SHA for 23c2c9d

Commits on Jan 5, 2018

• Merge branch 'jmigual-library-redesign' of https://github.com/mixxxdj/mixxx into NestedCrates

  gramanas

  committed
  de6cd1b

  Copy full SHA for de6cd1b

Commits on Apr 20, 2018

• Merge commit '9df14fa6f3706df6b3563ad2cd8f66ae56ca99db' into NestedCrates

  gramanas

  committed
  a73cbc0

  Copy full SHA for a73cbc0

• Merge branch 'jmigual-library-redesign' into NestedCrates

  gramanas

  committed
  47157bb

  Copy full SHA for 47157bb

Commits on May 7, 2018

• Merge branch 'jmigual-library-redesign' into NestedCrates

  gramanas

  committed
  a26ff55

  Copy full SHA for a26ff55

Commits on Jun 23, 2018

• Merge remote-tracking branch 'upstream/jmigual-library-redesign' into nested-crates

  Be-ing

  committed
  e2cf708

  Copy full SHA for e2cf708

• fix database schema upgrade for nested crates

  Be-ing

  committed
  e4da311

  Copy full SHA for e4da311

• show context menu to add crate when right clicking empty area

  Be-ing

  committed
  cdb08fc

  Copy full SHA for cdb08fc

Commits on Jun 24, 2018

• Merge pull request #3 from Be-ing/nested-crates

  Show description for a5c5adc
  gramanas

  authored
  a5c5adc

  Copy full SHA for a5c5adc