Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• b13f8afeb4
  
  Add text to README master Reimar 2025-05-16 11:58:26 +0200
• 47938544ef
  
  Fix errors when amount is null Reimar 2025-05-16 11:15:42 +0200
• 59683ea176
  
  Implement deleting dish, use popup menu for edit and delete Reimar 2025-05-16 10:51:32 +0200
• 9c364b2493
  
  Allow writing allergies when generating recipe Reimar 2025-05-15 15:05:39 +0200
• 4856bf5403 Merge branch 'master' of git.reim.ar:ReiMerc/easyeat LilleBRG 2025-05-15 11:48:01 +0200
• 2088de994f editrecipe works LilleBRG 2025-05-15 11:47:59 +0200
• a175e1ad3e
  
  Create progress bar and empty text for dishes list Reimar 2025-05-15 11:07:52 +0200
• b912210bbd
  
  Don't return error on empty recipe list Reimar 2025-05-15 10:17:56 +0200
• 571a258c18 small changes to update recipe LilleBRG 2025-05-14 13:36:57 +0200
• f9e006539c help reimar LilleBRG 2025-05-14 12:47:20 +0200
• 4a935514cf updates to editrecipe LilleBRG 2025-05-14 11:58:49 +0200
• 5c924026ed Merge branch 'master' of git.reim.ar:ReiMerc/easyeat LilleBRG 2025-05-14 09:53:48 +0200
• 4b8dcb865c changed addrecipe to shoppinglist LilleBRG 2025-05-14 09:53:46 +0200
• 37757cbf46
  
  Reload dish list after generating, fix ingredient list when no amount Reimar 2025-05-14 09:30:52 +0200
• ba00a6e35e Merge branch 'master' of git.reim.ar:ReiMerc/easyeat LilleBRG 2025-05-14 09:17:22 +0200
• fd85841daf changed multiplier to string, kotlin weird LilleBRG 2025-05-14 09:17:16 +0200
• bd486fa9f7 Merge branch 'master' of git.reim.ar:ReiMerc/easyeat Jeas0001 2025-05-14 09:04:35 +0200
• 6dffa397f2 Changed the initial message for the ai integration Jeas0001 2025-05-14 09:04:28 +0200
• 6e72f549cf
  
  Add buttons for incrementing/decrementing portion size, fix decimal numbers Reimar 2025-05-14 08:40:36 +0200
• 48b3622542
  
  Redesign dish details page Reimar 2025-05-13 22:09:50 +0200
• 7a25b0708b
  
  Implement editing shopping items Reimar 2025-05-13 21:15:06 +0200
• b04f385bdb very close to add to shopping list wrks LilleBRG 2025-05-13 15:52:41 +0200
• 2c22f8d8e1 more fixes idk LilleBRG 2025-05-13 15:38:11 +0200
• 1e01d1ee90 fixed errors in merge LilleBRG 2025-05-13 15:24:25 +0200
• 12427a85f8 merge LilleBRG 2025-05-13 15:14:54 +0200
• 00cc8101f1 need to merge but trying to add recipe to shoppinglist LilleBRG 2025-05-13 15:11:57 +0200
• dbb25a394d
  
  Use popup menu for creating dish Reimar 2025-05-13 14:56:34 +0200
• 1c085a4262
  
  Finish generating recipe, refactor directions property and request helpers Reimar 2025-05-13 12:59:18 +0200
• 4772c0ef26
  
  Create recipe fragment Reimar 2025-05-13 12:41:10 +0200
• c423a9e19d Merge branch 'master' of git.reim.ar:ReiMerc/easyeat Jeas0001 2025-05-13 12:13:18 +0200
• 14cf727e22 Made it possible to set a multiplier on recipeadd Jeas0001 2025-05-13 12:13:07 +0200
• cb2df85e5b merge LilleBRG 2025-05-13 10:56:42 +0200
• 56017f745d dishlist works and dishgdetails soon done LilleBRG 2025-05-13 10:55:24 +0200
• f38333dc8c Merge branch 'master' of git.reim.ar:ReiMerc/easyeat Jeas0001 2025-05-13 10:45:53 +0200
• 73cec5745b When getting a single recipe the directions is in a string array Jeas0001 2025-05-13 10:45:46 +0200
• 59af36b3f2
  
  Use string array for directions in recipes Reimar 2025-05-13 10:33:16 +0200
• f0e7e67d77
  
  Allow generating recipes with AI Reimar 2025-05-13 09:51:20 +0200
• 1dd98e1a05 Merge branch 'master' of git.reim.ar:ReiMerc/easyeat Jeas0001 2025-05-13 10:32:02 +0200
• df7d5f9695 Changed directions in recipedto to a string array instead of an object array Only the dto was changed Jeas0001 2025-05-13 10:31:37 +0200
• b882bc09a7 create and diushlist works LilleBRG 2025-05-09 17:03:50 +0200
• 5c1a569906 made new getallrecipedto and return on getallrecipe LilleBRG 2025-05-09 10:22:02 +0200
• 3b01992eed code towards create manual and getallrecipies made but not working LilleBRG 2025-05-08 18:48:59 +0200
• 80e52cd22b Merge branch 'master' of git.reim.ar:ReiMerc/easyeat LilleBRG 2025-05-08 12:12:04 +0200
• 799ddb76e5 made modal for ai and manual creation of dish LilleBRG 2025-05-08 12:12:00 +0200
• 51f6808d8d Merge branch 'master' of git.reim.ar:ReiMerc/easyeat Jeas0001 2025-05-08 12:00:28 +0200
• 73bc290b6a add item to shopping list new item in g and old item in kg Jeas0001 2025-05-08 12:00:17 +0200
• 1b4f9059f4
  
  Fix adding items of the same name on frontend Reimar 2025-05-08 11:52:41 +0200
• 2a4b0c671d Merge branch 'master' of git.reim.ar:ReiMerc/easyeat Jeas0001 2025-05-08 11:05:50 +0200
• fd11c89cea Extrated unit adjustment Jeas0001 2025-05-08 11:05:40 +0200
• df0c951100
  
  Add progress bar and empty message to shopping list Reimar 2025-05-08 11:02:04 +0200
• fa877b2c5e
  
  Show shopping item immediately as it is added to the list Reimar 2025-05-08 10:47:10 +0200
• 39bcdd9a9b
  
  Implement deleting shopping items Reimar 2025-05-08 10:33:28 +0200
• 7e1583f485 Changed delete item in shopping list to work and add item to only return an item and not an array with one item Jeas0001 2025-05-08 10:44:34 +0200
• bf588c62ed Merge branch 'master' of git.reim.ar:ReiMerc/easyeat Jeas0001 2025-05-08 10:22:56 +0200
• dfb2838565 Returns the added item in the shoppinglist Jeas0001 2025-05-08 10:22:43 +0200
• b3b4562f21
  
  Allow checking/unchecking shopping items Reimar 2025-05-08 10:04:29 +0200
• f924d2083b
  
  Show shopping list Reimar 2025-05-08 09:16:12 +0200
• dc7e94b37b merge LilleBRG 2025-05-07 13:52:43 +0200
• 536b693085 create dish done but not checked with api LilleBRG 2025-05-07 13:51:54 +0200
• f9296f05c1
  
  Implement adding items to shopping list Reimar 2025-05-07 12:04:41 +0200
• 050ff896e1 UserDbAccess comments Jeas0001 2025-05-07 13:33:36 +0200
• dee0ea54a2 shoppinglistdbaccess comments Jeas0001 2025-05-07 13:14:41 +0200
• fe90c243e2 RecipeDbAccess comments Jeas0001 2025-05-07 13:05:59 +0200
• e30110bcff Usercontrollers comments Jeas0001 2025-05-07 12:30:12 +0200
• 38cf388ea8 Shoppinglistcontroller comments Jeas0001 2025-05-07 11:54:02 +0200
• edf8c73ec4 authorize atribute added to shppinglistcontroller Jeas0001 2025-05-07 11:29:35 +0200
• 1ce1f355c0 Recipecontroller comments Jeas0001 2025-05-07 11:28:21 +0200
• b8026250cf Merge branch 'master' of git.reim.ar:ReiMerc/easyeat Jeas0001 2025-05-07 09:35:12 +0200
• 3c3f0f202b retunere true når man tilføjer til shoppinglisten Jeas0001 2025-05-07 09:34:50 +0200
• 87b5fbb014
  
  Update profile page immediately as user info has changed Reimar 2025-05-06 14:37:48 +0200
• b8fa54539f
  
  Don't return user object when updating profile Reimar 2025-05-06 14:31:04 +0200
• b8ebac5970 Merge branch 'master' of git.reim.ar:ReiMerc/easyeat Jeas0001 2025-05-06 13:57:11 +0200
• 15a09e0d30 Comments for the logic Jeas0001 2025-05-06 13:56:46 +0200
• bdd7a0dfdb
  
  Group activities and fragments by domain Reimar 2025-05-06 08:50:09 +0200
• 0c1f167e20
  
  Implement updating username/email and changing password and logout Reimar 2025-05-05 13:20:33 +0200
• a446ad934c
  
  Add button to add shopping item Reimar 2025-05-05 13:23:56 +0200
• f84cd6167b Only checks if the username or email is changed Jeas0001 2025-05-05 13:04:50 +0200
• b0bb534eff Some comment and a fix for checking if a username or email is in use Jeas0001 2025-05-05 13:00:57 +0200
• 16d1d3459d creadish layout done and ready to test http connection on monday LilleBRG 2025-05-02 18:17:26 +0200
• 67e6442255 Merge branch 'master' of git.reim.ar:ReiMerc/easyeat Jeas0001 2025-05-01 12:44:07 +0200
• da0dd828df Added allergi as a option for dishes Jeas0001 2025-05-01 12:43:37 +0200
• 7c45526563
  
  Add profile page, implement authentication Reimar 2025-05-01 12:02:55 +0200
• 9d9a2975f5 create dish button moved to dishesfragment LilleBRG 2025-05-01 10:13:52 +0200
• a63b98e180
  
  Save tokens when logging in and implement refresh token Reimar 2025-05-01 09:43:14 +0200
• 3aba01d56a Generate recieve a json object and is a post request now Jeas0001 2025-05-01 09:36:36 +0200
• fac4e04c2c Refreshtoken is recieved as a json object Jeas0001 2025-05-01 09:22:12 +0200
• 76a0e6afee Merge branch 'master' of git.reim.ar:ReiMerc/easyeat Jeas0001 2025-05-01 09:06:49 +0200
• 76c126c2fd Chat GPT integration Jeas0001 2025-05-01 09:06:19 +0200
• d00bace5b7
  
  Add progress dialogs when signing up/logging in Reimar 2025-04-30 13:22:55 +0200
• f5d580afe7 Merge branch 'master' of git.reim.ar:ReiMerc/easyeat Jeas0001 2025-04-30 13:06:13 +0200
• adcb469a6f Made Unit and Amount nullable and directions to a list Jeas0001 2025-04-30 13:05:51 +0200
• 4772daa666 Removed preferedrecipes from the entire project Jeas0001 2025-04-30 12:49:58 +0200
• 75559daacb
  
  Merge branch 'api-connection' Reimar 2025-04-30 12:34:45 +0200
• dfa9abc4b9
  
  Fix errors in api calls, move base url to gradle properties Reimar 2025-04-30 12:31:54 +0200
• de8c9359cc RemovedPreferedRecipes Jeas0001 2025-04-30 11:36:05 +0200
• 2596a9e408 Change element to name for ingredient Jeas0001 2025-04-30 11:04:56 +0200
• 0f791cc642
  
  Merge branch 'master' into api-connection Reimar 2025-04-29 13:57:21 +0200
• 15de778225 Migrations Jeas0001 2025-04-29 13:56:41 +0200
• 792bf196f0 SQLite added to gitignore Jeas0001 2025-04-29 13:56:31 +0200
• 5e32ad7133
  
  Implement registering user Reimar 2025-04-29 13:55:50 +0200