etc404/thymecrunch
1
0
Fork 0
mirror of https://gitlab.com/etc404/software-engineering-project.git synced 2026-05-10 20:52:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
129 Commits 1 Branch 0 Tags
f021e34eec1f359944659a2717a58728513afa21
Commit Graph

129 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
durn f021e34eec Merge branch 'main' of https://gitlab.com/etc404/software-engineering-project 2026-04-23 19:58:26 -06:00
durn e594eb909b profanity checking for user profile and account creation 2026-04-23 19:57:49 -06:00
Madeleine Stamp 92001a8e49 Update 2 files 
- /src/main/resources/templates/my-profile.html
- /src/main/resources/static/css/my-profile.css
 2026-04-23 19:37:42 -06:00
etc404 5d38a9bdcd sad face 2026-04-23 19:14:05 -06:00
durn 317d45bad3 filtering for update 2026-04-23 18:29:39 -06:00
moon.gibson 6c8c86d1e7 delete functionality 2026-04-23 18:11:20 -06:00
Madeleine Stamp 9855cb24b6 Update file SiteController.java 2026-04-23 17:36:41 -06:00
kaipher7 78f00b2b9f Merge branch 'main' of gitlab.com:etc404/software-engineering-project 
":wq"
 2026-04-23 17:28:39 -06:00
kaipher7 3ddbf1a7ca tweaks 2026-04-23 17:28:25 -06:00
durn 5d85f73e3d merge' of https://gitlab.com/etc404/software-engineering-project 2026-04-23 17:26:07 -06:00
durn aef1a8776d bad words added (: 2026-04-23 17:25:15 -06:00
Madeleine Stamp 311d736805 Update 6 files 
- /src/main/java/com/example/demo/controller/SiteController.java
- /src/main/resources/templates/home.html
- /src/main/resources/templates/explore.html
- /src/main/resources/templates/view-recipe.html
- /src/main/resources/templates/public-profile.html
- /src/main/resources/templates/my-profile.html
 2026-04-23 17:23:34 -06:00
durn e768523efc profanity filtering front end 2026-04-23 17:22:42 -06:00
Madeleine Stamp ac435d4792 Update file SiteController.java 2026-04-23 17:08:32 -06:00
kaipher7 c740c9f2f8 Merge branch 'main' of gitlab.com:etc404/software-engineering-project 
merge
 2026-04-23 16:53:22 -06:00
kaipher7 23d9d1d6e8 logged out display 2026-04-23 16:53:17 -06:00
Madeleine Stamp 2b1d880e48 Update file SiteController.java 2026-04-23 16:42:38 -06:00
Madeleine Stamp c1883a3f8d Update file SiteController.java 2026-04-23 16:33:47 -06:00
kaipher7 f19a647ee5 fixes 2026-04-23 16:22:03 -06:00
Madeleine Stamp 3533d3576e Update file view-recipe.css 2026-04-23 15:28:27 -06:00
Madeleine Stamp c16adcc361 Update 2 files 
- /src/main/java/com/example/demo/controller/RecipeUploadController.java
- /src/main/resources/templates/create-recipe.html
 2026-04-23 15:03:20 -06:00
Madeleine Stamp 73718a5295 Update file RecipeUploadController.java 2026-04-23 13:07:55 -06:00
Madeleine Stamp 64cd8f2cb5 Update file ProfileController.java 2026-04-23 12:50:23 -06:00
Madeleine Stamp c4a40c1068 Update 2 files 
- /src/main/java/com/example/demo/controller/RecipeUploadController.java
- /src/main/java/com/example/demo/controller/RecipeUploadForm.java
 2026-04-23 12:41:10 -06:00
Madeleine Stamp 339cbbdf6e Update 13 files 
- /src/main/java/com/example/demo/service/Impl/UserServiceImpl.java
- /src/main/java/com/example/demo/service/Impl/RecipeServiceImpl.java
- /src/main/java/com/example/demo/service/UserService.java
- /src/main/java/com/example/demo/controller/SiteController.java
- /src/main/java/com/example/demo/controller/RecipeUploadForm.java
- /src/main/java/com/example/demo/controller/ProfileController.java
- /src/main/java/com/example/demo/config/SecurityConfig.java
- /src/main/java/com/example/demo/config/WebConfig.java
- /src/main/resources/templates/explore.html
- /src/main/resources/templates/view-recipe.html
- /src/main/resources/templates/public-profile.html
- /src/main/resources/templates/my-profile.html
- /src/main/resources/templates/home.html
 2026-04-23 12:33:42 -06:00
Madeleine Stamp 2ed5f11b21 Update 6 files 
- /src/main/resources/application.properties
- /src/main/resources/static/css/home.css
- /src/main/resources/static/css/explore.css
- /src/main/resources/static/css/my-profile.css
- /src/main/resources/static/css/public-profile.css
- /src/main/resources/static/css/view-recipe.css
 2026-04-23 12:25:59 -06:00
durn 6bafcd6f63 quantities are now option and can also be fractions 2026-04-23 11:02:03 -06:00
kaipher7 ff3137c4b6 small tweaks new bar 2026-04-22 08:35:52 -06:00
kaipher7 2225cbdf4b idk if i made changes 2026-04-22 08:27:53 -06:00
kaipher7 725244a6d7 view recipe display 2026-04-22 02:31:29 -06:00
kaipher7 2499ea086d public profile display 2026-04-22 00:43:24 -06:00
kaipher7 d568538177 updated cost after pulling changes 2026-04-22 00:03:06 -06:00
kaipher7 9f2a7a12c3 cost 2026-04-22 00:00:32 -06:00
kaipher7 f8f41d680b new recipe bar on home working 2026-04-21 23:54:16 -06:00
moon.gibson 231b1ed360 $ fix extended edition 2026-04-21 22:28:48 -06:00
kaipher7 c0b536cba6 fixes 2026-04-21 22:25:12 -06:00
kaipher7 de7595e52f dollar signs and filtering css 2026-04-21 21:59:50 -06:00
moon.gibson 2afab06410 dollar sign fix 2026-04-21 19:28:24 -06:00
durn d0910dabe8 fixed check boxes 2026-04-21 19:16:53 -06:00
durn 18e58ca5a5 Resolve merge 
'
 2026-04-21 18:37:28 -06:00
durn 69d823c977 got rid of odd duplicate lines 2026-04-21 18:24:46 -06:00
moon.gibson 9e59930de9 fix for recipe ingred steps ordering (hopefully) 2026-04-21 18:04:12 -06:00
etc404 e84ec7b0eb Realized I was being silly. 2026-04-21 15:50:44 -06:00
etc404 adca9f28bf Commit to test workflow. 2026-04-21 15:47:35 -06:00
etc404 83bafabb14 CI/CD Additions 2026-04-21 15:35:18 -06:00
Madeleine Stamp 022db901ae Fixed a redirect 2026-04-21 13:58:29 -06:00
Madeleine Stamp edb4ef7c0d Delete WebConfig (accidentally made) 2026-04-21 13:55:50 -06:00
Madeleine Stamp 267d5c7bdf Update 17 files 
- /src/main/resources/application.properties
- /src/main/resources/templates/view-recipe.html
- /src/main/resources/templates/create-recipe.html
- /src/main/resources/templates/home.html
- /src/main/resources/templates/explore.html
- /src/main/resources/templates/public-profile.html
- /src/main/resources/templates/my-profile.html
- /src/main/resources/templates/update-recipe.html
- /src/main/resources/static/css/view-recipe.css
- /src/main/java/com/example/demo/controller/SiteController.java
- /src/main/java/com/example/demo/controller/RecipeUploadController.java
- /src/main/java/com/example/demo/controller/RecipeUploadForm.java
- /src/main/java/com/example/demo/config/WebConfig
- /src/main/java/com/example/demo/config/SecurityConfig.java
- /src/main/java/com/example/demo/config/WebConfig.java
- /src/main/java/com/example/demo/service/Impl/RecipeServiceImpl.java
- /src/main/java/com/example/demo/service/RecipeService.java
 2026-04-21 13:37:02 -06:00
kaipher7 ce3cea01c3 js for cost on creating a recipe 2026-04-20 21:09:24 -06:00
kaipher7 37f8cca781 js for cost 2026-04-20 20:58:23 -06:00