Commit graph

127 commits

Author SHA1 Message Date
73a6c33967 Merge branch 'master' into dockerBuild
Some checks failed
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline failed
ci/woodpecker/push/deb-build Pipeline failed
2025-03-06 19:07:29 -05:00
5a6c677c62 Spicy Chicken Pretzel Bacon Pub 2025-03-06 18:58:15 -05:00
86754e4ae7 Spicy Chicken Pretzel Bacon Pub 2025-03-06 18:51:54 -05:00
9cd2e6657e Chicken Parm and Linked Recipes 2025-03-06 16:44:12 -05:00
f22cf73708
Tweak CI to only use Tags for release
All checks were successful
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
2025-03-06 14:02:51 -05:00
69320517b6
Package gradle fails in docker container?
Some checks failed
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
ci/woodpecker/push/release-packaging Pipeline failed
2025-03-06 13:33:55 -05:00
81306b4140
Clean before build for consistency
Some checks failed
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
ci/woodpecker/push/release-packaging Pipeline failed
2025-03-06 13:13:16 -05:00
38afc6f5c9
Add quotes
Some checks failed
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
ci/woodpecker/push/release-packaging Pipeline failed
Tinkering with CI behaviour
2025-03-06 12:56:15 -05:00
7eaa2de71e
Experiment with secret values
Some checks failed
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
ci/woodpecker/push/release-packaging Pipeline failed
2025-03-06 12:34:38 -05:00
261509417d Menu Dividers 2025-03-05 23:41:41 -05:00
866111e4ba Ascending and Descending Sort Order 2025-03-05 23:40:04 -05:00
4471a95ab1 Clarifying language about what the Filter Style and Sort By options do 2025-03-05 23:32:40 -05:00
19c2cc56ed Added Sort By Types 2025-03-05 23:29:19 -05:00
3ae7688aeb Added France 2025-03-05 23:16:28 -05:00
fbc690cb56 Chicken Cordon Bleu 2025-03-05 23:15:22 -05:00
2e1c8b2b93 moved to bigger .dp size due to longer tags 2025-03-05 23:00:03 -05:00
17d9f6d0f7 Added more steps for the Recipe Slider 2025-03-05 22:52:15 -05:00
8e5911fe43 Opor Ayam
Fix for Counting issue
2025-03-05 22:34:43 -05:00
1c950ef339 fix for spacing on large screens 2025-03-05 21:57:10 -05:00
ceec79d11f weight shifts 2025-03-05 21:44:55 -05:00
ee7974d36c Sesame Chicken
Vegan, Vegetarian, Carnivorous Tags to all recipes,
'Fix' for regex issue so lists can be written cleaner (no more [[])
2025-03-05 21:38:49 -05:00
27611b180a
Move depends block to end
Some checks failed
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
ci/woodpecker/push/release-packaging Pipeline failed
2025-03-05 21:06:53 -05:00
f6834e5e4f
Test release build compatibility 2025-03-05 21:04:50 -05:00
652fcfe9a8
Merge remote-tracking branch 'origin/master' into dockerBuild
All checks were successful
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline was successful
2025-03-05 18:30:00 -05:00
44061c09f1 Couple of Fixes 2025-03-05 17:33:43 -05:00
76a2fc5ca0 Spice Bag 2025-03-05 17:18:39 -05:00
18dc524dc9 Spice Bag 2025-03-05 17:15:02 -05:00
47258d8f73 Spice Bag 2025-03-05 17:12:48 -05:00
9d27107fce General Tso's
Reduce Serving Size
2025-03-05 16:36:04 -05:00
0236b2df6e Chicken and Dumplings Soup 2025-03-05 15:37:39 -05:00
93a2a3c199 rearranged the layout of recipesSmall to match Large's arrangement (with the slider under the header but above the steps)
Also removed the name from the header on small and replaced it with a sticky header that includes the recipe name and Yx serving size counter.
2025-03-05 15:19:24 -05:00
feca7275b5 regex 2025-03-05 14:53:55 -05:00
b1e0d1d52d regex 2025-03-05 14:48:50 -05:00
9982363e04 regex 2025-03-05 14:03:54 -05:00
azea
b437e90f30 partial recipe update 2025-03-05 13:15:44 -05:00
b29bb87190
Tweak release build
All checks were successful
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline was successful
`./gradlew packageReleaseDeb` currently fails on Debian 12, due to
"proguard" issues... It's not totally clear what the failure is...
Possible place to start: https://www.guardsquare.com/manual/setup/gradleplugin
2025-03-04 21:07:11 -05:00
6a9329cdcf
Condense release packaging
All checks were successful
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline was successful
2025-03-04 20:12:30 -05:00
04c02e3dae
Fix syntax
All checks were successful
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline was successful
2025-03-04 17:10:07 -05:00
334d4e15e8
Add master to build files 2025-03-04 17:08:08 -05:00
2f2ba59ca3
add accept licenses again
All checks were successful
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline was successful
why was this not working before?
2025-03-04 15:33:29 -05:00
49628a73f4
minimal re-add
Some checks failed
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline failed
2025-03-04 15:22:12 -05:00
9d10a82966
fix dependency issue
Some checks failed
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline failed
also framework for android deploy/build for release
2025-03-04 15:09:31 -05:00
0207185ce3
Add comment for further research later
Some checks failed
ci/woodpecker/push/android-build Pipeline is running
ci/woodpecker/push/web-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline failed
2025-03-04 12:32:36 -05:00
7ddb939c2f
Add Android build to CI
Some checks failed
ci/woodpecker/push/android-build Pipeline was successful
ci/woodpecker/push/deb-build Pipeline failed
ci/woodpecker/push/web-build Pipeline was successful
2025-03-04 12:27:15 -05:00
60deff6c2a
Add jdk11 and jdk17 to deb build container
All checks were successful
ci/woodpecker/push/deb-build Pipeline was successful
ci/woodpecker/push/web-build Pipeline was successful
2025-03-04 12:13:25 -05:00
5758466477
Build deb with correct jdk
Some checks failed
ci/woodpecker/push/deb-build Pipeline failed
ci/woodpecker/push/web-build Pipeline failed
2025-03-04 12:08:06 -05:00
74fbe13c8e
Fix invalid env setup
Some checks failed
ci/woodpecker/push/deb-build Pipeline failed
ci/woodpecker/push/web-build Pipeline failed
2025-03-04 12:05:04 -05:00
0fac8f4611
Add androidhome environment variable 2025-03-04 12:03:16 -05:00
9d6ba8ed10
Actually install sdkmanager
Some checks failed
ci/woodpecker/push/deb-build Pipeline failed
ci/woodpecker/push/web-build Pipeline failed
2025-03-04 11:56:16 -05:00
080d85c266
Include Android SDK
Some checks failed
ci/woodpecker/push/deb-build Pipeline failed
ci/woodpecker/push/web-build Pipeline failed
2025-03-04 11:54:39 -05:00