Commit Graph

Select branches

Hide Pull Requests

development

master

#1

#10

#11

#12

#13

#2

#3

#4

#5

#6

#7

#8

#9

v1.0

Mono Color

• 8644cbbd41
  Merge pull request #13 from andrewlalis/improve/redesignIngredients development Andrew Lalis 2018-05-22 23:29:25 +0200
• 29a4ed0ad2 Added slot for return in add ingredients input field. #13 Andrew Lalis 2018-05-22 23:27:40 +0200
• 4554fdcd1e Fixed compilation bugs. Program runs. Andrew Lalis 2018-05-22 23:21:15 +0200
• b3393266d3 Removed more dialogs for obsolete units and recipe ingredients. Andrew Lalis 2018-05-22 23:11:52 +0200
• 55a222967b Removed test method from main, removed new unit dialog. Andrew Lalis 2018-05-22 23:09:52 +0200
• 6cfd50d329 Updated recipe database to remove unneeded components. Andrew Lalis 2018-05-22 23:06:11 +0200
• 491e5c19a4 Removed ingredients, units table from recipe database. Andrew Lalis 2018-05-22 22:13:37 +0200
• 17797eeb5f Removed food groups and ingredients from open recipe dialog. Andrew Lalis 2018-05-22 22:01:37 +0200
• 4ca4854a63 Updated mainwindow to remove recipeingredient. Andrew Lalis 2018-05-22 21:28:18 +0200
• 021ec5b815 Removed recipe ingredient from the newrecipedialog methods. Andrew Lalis 2018-05-22 21:24:36 +0200
• 3da05f71f7 Removed recipeingredient headers, removed recipeingredient from recipe object. Andrew Lalis 2018-05-22 21:16:54 +0200
• 07774cc349 Removed recipeingredient files, and unitofmeasure. These are too restrictive. Andrew Lalis 2018-05-22 21:09:14 +0200
• a790128646 Updated ingredientlistmodel for new ingredients model. Andrew Lalis 2018-05-22 21:07:16 +0200
• cd501d27cb Updated new recipe dialog, Ingredient class. Andrew Lalis 2018-05-22 21:02:08 +0200
• c8b8cc1d0f
  Merge pull request #12 from andrewlalis/development master Andrew Lalis 2018-04-18 21:21:13 +0100
• e6fa247c5c Updated README.md #12 Andrew Lalis 2018-04-18 22:20:14 +0200
• c7b39cda21
  Merge pull request #11 from andrewlalis/development v1.0 Andrew Lalis 2018-04-01 09:31:08 +0200
• 466321b4b1 Added static builder script for linux. Only works on my computer though. #11 Andrew Lalis 2018-04-01 09:28:14 +0200
• 5095934931 Fixed author name not showing up. Andrew Lalis 2018-04-01 09:20:36 +0200
• 3c7156c264 Added design info to repository. Andrew Lalis 2018-03-31 22:51:02 +0200
• d7653465e9 Made global font setting at app start. Andrew Lalis 2018-03-31 22:45:19 +0200
• 4b51029d70 Fixed unused variable issues. Andrew Lalis 2018-03-31 22:15:01 +0200
• 7696a4ff88 Added fonts, still need to implement. Andrew Lalis 2018-03-31 22:01:49 +0200
• ce6effff91
  Merge pull request #10 from andrewlalis/development Andrew Lalis 2018-03-31 20:36:01 +0200
• c84370be11 Updated UI, added default ingredients. #10 Andrew Lalis 2018-03-31 15:02:35 +0200
• 9e3c59e415 Added icons for search criteria, fixed deleting image bug when editing. Andrew Lalis 2018-03-31 14:01:57 +0200
• b736410044 Finished edit functionality Andrew Lalis 2018-03-31 12:53:31 +0200
• e60fe413db
  Merge pull request #9 from andrewlalis/development Andrew Lalis 2018-03-30 23:30:20 +0200
• 6597efa646 Added ability to edit recipe (WIP). #9 Andrew Lalis 2018-03-30 23:25:28 +0200
• f13432a2fe Added search by food group. Andrew Lalis 2018-03-30 22:50:02 +0200
• 4170df7fc8 Added filtering by ingredient to search window. Andrew Lalis 2018-03-30 20:57:14 +0200
• e0dda64412 Added screenshot to readme. Andrew Lalis 2018-03-30 19:43:39 +0200
• c971a60666
  Merge pull request #8 from andrewlalis/development Andrew Lalis 2018-03-30 16:20:54 +0200
• 019e0e3cde Added selection listener. #8 Andrew Lalis 2018-03-30 16:20:09 +0200
• 844c558726 Added query counter, list of all tags, ingredients to open recipe view. Andrew Lalis 2018-03-30 14:33:48 +0200
• 9065df521a Made adding ingredients, tags more secure with extra checks. Andrew Lalis 2018-03-30 12:56:42 +0200
• 35982cd514 Added methods to get food groups of all recipes and individual recipe, revamped access to result table. Andrew Lalis 2018-03-30 12:29:10 +0200
• 6114bdbfa7 Comments line clears when an ingredient is added. Andrew Lalis 2018-03-30 11:33:08 +0200
• 50ff37599c Cleaned up NewRecipe dialog, and example recipe. Andrew Lalis 2018-03-30 11:05:17 +0200
• 8fee8c0cdb Updates saving and deleting instructions and images. Andrew Lalis 2018-03-29 17:17:07 +0200
• 626fe91bb1
  Merge pull request #7 from andrewlalis/development Andrew Lalis 2018-03-29 16:11:26 +0200
• 076212e392 Cleaned up deleting recipes, random recipe on startup, exit button, etc. #7 Andrew Lalis 2018-03-29 16:09:58 +0200
• b8ac72c91a Added trash icon. Andrew Lalis 2018-03-29 11:30:38 +0200
• 7fb11b3412 Added the ability to delete a recipe by name or id. Andrew Lalis 2018-03-29 11:21:00 +0200
• fefa913e94 Able to display recipes in list in openRecipe dialog. Andrew Lalis 2018-03-29 09:58:25 +0200
• aab7a10553 Moved mainWindow to gui directory with other dialogs. Andrew Lalis 2018-03-29 09:17:47 +0200
• 17cbeb0d1c Added table model, having trouble getting it to work. Andrew Lalis 2018-03-11 12:53:30 +0100
• 1af1511779
  Merge pull request #6 from andrewlalis/development Andrew Lalis 2018-03-11 09:35:33 +0100
• cc802e5d0d Fixed new unit dialog, added open recipe dialog. Andrew Lalis 2018-03-11 09:33:48 +0100
• a34d46fa3d Added new unit dialog, scaling images properly, tags list, moved basic info, and some other things. #6 Andrew Lalis 2018-03-11 08:57:57 +0100
• e2ccde9030
  Merge pull request #5 from andrewlalis/development Andrew Lalis 2018-03-10 16:03:09 +0100
• 44f8903154 Added extra stats to user interface. #5 Andrew Lalis 2018-03-10 16:02:01 +0100
• 15117d6658 Made the integral change: recipes can be added. Andrew Lalis 2018-03-10 15:32:26 +0100
• b4ce47aad5 Added icons to add and delete buttons, fixed out of bounds error on deletion. Andrew Lalis 2018-03-10 14:56:43 +0100
• 4f78b37460 Added window icons, add new ingredient and add new tag dialogs. Andrew Lalis 2018-03-10 14:06:24 +0100
• cbb2079a7f Added support for custom images. Andrew Lalis 2018-03-10 13:22:04 +0100
• 041d56e1a9 Adding support for image selection in add recipe dialog. Andrew Lalis 2018-03-10 12:58:31 +0100
• cf099c1b52
  Merge pull request #4 from andrewlalis/development Andrew Lalis 2018-03-10 12:38:20 +0100
• cb3be5e1e2 Added tags area to dialog, made it look better, and added tag model. #4 Andrew Lalis 2018-03-10 12:36:14 +0100
• 61711323cc Polished up adding ingredients to the recipes list. Andrew Lalis 2018-03-10 10:42:22 +0100
• ceab72177a Added units as a table, populate ingredient and unit boxes in new recipe dialog. Andrew Lalis 2018-03-10 08:51:17 +0100
• 49d9004eae New Recipe Dialog is almost done. Andrew Lalis 2018-03-04 10:19:32 +0100
• 358bc8de5d Added new recipe dialog, improved ingredient list display Andrew Lalis 2018-03-04 09:05:20 +0100
• 9b377a5548
  Merge pull request #3 from andrewlalis/development Andrew Lalis 2018-03-03 10:20:11 +0100
• 446ff8f5ba Storage is now complete. Retrieval is partially implemented. #3 Andrew Lalis 2018-03-03 10:18:38 +0100
• 77dddef201 Improved result table functionality Andrew Lalis 2018-03-03 08:48:55 +0100
• 238d7edee3 Added convenience select method, improved security of recipe storage. Andrew Lalis 2018-03-03 08:38:32 +0100
• cacc75f07d Added ability to store recipe in database. Andrew Lalis 2018-03-02 14:14:56 +0100
• 8c0163951b In process of creating method to store recipe. Andrew Lalis 2018-03-02 11:30:16 +0100
• cfd4179664 Created load and save instruction methods in file utils. Andrew Lalis 2018-03-02 10:11:26 +0100
• e714a2fc6f Added fileutils class, added ability to store ingredients in database. Andrew Lalis 2018-03-02 09:32:40 +0100
• b893372b01 Modified SQL table creation, created method stub to insert recipe. Andrew Lalis 2018-03-01 17:28:18 +0100
• 658bf9fb2b Got a working database interaction layer and basic tables. Andrew Lalis 2018-03-01 17:19:13 +0100
• 7f0fd90e73 Fixed project to compile on Linux. Andrew Lalis 2018-02-28 21:43:49 +0100
• 3ef03e2887
  Merge pull request #2 from andrewlalis/development Andrew Lalis 2018-02-13 10:23:08 +0100
• 2d096f485a Added const modifier to getters, able to display ingredients in GUI. #2 A.G. Lalis 2018-02-13 10:22:05 +0100
• 30c1328f3b Implemented abstract methods for IngredientListModel. A.G. Lalis 2018-02-13 09:48:57 +0100
• e37179e4ae Removed IngredientListModel from mainwindow. Andrew Lalis 2018-02-12 21:31:20 +0100
• adf8677617
  Merge pull request #1 from andrewlalis/development Andrew Lalis 2018-02-12 20:40:44 +0100
• e4dcd17e3e Now able to load parts of a Recipe into the user interface. #1 Andrew Lalis 2018-02-12 20:39:24 +0100
• 2e42bafae3 Fixed default constructors, tested compilability. Andrew Lalis 2018-02-12 20:27:27 +0100
• c7072f949f Added getters/setters to Instruction. Andrew Lalis 2018-02-12 20:00:59 +0100
• 30df250c7c Removed ID from Ingredient. Andrew Lalis 2018-02-12 19:53:03 +0100
• b6093aeee9 Cleaned up getters/setters for RecipeIngredient. Andrew Lalis 2018-02-12 19:48:22 +0100
• cd3f527785 Created getters/setters for Recipe Class and cleaned up constructor. Andrew Lalis 2018-02-12 19:44:35 +0100
• 7d358d6e55 Added getTotalTime() derived getter method. Andrew Lalis 2018-02-12 19:37:35 +0100
• c928533e6a Added RecipeTag object to replace string in recipe object. Andrew Lalis 2018-02-12 19:25:48 +0100
• c09f29930b Ignoring .autosave files, added fields to recipe object, improved unit of measure. Andrew Lalis 2018-02-12 19:20:38 +0100
• 45db82f0d5 Added variables to unit of measure. Andrew Lalis 2018-02-12 16:27:24 +0100
• 05a18d6a9a Re-organized ingredient-related objects, added descriptions. Andrew Lalis 2018-02-12 15:15:04 +0100
• b6f5da57d6 Fixed compilation error Andrew Lalis 2018-02-12 14:25:35 +0100
• 3b42d1f418 Improvements made to recipe objects. Andrew Lalis 2018-02-12 14:24:11 +0100
• db91d81ec3 Added README A.G. Lalis 2018-02-12 09:32:48 +0100
• d648062314 Re-organized files, added model objects, basic UI. Andrew Lalis 2018-02-02 13:27:57 +0100
• 661590ecc4 Added SQLite3 library, testing code. Andrew Lalis 2018-02-02 11:41:36 +0100
• c20d2835d1 Moved files into respective header/ source folders. Andrew Lalis 2018-02-02 10:05:51 +0100
• 7005565fc6 Adding starting files. Andrew Lalis 2018-02-02 10:00:46 +0100