Commit Graph

Select branches

Hide Pull Requests

develop

master

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#5

#6

#7

#8

#9

Mono Color

• 4a0b0fe804 Merge pull request 'Completed web programming project' (#44) from develop into master master steve_dekart 2025-07-07 19:00:17 +02:00
• 9a28d6b322 fixed reviews adaptive #44 develop David Katrinka 2025-07-07 13:01:32 +02:00
• 8356c80ca3 Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into develop Stepan 2025-07-07 12:58:17 +02:00
• 03fa67da84 Minor changer Stepan 2025-07-07 12:58:06 +02:00
• 7c69e94afa TIST-44: added documentation greendavid004 2025-07-07 09:36:51 +02:00
• 3e0f72c4f6 fixed keywords on single item David Katrinka 2025-07-06 15:14:08 +02:00
• 2860cd182f Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into develop Stepan 2025-07-06 14:43:57 +02:00
• 552970f8b0 updated Stepan 2025-07-06 14:43:45 +02:00
• 59f5e7b6b0 Merge pull request 'TIST-50: fixed adaptive for submit recipe page' (#43) from TIST-50 into develop greendavid004 2025-07-06 14:40:30 +02:00
• 8e4996651e TIST-50: fixed adaptive for submit recipe page #43 David Katrinka 2025-07-06 14:39:06 +02:00
• 7012c9aa85 Merge pull request 'TIST-16: Add new recipes by user' (#42) from TIST-16 into develop steve_dekart 2025-07-06 14:32:59 +02:00
• e2cc848fec Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into TIST-16 #42 Stepan 2025-07-06 14:31:28 +02:00
• b21465e89f Merge pull request 'TIST-49: fixed display issues of warning and success alerts' (#41) from TIST-49 into develop steve_dekart 2025-07-06 14:31:23 +02:00
• 5cd2030848 Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into TIST-16 Stepan 2025-07-06 14:31:08 +02:00
• 6dc6cd98ea Added functional for submit recipe Stepan 2025-07-06 14:30:47 +02:00
• db6f9538e1 TIST-49: fixed display issues of warning and success alerts #41 David Katrinka 2025-07-06 13:57:56 +02:00
• d0db460f28 Merge pull request 'TIST-45: added custom error page' (#40) from TIST-45 into develop steve_dekart 2025-07-06 13:51:53 +02:00
• df65db797b Merge pull request 'TIST-48: added reset button in catalog filters' (#39) from TIST-48 into develop steve_dekart 2025-07-06 13:51:46 +02:00
• c56bfdc80e Merge pull request 'TIST-47: fixed display issues with pagination' (#38) from TIST-47 into develop steve_dekart 2025-07-06 13:51:40 +02:00
• cbcb3f1c5a Merge pull request 'TIST-46: fixed display issues with recent reviews and daily recipes' (#37) from TIST-46 into develop steve_dekart 2025-07-06 13:51:16 +02:00
• 924fb17927 TIST-45: added custom error page #40 David Katrinka 2025-07-06 13:48:20 +02:00
• ba7a1eac31 TIST-48: added reset button in catalog filters #39 David Katrinka 2025-07-06 13:34:59 +02:00
• 97895c35d2 TIST-47: fixed display issues with pagination #38 David Katrinka 2025-07-06 13:23:27 +02:00
• ffaef7e153 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-46 #37 David Katrinka 2025-07-06 13:07:08 +02:00
• 931596354b TIST-46: fixed display issues with recent reviews and daily recipes David Katrinka 2025-07-06 13:06:57 +02:00
• 2a97a3b2c7 Merge pull request 'TIST-22: added submit recipe page and create ingredient modal' (#36) from TIST-22 into develop steve_dekart 2025-07-06 12:57:33 +02:00
• bb8cbbb274 added link to submit to header #36 David Katrinka 2025-07-06 11:34:39 +02:00
• 36e7435bd4 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-22 David Katrinka 2025-07-06 11:20:51 +02:00
• 26cf158ec5 TIST-22: added single recipe submit page and new ingredient modal David Katrinka 2025-07-06 11:20:45 +02:00
• e2fe1a4173 Merge pull request 'TIST-32: Reviews model and publish as pending' (#35) from TIST-32 into develop steve_dekart 2025-07-06 09:55:55 +02:00
• 9fc579fc56 Added review model and user can publish it #35 Stepan 2025-07-06 09:53:02 +02:00
• 9f2d2a13d2 Merge pull request 'TIST-41: added reviews and reviews form to singe recipe page' (#32) from TIST-41 into develop greendavid004 2025-07-05 20:53:06 +02:00
• 1974d44a35 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-41 #32 David Katrinka 2025-07-05 20:52:46 +02:00
• f336917b62 Merge pull request 'TIST-39: added ajax to daily meals select' (#33) from TIST-39 into develop greendavid004 2025-07-05 20:52:28 +02:00
• 4ccb8ac05e fixed display issue with select dropdown #33 David Katrinka 2025-07-05 20:51:43 +02:00
• a6a7fbade6 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-39 David Katrinka 2025-07-05 20:36:37 +02:00
• 9a3d2da412 Merge pull request 'TIST-43: Fill index page, favorites and meal of day' (#34) from TIST-43 into develop steve_dekart 2025-07-05 20:36:04 +02:00
• 81a88b93d5 Added in_usermenu field for RecipeModel #34 Stepan 2025-07-05 20:35:34 +02:00
• b854c92377 Filled index, meals and favorites page. Added pagination for recipes Stepan 2025-07-05 20:20:33 +02:00
• 3f67fe27d0 TIST-39: added ajax to daily meals select David Katrinka 2025-07-05 20:19:45 +02:00
• 6ef6930766 Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-41 David Katrinka 2025-07-04 21:33:08 +02:00
• f1bebeee48 TIST-41: added reviews and reviews form to singe recipe page David Katrinka 2025-07-04 21:32:57 +02:00
• 9a66bb2b6f Merge pull request 'TIST-36: Prefetch related models for a list of model instances' (#31) from TIST-36 into develop steve_dekart 2025-07-04 20:52:55 +02:00
• 69f47cdc42 Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into TIST-36 #31 Stepan 2025-07-04 20:52:31 +02:00
• ec6f7bcabd Merge pull request 'TIST-38: fixed width of single recipe info details' (#30) from TIST-38 into develop greendavid004 2025-07-04 20:52:18 +02:00
• 15f3b42d84 Added prefetch_related function to relate origin models with their relations Stepan 2025-07-04 20:49:37 +02:00
• d846de0182 TIST-38: fixed width of single recipe info details #30 David Katrinka 2025-07-04 19:54:48 +02:00
• 07c4c49cf0 Merge pull request 'TIST-40: added search functionality using fetch' (#28) from TIST-40 into develop greendavid004 2025-07-03 22:41:54 +02:00
• caa48d3b62 added href to search results, changed to use global hidden atribute, added click outside of search to hide results #28 David Katrinka 2025-07-03 22:40:09 +02:00
• 44863aecbd Merge branch 'develop' of gitea.steve-dekart.xyz:web_programming/fridge_bites into TIST-40 David Katrinka 2025-07-03 22:30:18 +02:00
• 34df639446 Merge pull request 'TIST-42: Add id or url to item for search action on ajax' (#29) from TIST-42 into develop steve_dekart 2025-07-03 22:27:51 +02:00
• 2651014595 Added id fields for search ingredients ajax action #29 Stepan 2025-07-03 22:23:42 +02:00
• 572b7cf3f4 Added url, id, image_url fields for search ajax action Stepan 2025-07-03 22:21:24 +02:00
• a6a759b8f9 TIST-40: added search functionality using fetch David Katrinka 2025-07-03 15:36:57 +02:00
• 80a23a5080 Merge pull request 'TIST-37: Send ajax request to add favorite' (#27) from TIST-37 into develop steve_dekart 2025-07-02 22:35:06 +02:00
• f0ed2f0712 added files #27 Stepan 2025-07-02 22:33:45 +02:00
• 6f306beb4b Added favorite button functional Stepan 2025-07-02 22:32:15 +02:00
• cc0125d997 Merge pull request 'TIST-35: Favorite property on ProductModel' (#26) from TIST-35 into develop steve_dekart 2025-07-02 20:45:28 +02:00
• c1dc0389e9 Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into TIST-35 #26 Stepan 2025-07-02 20:45:01 +02:00
• aa0e153f65 Merge pull request 'TIST-23: added static favorites page and controller' (#25) from TIST-23 into develop greendavid004 2025-07-02 20:44:44 +02:00
• ae65ec769a Added new property for Recipe Stepan 2025-07-02 20:41:41 +02:00
• 36b0f58638 TIST-23: added static favorites page and controller #25 David Katrinka 2025-07-01 15:35:50 +02:00
• 1f43f408cc Merge pull request 'TIST-34: Fix display issues on Admin page for select and catalog' (#24) from TIST-34 into develop steve_dekart 2025-06-30 22:22:19 +02:00
• d0ceea9a60 fixed minor issues #24 Stepan 2025-06-30 22:19:15 +02:00
• 216a1f8b7a Merge pull request 'TIST-31: Favorites model and ajax endpoint' (#23) from TIST-31 into develop steve_dekart 2025-06-30 22:14:10 +02:00
• e5b2a7fd62 Merge branch 'develop' of https://gitea.steve-dekart.xyz/web_programming/fridge_bites into TIST-31 #23 Stepan 2025-06-30 22:13:14 +02:00
• 29d9f21d71 Merge pull request 'TIST-21: added static daily meals page' (#22) from TIST-21 into develop greendavid004 2025-06-30 22:12:39 +02:00
• 7dfdc37a90 removed unused 'use' from daily recipes controller #22 David Katrinka 2025-06-30 22:09:56 +02:00
• 2caecfe4a4 Fixed eng mistakes 2 Stepan 2025-06-30 21:57:10 +02:00
• 797d9fd334 Fixed eng mistakes Stepan 2025-06-30 21:56:20 +02:00
• f66b0f6a1e Added FavoriteModel on db and created new endpoint for ajax Stepan 2025-06-30 21:51:00 +02:00
• 46adce3c77 added static daily meals page David Katrinka 2025-06-29 18:03:04 +02:00
• 3e9fdd36bb Merge pull request 'TIST-28: Create ajax endpoint to create new ingredient and search ingredients' (#20) from TIST-28 into develop greendavid004 2025-06-29 17:35:27 +02:00
• f588e5f608 Merge pull request 'TIST-30: fixed catalog anchor textt decorations and removed display grid from filters, removed images from categories in index and updated design' (#21) from TIST-30 into develop greendavid004 2025-06-29 17:33:27 +02:00
• fc357f4eb5 TIST-30: fixed catalog anchor textt decorations and removed display grid from filters, removed images from categories in index and updated design #21 David Katrinka 2025-06-29 15:43:04 +02:00
• 95e41b813f Added ajax endpoints to search and create ingredient #20 Stepan 2025-06-29 15:02:57 +02:00
• c35cf57eab Merge pull request 'TIST-24: Fixed small issues on admin page' (#19) from TIST-24 into develop greendavid004 2025-06-29 13:43:48 +02:00
• f556d9948c fixed more small issues on admin page #19 David Katrinka 2025-06-29 13:23:34 +02:00
• 184d7f43cb TIST-20: Fixed small issues on admin page David Katrinka 2025-06-28 17:33:22 +02:00
• 420d0bfc6c Merge pull request 'TIST-17: added single recipe page' (#15) from TIST-17 into develop steve_dekart 2025-06-29 12:25:44 +02:00
• 76d4011c41 fixed all issues other than modal #15 David Katrinka 2025-06-29 11:43:33 +02:00
• c58a94d23c TIST-17: added single recipe page David Katrinka 2025-06-28 15:32:35 +02:00
• 703a327f39 Merge pull request 'TIST-29: ThreeJS' (#18) from TIST-29 into develop steve_dekart 2025-06-29 11:58:00 +02:00
• 3959a8c55a Added 3d model and customized first block on index page #18 Stepan 2025-06-29 11:36:50 +02:00
• b6cc9e7a02 Merge pull request 'TIST-27: UserMenu model and ajax endpoint to add' (#17) from TIST-27 into develop steve_dekart 2025-06-29 10:03:39 +02:00
• 4b2cac054f Fixed const name #17 Stepan 2025-06-29 00:53:28 +02:00
• c3967b9abc Added UserMenu ajax endpoint Stepan 2025-06-29 00:51:43 +02:00
• bb00e19385 Updated README Stepan 2025-06-28 11:47:16 +02:00
• dba1d5c8ae Merge pull request 'TIST-26: Added export recipe to pdf endpoint' (#14) from TIST-26 into develop steve_dekart 2025-06-28 11:28:27 +02:00
• 6259cc3688 Added export recipe to pdf endpoint #14 Stepan 2025-06-28 11:25:24 +02:00
• a2c2b31597 Merge pull request 'TIST-25: filter form on catalog page' (#13) from TIST-25 into develop steve_dekart 2025-06-28 08:47:23 +02:00
• 783e951570 Merge pull request 'TIST-12: Create endpoint for search in ajax' (#12) from TIST-12 into develop steve_dekart 2025-06-28 08:43:57 +02:00
• d78de57b84 Merge pull request 'TIST-15: Add additional information for dashboard' (#11) from TIST-15 into develop steve_dekart 2025-06-28 08:43:47 +02:00
• 51899db9fb Added filter on the page #13 Stepan 2025-06-28 08:41:09 +02:00
• c374c50ca0 Added ajax search and fixed body type for request on ajax #12 Stepan 2025-06-28 00:39:25 +02:00
• b66f2c6709 Added information on dashboard #11 Stepan 2025-06-28 00:10:15 +02:00
• b6970ebef7 Fixed path issue during upload image by model Stepan 2025-06-27 22:44:05 +02:00
• 318a40c222 Merge pull request 'TIST-11: Create filter with ManyToMany relation between Recipe and Ingredients' (#10) from TIST-11 into develop steve_dekart 2025-06-22 20:40:14 +02:00
• 0a7ce228a2 Create filter with ManyToMany relation between Recipe and Ingredients #10 Stepan 2025-06-21 23:51:26 +02:00
• 5b1d4e60da Merge pull request 'TIST-20: added recipes page, addded recipes page to header links, added display: grid to daily meals' (#9) from TIST-20 into develop steve_dekart 2025-06-19 18:18:43 +02:00