Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• a118195e63 . main etc404 2026-05-10 14:52:45 -06:00
• 8c60445a66 Official Nothing Burger Support etc404 2026-04-30 14:17:04 -06:00
• bc2b71ef21 From Patch etc404 2026-04-30 12:19:50 -06:00
• 37c3fb0979 more checks and stuff for verification durn 2026-04-30 00:04:52 -06:00
• e7be40bb8d verification update durn 2026-04-29 12:14:28 -06:00
• f9dfbc813a added more checks to email verif durn 2026-04-29 12:14:00 -06:00
• 8be1849e80 Check spam message Madeleine Stamp 2026-04-29 09:55:52 -06:00
• 55b61d761a Remove saved recipe functionality Madeleine Stamp 2026-04-29 09:44:24 -06:00
• 57e3115634 added the email verification stuff. durn 2026-04-28 23:21:22 -06:00
• 2d4fdf4a87 resend code added durn 2026-04-28 23:21:16 -06:00
• 229bc6bf69 Functional Verification durn 2026-04-28 22:35:00 -06:00
• 975d8096de Merge branch 'main' of gitlab.com:etc404/software-engineering-project kaipher7 2026-04-28 17:50:51 -06:00
• f14953b200 slash kaipher7 2026-04-28 17:50:36 -06:00
• cd35378ffa Workflow change etc404 2026-04-28 16:51:18 -06:00
• a936209a1a Made workflows more professional etc404 2026-04-28 16:25:14 -06:00
• 9437bf57e0 visual error on logged out public profile kaipher7 2026-04-28 16:02:50 -06:00
• 046a2d7c0c header is link and doesn't wrap text kaipher7 2026-04-28 15:53:09 -06:00
• c7fd85987f Favicon etc404 2026-04-28 14:33:09 -06:00
• ac5e289db8 Notes not randomized anymore? durn 2026-04-25 14:17:30 -06:00
• ca3e64c096 different approach to filtering and old extensive list durn 2026-04-25 13:27:51 -06:00
• 1e86e42c67 less intense filtering durn 2026-04-25 13:18:31 -06:00
• 716499ffca added implementations back in durn 2026-04-25 11:49:25 -06:00
• 263ec9fd07 simpler bad word list durn 2026-04-25 10:53:48 -06:00
• 70ce01a551 tweaks kaipher7 2026-04-24 08:04:58 -06:00
• c625406ac9 feedback and bad words kaipher7 2026-04-24 07:46:00 -06:00
• 05a4775444 Merge branch 'main' of gitlab.com:etc404/software-engineering-project kaipher7 2026-04-23 23:58:05 -06:00
• 246f045c2a hopefully fixes delete function for favorites moon.gibson 2026-04-23 22:53:52 -06:00
• f021e34eec Merge branch 'main' of https://gitlab.com/etc404/software-engineering-project durn 2026-04-23 19:58:26 -06:00
• e594eb909b profanity checking for user profile and account creation durn 2026-04-23 19:57:49 -06:00
• 92001a8e49 Update 2 files Madeleine Stamp 2026-04-23 19:37:42 -06:00
• 5d38a9bdcd sad face etc404 2026-04-23 19:14:05 -06:00
• 317d45bad3 filtering for update durn 2026-04-23 18:29:39 -06:00
• bd8ca28556 tweaks kaipher7 2026-04-23 18:20:59 -06:00
• 6c8c86d1e7 delete functionality moon.gibson 2026-04-23 18:08:12 -06:00
• 9855cb24b6 Update file SiteController.java Madeleine Stamp 2026-04-23 17:36:41 -06:00
• 78f00b2b9f Merge branch 'main' of gitlab.com:etc404/software-engineering-project ":wq" kaipher7 2026-04-23 17:28:39 -06:00
• 3ddbf1a7ca tweaks kaipher7 2026-04-23 17:28:25 -06:00
• 5d85f73e3d merge' of https://gitlab.com/etc404/software-engineering-project durn 2026-04-23 17:26:07 -06:00
• aef1a8776d bad words added (: durn 2026-04-23 17:25:15 -06:00
• 311d736805 Update 6 files Madeleine Stamp 2026-04-23 17:23:34 -06:00
• e768523efc profanity filtering front end durn 2026-04-23 17:22:42 -06:00
• ac435d4792 Update file SiteController.java Madeleine Stamp 2026-04-23 17:08:32 -06:00
• c740c9f2f8 Merge branch 'main' of gitlab.com:etc404/software-engineering-project kaipher7 2026-04-23 16:53:22 -06:00
• 23d9d1d6e8 logged out display kaipher7 2026-04-23 16:53:17 -06:00
• 2b1d880e48 Update file SiteController.java Madeleine Stamp 2026-04-23 16:42:38 -06:00
• c1883a3f8d Update file SiteController.java Madeleine Stamp 2026-04-23 16:33:47 -06:00
• f19a647ee5 fixes kaipher7 2026-04-23 16:22:03 -06:00
• 3533d3576e Update file view-recipe.css Madeleine Stamp 2026-04-23 15:28:27 -06:00
• c16adcc361 Update 2 files Madeleine Stamp 2026-04-23 15:03:20 -06:00
• 73718a5295 Update file RecipeUploadController.java Madeleine Stamp 2026-04-23 13:07:55 -06:00
• 64cd8f2cb5 Update file ProfileController.java Madeleine Stamp 2026-04-23 12:50:23 -06:00
• c4a40c1068 Update 2 files Madeleine Stamp 2026-04-23 12:41:10 -06:00
• 339cbbdf6e Update 13 files Madeleine Stamp 2026-04-23 12:33:42 -06:00
• 2ed5f11b21 Update 6 files Madeleine Stamp 2026-04-23 12:25:59 -06:00
• 6bafcd6f63 quantities are now option and can also be fractions durn 2026-04-23 11:02:03 -06:00
• ff3137c4b6 small tweaks new bar kaipher7 2026-04-22 08:35:52 -06:00
• 2225cbdf4b idk if i made changes kaipher7 2026-04-22 08:27:53 -06:00
• 725244a6d7 view recipe display kaipher7 2026-04-22 02:31:29 -06:00
• 2499ea086d public profile display kaipher7 2026-04-22 00:43:24 -06:00
• d568538177 updated cost after pulling changes kaipher7 2026-04-22 00:03:06 -06:00
• 9f2a7a12c3 cost kaipher7 2026-04-22 00:00:32 -06:00
• f8f41d680b new recipe bar on home working kaipher7 2026-04-21 23:54:16 -06:00
• 231b1ed360 $ fix extended edition moon.gibson 2026-04-21 22:19:09 -06:00
• c0b536cba6 fixes kaipher7 2026-04-21 22:25:12 -06:00
• de7595e52f dollar signs and filtering css kaipher7 2026-04-21 21:59:50 -06:00
• 2afab06410 dollar sign fix moon.gibson 2026-04-21 19:28:24 -06:00
• d0910dabe8 fixed check boxes durn 2026-04-21 19:16:53 -06:00
• 18e58ca5a5 Resolve merge ' durn 2026-04-21 18:37:28 -06:00
• 69d823c977 got rid of odd duplicate lines durn 2026-04-21 18:24:46 -06:00
• 9e59930de9 fix for recipe ingred steps ordering (hopefully) moon.gibson 2026-04-21 18:04:12 -06:00
• e84ec7b0eb Realized I was being silly. etc404 2026-04-21 15:50:44 -06:00
• adca9f28bf Commit to test workflow. etc404 2026-04-21 15:47:35 -06:00
• 83bafabb14 CI/CD Additions etc404 2026-04-21 15:35:18 -06:00
• 022db901ae Fixed a redirect Madeleine Stamp 2026-04-21 13:58:29 -06:00
• edb4ef7c0d Delete WebConfig (accidentally made) Madeleine Stamp 2026-04-21 13:55:50 -06:00
• 267d5c7bdf Update 17 files Madeleine Stamp 2026-04-21 13:37:02 -06:00
• ce3cea01c3 js for cost on creating a recipe kaipher7 2026-04-20 21:09:24 -06:00
• 37f8cca781 js for cost kaipher7 2026-04-20 20:58:23 -06:00
• 24d193504e create icon and cards improved kaipher7 2026-04-20 11:38:46 -06:00
• 5cf01983e6 my-profile pretty much done' kaipher7 2026-04-20 00:34:59 -06:00
• 12afcaa58a explore visual tweaks kaipher7 2026-04-19 17:08:25 -06:00
• 3afe31d425 explore visual tweaks kaipher7 2026-04-19 16:54:20 -06:00
• 7d59e99f7d Update 3 files Madeleine Stamp 2026-04-19 10:06:02 -06:00
• 3d4e64826f Merge branch 'main' of gitlab.com:etc404/software-engineering-project kaipher7 2026-04-18 23:51:59 -06:00
• 0c71ecf4a5 added swirl decor to login and create account kaipher7 2026-04-18 23:51:48 -06:00
• 2a14f1264a Edit SecurityConfig.java Madeleine Stamp 2026-04-18 14:09:38 -06:00
• 659ab79497 Update 16 files Madeleine Stamp 2026-04-18 14:08:08 -06:00
• c2e6722829 explore page working i believe durn 2026-04-17 19:30:25 -06:00
• b26af70ef5 create account and recipe working. Explore kind of works durn 2026-04-17 10:46:38 -06:00
• b32b3d3a03 Oops etc404 2026-04-16 18:34:58 -06:00
• 6663539011 The Unpopular Decision etc404 2026-04-16 17:49:41 -06:00
• cefc69bd33 The Unpopular Decision etc404 2026-04-16 17:47:56 -06:00
• f9852facb3 P removal etc404 2026-04-16 17:42:52 -06:00
• 04fb4c6465 Update file UserController.java Madeleine Stamp 2026-04-16 17:40:18 -06:00
• 20a6670668 Merge remote-tracking branch 'refs/remotes/origin/main' kaipher7 2026-04-16 17:38:07 -06:00
• 27838a1678 view recipe, not working kaipher7 2026-04-16 17:26:33 -06:00
• 06df1e9d1b Re-add create account page etc404 2026-04-16 17:22:04 -06:00
• 0d4c8582f8 Merge branch 'NapoleonsLeftBoot-main-patch-74b7' into 'main' Autumn Wolf 2026-04-16 17:16:59 -06:00
• dfa91947f9 more explore page edits kaipher7 2026-04-16 17:09:05 -06:00
• a7eaddbf5e explore page in progress kaipher7 2026-04-16 11:22:18 -06:00