Commit Graph

Select branches

Hide Pull Requests

fix-item-input

fix-recipe-page

login-system

loginpage

main

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#20

#21

#22

#23

#24

#26

#29

#30

#32

#34

#35

#36

#36

#37

#38

#39

#40

#41

#42

#43

#6

#7

#8

#9

Mono Color

• 9b5cb08c7e Merge pull request #42 from cato447/diagram-presentation main catoandGitHub 2022-07-25 17:25:22 +02:00
• cb4df19591 fixes cato447 2022-07-22 23:58:15 +02:00
• 74eb8be0fd add node modules to gitignore cato447 2022-07-22 23:52:13 +02:00
• fa4eefcbe8 Merge branch 'fix-recipe-page' into main cato447 2022-07-22 23:46:02 +02:00
• 15032bba2d fixed timeout issue fix-recipe-page cato447 2022-07-22 23:25:15 +02:00
• c72678b578 commit idk Karthik Vempati 2022-07-22 23:09:59 +02:00
• aa1da2d0c7 Merge branch 'fix-item-input' into add-recipe-page Karthik Vempati 2022-07-22 21:39:45 +02:00
• 5e7f6edc8b Merge branch 'add-recipe-page' into fix-item-input fix-item-input Karthik Vempati 2022-07-22 21:37:02 +02:00
• 92d03120b1 fix colors and alignment everywhere Karthik Vempati 2022-07-22 21:29:50 +02:00
• 8259f3b158 rework recipes and random generation pt. 2 Karthik Vempati 2022-07-22 21:21:01 +02:00
• 215f17b174 Merge branch 'vue-app-navigation-drawer' into add-recipe-page Karthik Vempati 2022-07-22 20:56:37 +02:00
• de33798a71 rework random generation Karthik Vempati 2022-07-22 20:56:07 +02:00
• c97d3e75b1 Move app views to v-app Karthik Vempati 2022-07-22 20:55:11 +02:00
• a12f43ca05 Alignment issues and what not Karthik Vempati 2022-07-22 20:44:29 +02:00
• 508e19c064 Update bitbucket-sync-test.yml catoandGitHub 2022-07-22 19:12:28 +02:00
• ed2f8e4393 Added updated version for each diagram + added the RAD and the SDD Marc Roig Kunzmann 2022-07-22 16:42:27 +02:00
• 11c1e022b6 rename modules according to rules cato447 2022-07-22 01:01:21 +02:00
• 6d6d060d5b Merge pull request #40 from cato447/remove-used-ingredients catoandGitHub 2022-07-22 00:31:55 +02:00
• dafe8e7430 some fixes Karthik Vempati 2022-07-18 19:15:52 +02:00
• a96e3c5b0d Merge remote-tracking branch 'origin/main' into fix-item-input Karthik Vempati 2022-07-18 19:14:58 +02:00
• afe7e68a66 Merge pull request #38 from cato447/fix-recipe-model catoandGitHub 2022-07-18 19:12:41 +02:00
• b331f8eff8 added sourceUrl as property to recipe cato447 2022-07-18 19:00:08 +02:00
• 2a2d945b59 Fix item input Karthik Vempati 2022-07-17 20:12:03 +02:00
• 41ef563a20 Merge branch 'add-recipe-page' into fix-item-input Karthik Vempati 2022-07-17 18:28:53 +02:00
• 2c8f5d76dc Fix units for backend Karthik Vempati 2022-07-17 17:27:11 +02:00
• 2b8eab1f16 Preliminary recipe page Karthik Vempati 2022-07-17 17:13:30 +02:00
• 4359d26982 Change to const Karthik Vempati 2022-07-17 17:14:49 +02:00
• 3c35f2de81 Merge remote-tracking branch 'origin/main' into fix-item-input Karthik Vempati 2022-07-17 12:12:54 +02:00
• 820601037e Merge pull request #37 from cato447/page-navigation catoandGitHub 2022-07-16 22:39:23 +02:00
• 711a8e5c21 first draft implemented cato447 2022-07-16 22:20:32 +02:00
• 6a34c67f56 [Page Navigation] Luis S. Ruisinger 2022-07-14 22:41:26 +02:00
• d9053ebaa4 Merge branch 'main' into remove-used-ingredients cato447 2022-07-14 01:30:39 +02:00
• 4e0e9f4119 Merge pull request #35 from cato447/postgres-implementation catoandGitHub 2022-07-14 01:25:41 +02:00
• d9dcda19df added support for postgres cato447 2022-07-14 01:15:39 +02:00
• 22b138696c [WIP] BROKEN - trying to remove the used ingredients automagically cato447 2022-07-14 00:19:20 +02:00
• b75f83b6ea [LoginPage] loginpage Luis S. Ruisinger 2022-07-13 17:37:37 +02:00
• 49d9f917fa Merge branch 'main' into remove-used-ingredients cato447 2022-07-13 17:16:46 +02:00
• f5e433ee19 Merge pull request #34 from cato447/recipe-endpoint-restructuring catoandGitHub 2022-07-13 16:54:49 +02:00
• ac223093fe Converted api classes to be only statically accessible | Renamed SpoonacularController to RecipeSearchController cato447 2022-07-13 16:22:36 +02:00
• 4c1f2db00a added functionality to spoonacular lib to convert units cato447 2022-07-13 15:50:07 +02:00
• 5af845f195 Merge pull request #32 from cato447/recipe-rest-update catoandGitHub 2022-07-13 15:47:14 +02:00
• 33fe0e0d79 Program no longer terminates if .env file is not present (need for testing) cato447 2022-07-13 15:42:20 +02:00
• 5c0de10446 updated paths of SpoonacularController to match the rest cato447 2022-07-13 05:58:48 +02:00
• c5014c4a11 Finished restructuring and changed way of querying the API cato447 2022-07-13 04:25:40 +02:00
• 806b6945ec Revert "added frontend to gradle build" cato447 2022-07-13 00:21:33 +02:00
• 28109f0d35 added frontend to gradle build cato447 2022-07-13 00:21:33 +02:00
• 8896d492eb [Loginpage] Luis S. Ruisinger 2022-07-12 18:25:36 +02:00
• 20c266394f Fixing background of input field Luis S. Ruisinger 2022-07-12 18:20:38 +02:00
• f7455019c3 [WIP] Reworked the way the spoonaccular api response gets consumed cato447 2022-07-12 17:24:57 +02:00
• 6241222af6 added spring-security login-system cato447 2022-06-17 14:10:42 +02:00
• e969c32f83 Merge pull request #30 from cato447/itempageCSS catoandGitHub 2022-07-09 04:03:24 +02:00
• 6bd7e34fc2 fixed mistake in package declaration cato447 2022-07-09 03:59:57 +02:00
• 1d4ff6508f Merge pull request #29 from cato447/API-querry catoandGitHub 2022-06-27 10:45:34 +02:00
• 80d1aee506 Frontend - Login Page: - implemented Sign Up - implemented responsive behavior Luis S. Ruisinger 2022-06-26 16:40:32 +02:00
• 48599743d1 [WIP]: Adding style to frontend Luis S. Ruisinger 2022-06-20 13:16:54 +02:00
• d3b1922a7f [WIP]: Adding style to frontend Luis S. Ruisinger 2022-06-19 14:04:06 +02:00
• 5b7d2c9a6a [WIP]: Adding style to frontend Luis S. Ruisinger 2022-06-19 00:54:09 +02:00
• a60f365d90 [WIP]: Adding style to frontend - overflow working - better aesthetics - working responsive container layout - sticky input field for scrolling purposes Luis S. Ruisinger 2022-06-18 18:34:01 +02:00
• 5f913bdffa [WIP]: - line jump works - overflow scrolling doesnt work Luis S. Ruisinger 2022-06-18 00:57:43 +02:00
• 6b9f64b6d1 [WIP]: - visual representation of storage cards - line jump doesnt work right now for the cards Luis S. Ruisinger 2022-06-17 23:55:59 +02:00
• 22b84c3565 made endpoints better Bruno 2022-06-17 20:08:24 +02:00
• 93943149ac made endpoints better Bruno 2022-06-17 20:07:00 +02:00
• 8b472a6d61 changed string to JSON objects/arrrays Bruno 2022-06-17 17:50:21 +02:00
• 105aaf6bad debugged, added OneFridge Recipie Bruno 2022-06-17 17:15:24 +02:00
• 724e765cd6 basic api functuinality added, still needs debugging Bruno 2022-06-17 16:23:04 +02:00
• 1f8922788c updated api query address cato447 2022-06-17 15:22:50 +02:00
• 5e86c05ca8 basic api functuinality added, still needs debugging Bruno 2022-06-17 13:05:00 +02:00
• ebfd1b78e5 update api endpoint config and updated related tests (#26) catoandGitHub 2022-06-14 19:33:28 +02:00
• 452bd149a3 Finished responsive behavior Luis S. Ruisinger 2022-06-08 18:43:21 +02:00
• c238309ad6 [WIP]: First working fix for responsive behavior of ItemModel site Luis S. Ruisinger 2022-06-08 17:08:49 +02:00
• 26c933015e [WIP]: Add style to ItemPage Luis S. Ruisinger 2022-06-08 13:04:16 +02:00
• 896696a499 [WIP]: Add style to ItemPage Luis S. Ruisinger 2022-06-07 15:28:34 +02:00
• 3e73fd01f9 [WIP]: Add styling to itemPage Luis S. Ruisinger 2022-06-07 13:52:23 +02:00
• 243cc4cf06 [WIP]: Add styling to itemPage Luis S. Ruisinger 2022-06-06 20:33:15 +02:00
• e3942b5d16 [WIP]: Add styling to itemPage ge42deg 2022-06-06 14:08:20 +02:00
• 7bfdf7a3e0 i like pain (#24) catoandGitHub 2022-06-06 02:10:23 +02:00
• c9e21ed063 i like even more pain cato447 2022-06-06 02:07:50 +02:00
• 96705f2fed added smiley to readme (#23) catoandGitHub 2022-06-06 02:04:20 +02:00
• f67bdf1a5e Update bitbucket-sync-test.yml catoandGitHub 2022-06-06 02:00:13 +02:00
• 873ff15abe Update bitbucket-sync.yml catoandGitHub 2022-06-06 01:58:46 +02:00
• e13961d150 Update bitbucket-sync.yml catoandGitHub 2022-06-06 01:57:24 +02:00
• 7cf1e2dcd4 Update bitbucket-sync.yml catoandGitHub 2022-06-06 01:43:02 +02:00
• f46f38e045 Update bitbucket-sync.yml catoandGitHub 2022-06-06 01:42:04 +02:00
• 2167298da1 Update bitbucket-sync.yml catoandGitHub 2022-06-06 01:38:13 +02:00
• 97bd773640 Update bitbucket-sync.yml catoandGitHub 2022-06-06 01:32:21 +02:00
• 96b9b83579 Update bitbucket-sync.yml catoandGitHub 2022-06-06 00:50:41 +02:00
• 6e11f4ab6b updated rebase behavior catoandGitHub 2022-06-05 21:08:19 +02:00
• 4b1455cf6b added context (#21) catoandGitHub 2022-06-05 20:53:09 +02:00
• a2c322bb34 added context (#20) catoandGitHub 2022-06-05 20:37:17 +02:00
• f521a3d079 Update README.md catoandGitHub 2022-06-05 20:29:04 +02:00
• 0536117cd4 Update README.md catoandGitHub 2022-06-05 20:28:34 +02:00
• c0df40e96f Revert "Merge pull request #19 from cato447/test-branch" catoandcato447 2022-06-05 19:56:31 +02:00
• 93d03f627d Merge pull request #19 from cato447/test-branch catoandGitHub 2022-06-05 19:56:31 +02:00
• 203a51abb0 test another shit cato447 2022-06-05 19:50:44 +02:00
• 484f2d52e0 moved file to another package cato447 2022-06-05 19:46:31 +02:00
• dd2cbebec8 removed test file cato447 2022-06-05 19:41:33 +02:00
• 046dd46c87 Merge branch 'dev' into main cato447 2022-06-05 19:33:54 +02:00
• 2dd5de3672 Merge remote-tracking branch 'origin/dev' into dev cato447 2022-06-05 19:31:23 +02:00
• 680efb4617 Revert "Merge branch 'main' into dev" catoandcato447 2022-06-05 19:26:50 +02:00
• b5cc8242d6 Merge branch 'main' into dev catoandGitHub 2022-06-05 19:26:50 +02:00