Merge branch 'master' of gitorious.org:brewtarget/brewtarget into origin/StrikeWaterT...
[brewtarget:malavv-brewtarget.git] / src / MainWindow.h
2014-05-05 Maxime Lavigne ... Merge branch 'master' of gitorious.org:brewtarget/brewt... origin/StrikeWaterToolbox
2014-05-03 Philip G. LeeMerge #71 to master.
2014-05-03 Philip G. LeeMerge #62 to master.
2014-05-03 Philip G. LeeMerge #72 to master.
2014-04-30 Maxime Lavigne ... Merge branch 'master' of gitorious.org:brewtarget/malav...
2014-04-12 Philip G. LeeMerge #70 to master.
2014-04-12 Philip G. LeeMerge #69 to master
2014-04-07 Mik FirestoneCloses bugId 1302293
2014-03-17 Maxime LavigneMerge branch 'master' of gitorious.org:brewtarget/brewt...
2014-02-16 Philip G. LeeMerge #51 to master.
2014-02-02 Maxime LavigneMerge branch 'StrikeWaterToolbox' of gitorious.org...
2014-02-02 Philip G. LeeMerge 59 into master.
2014-01-30 Mik FirestoneMerge branch 'master' into feature/folder
2014-01-20 Maxime LavigneAdded the strikeWater calculator in MainWindow and...
2014-01-15 Mik FirestoneDrag'n'drop of folders now works. Almost everything...
2014-01-11 Philip G. LeeMerge 60 to master: cleanup on bug #1160610.
2014-01-11 Philip G. LeeMerge into master: replace language buttons with combobox.
2014-01-11 Philip G. LeeMerge 54 into master: fixes bug 1192269, crashing when...
2014-01-11 Philip G. LeeMerge 53 into master. Fixes windows upgrades.
2013-12-25 Philip G. LeeFixes #1224584, removing html viewer.
2013-12-19 Mik FirestoneAll right. Subclassed the QTabWidget to BtTabWidget...
2013-11-30 Mik FirestoneAdd folders, rename folders works. Need to get delete...
2013-11-02 mik firestoneCloses Bug #1192269
2013-09-17 mik firestoneHad to remove some other ideas on how to solve this...
2013-09-17 mik firestoneMerge branch 'bugs/windowsupgrade' of gitorious.org...
2013-08-22 U-CHIMCHIM\mikImports from v1.2.x branches seem to work now on Window...
2013-07-07 Philip G. LeeMerge #45 into master.
2013-06-20 Mik FirestoneTrying to fix the sugars, again. This is a significant...
2013-06-08 Philip G. LeeMerged in merge requests 26. Adds ability to do forward...
2013-05-13 Mik FirestoneMerging master
2013-04-11 Mik Firestonestupid pain in the *** git. I HATE this stupid dumb...
2013-03-18 Mik FirestoneMerge branch 'master' of git://gitorious.org/brewtarget...
2013-03-16 Philip G. LeeMerge #21 into master. Fixes bug 1131231.
2013-03-16 Philip G. LeeMerge #30 into master. Fixes bug 1155816.
2013-03-16 Philip G. LeeMerge #29 into master. Fixes bug 1155308.
2013-03-16 Philip G. LeeMerging in #28. Changes the tabstops.
2013-03-13 mik firestonerebuilding the branch and merging master back in
2013-03-09 Philip G. LeeMerged #24 into master. Updated Mac icons.
2013-03-09 Philip G. LeeMerged #19 into master.
2013-03-09 Philip G. LeeMerged #15. Adds Style section to trees.
2013-03-05 mik firestoneCleaned out the qDebug comments, re-enabled the save...
2013-03-05 mik firestoneMerge branch 'master' into dirtybits
2013-03-05 Peter BuelowMerge branch 'master' into bugs/1117953
2013-02-28 Mik FirestoneMerge branch 'master' of git://gitorious.org/brewtarget...
2013-02-26 mik firestoneCloses feature request 1109732
2013-02-25 Mik FirestoneMerge branch 'master' of git://gitorious.org/~mikfire...
2013-02-24 mik firestoneMerge branch 'master' into styletree
2013-02-15 mik firestoneMerge branch 'master' into styletree
2013-02-15 mik firestoneMerging things back to master
2013-02-12 Philip G. LeeMerging merge-requests/9 into master.
2013-02-10 Philip G. LeeMerged merge-requests/8 into master.
2013-02-09 Philip G. LeeMerge commit 'refs/merge-requests/7' of gitorious.org...
2013-02-09 Philip G. LeeMerging merge-requests/6 to master.
2013-02-04 mik firestoneCleaning up a bad upstream merge
2013-02-04 mik firestoneSame message as previous. commit doesn't quite do what...
2013-02-02 mik firestoneAttempting to fix some of the issues with database...
2013-01-26 mik firestoneGetting close to done with adding a style tree. More...
2013-01-13 Philip Greggory LeeMerged release branch completely into trunk. Can you...
2012-12-30 Philip Greggory LeeMerged with release branch.
2012-12-28 Philip Greggory LeeMerged with release branch.
2012-12-27 Mik FirestoneCloses bug ID 3598577
2012-12-25 Philip Greggory LeeAdded filtering and sorting to the style combo box.
2012-12-21 Mik FirestoneCloses bug ID 3563845.
2012-12-09 Philip Greggory LeeUpdated MainWindow documentation, a few function names...
2012-12-08 Philip Greggory LeeMerged with release branch: svn merge -r978:1017 ....
2012-10-30 Mik FirestoneCloses Bug ID 3570663
2012-09-14 Mik Firestonecopy now uses bind values instead of a string. I think...
2012-07-30 Philip Greggory LeeMerged release branch into trunk to update it with...
2012-07-29 Philip Greggory LeeThis is a hack to fix bug #3551519.
2012-07-22 Mik FirestoneCloses bug id 3547337 and 3547336
2012-07-16 Philip Greggory LeeImplemented merging contingent on whether Database...
2012-06-16 Mik FirestoneMoved boil time to the main window. Finally.
2012-06-12 Mik FirestoneMerging units branch back to trunk
2012-06-09 Philip Greggory LeeMade the pitch dialog copy the current recipe volume/og.
2012-06-07 Mik FirestoneDone! Done done done done done!
2012-06-07 Mik FirestoneAnd now it compiles.
2012-05-10 Mik FirestoneSelecting scale and units continues to evolve.
2012-05-04 Mik FirestoneNext pass at unit magic. Requires a drop of the databas...
2012-04-20 Mik FirestoneThis is the second try at making each field carry its...
2012-04-17 Mik FirestoneProof of concept pass at allowing users to select which...
2012-03-24 Philip Greggory LeeUpdated version checking to do it in the main event...
2012-01-14 Philip Greggory LeeGave brief doxygen info for most of the classes.
2012-01-13 Philip Greggory LeeAdded documentation of almost all the classes.
2012-01-11 Philip Greggory LeeMerged the 1.2.5 branch back into the trunk.
2011-12-25 Philip Greggory LeeAdded a way to edit the actual recipe's equipment.
2011-12-25 Philip Greggory LeeAdded isinf to Algorithms.
2011-12-24 Philip Greggory LeeAdded an EquipmentButton to show the current equipment...
2011-12-22 Philip Greggory LeeAdded MaltinessWidgetPlugin.
2011-12-22 Philip Greggory LeeDeleted EquipmentComboBox in favor of a new Equipment...
2011-12-21 Philip Greggory LeeRemoved unnecessary table widgets.
2011-12-20 Philip Greggory LeeAdded a "displayed" option to Database::copy().
2011-12-08 Philip Greggory LeeFixed some Mash issues.
2011-12-07 Philip Greggory LeeFinally got MainWindow to compile.
2011-12-07 Philip Greggory LeeGot FermentableTableModel into shape.
2011-12-03 Philip Greggory LeeJust getting rid of compiler errors now. PROGRESS!
2011-12-03 Philip Greggory LeeUpdated MainWindow.
2011-10-11 Mik FirestoneComplete refactoring of the tree windows.
2011-09-18 Philip Greggory LeeAdded Charles' patch.
2011-09-14 Mik FirestoneIt would seem that qtCreator does not allow you to...
2011-08-23 Philip Greggory LeeAdded a "merge database" button to manually merge anoth...
next