Commit Graph

1528 Commits

Author SHA1 Message Date
55b8b78a16 show where properties are missing 2024-02-18 17:48:47 +01:00
28479e96e9 improved property system to differentiate between unknown and zero 2024-02-18 11:26:16 +01:00
717d4d2346 added open data slug to food editor 2024-02-18 09:06:51 +01:00
d62ba2f5e8 Merge branch 'develop' into add-human-friendly-css-classes 2024-02-18 08:04:27 +01:00
705fa18dd6 fixed open data property type and category 2024-02-17 08:43:41 +01:00
b3a283c1a4 fixed two more comparisons 2024-02-17 08:19:46 +01:00
48447f1c8a fixed always false check 2024-02-16 20:40:40 +01:00
631af65cf3 Merge pull request #2810 from m7modSy/develop
Reorder books #2338
2024-02-16 19:53:38 +01:00
b99443cb30 Merge pull request #2938 from patmagauran/meal-plan-serving-size-link
Add ability to open recipes with specified number of servings from meal plan
2024-02-16 19:46:36 +01:00
f34dc4d242 move escapeCSS function to mixins 2024-02-15 14:56:04 -05:00
5bbcdd2551 Merge branch 'develop' of https://github.com/TandoorRecipes/recipes into develop 2024-02-15 20:55:02 +01:00
43443305e6 basic bold function 2024-02-15 20:54:54 +01:00
038d03783f Translated using Weblate (Chinese (Simplified))
Currently translated at 99.2% (558 of 562 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
2024-02-15 03:19:57 +00:00
b5a204265a fix CSS escape (remove HTML sanitize) 2024-02-14 17:18:26 -05:00
8e72108290 use BEM classes
add class names for foods, units, keywords (not following BEM closely)
2024-02-14 16:44:12 -05:00
cf190734b2 Switches to named GET Parameter for servings 2024-02-13 20:59:04 -05:00
a9a3dd6e51 Revert "Add Setting to enable / disable feature"
This reverts commit 768e9f8801.
2024-02-13 20:30:59 -05:00
00ff13ae08 basic button affecting editor 2024-02-13 17:59:44 +01:00
9232465e21 Translated using Weblate (Polish)
Currently translated at 100.0% (562 of 562 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pl/
2024-02-12 12:19:57 +00:00
30e853088c Translated using Weblate (German)
Currently translated at 100.0% (562 of 562 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/
2024-02-12 12:19:57 +00:00
8f272eba3b able to edit template strings 2024-02-11 10:41:15 +01:00
ca35052ac0 some more markdown editor progress 2024-02-11 10:00:49 +01:00
cca7b7f558 codemirror history and highlighting 2024-02-10 12:10:21 +01:00
3f962345f7 placeholder working 2024-02-10 10:08:32 +01:00
0827cb387f markdown editor in test view 2024-02-10 09:28:44 +01:00
b2a4b084d7 Merge branch 'feature/shopping-ui' into develop 2024-02-10 09:26:46 +01:00
8e4e785179 added editor button for scalable number 2024-02-10 09:26:29 +01:00
fb8e04fee5 swipe test view 2024-02-10 09:07:03 +01:00
03c775d1cc added merge capabilities to supermarket category 2024-02-10 09:01:21 +01:00
6aa2aa42c7 added more editing capabilities to line item modal 2024-02-10 08:56:15 +01:00
0ee5164aac remove class used twice 2024-02-07 20:51:59 -05:00
1819ff2bbd add classes to main components/views 2024-02-07 19:18:51 -05:00
14c2be9277 add classes to scalable numbers
apply "scalable" to all
apply "scaled-up" when ingredient factor is >1
apply "unscaled" when ingredient factor is 1
apply "scaled-down" when factor is <1
2024-02-07 16:51:19 -05:00
768e9f8801 Add Setting to enable / disable feature 2024-02-06 22:52:59 -05:00
e8db2b6401 Clicking on Recipe in Meal Plan auto does servings 2024-02-06 22:37:25 -05:00
13f532a67b Add serving size to recipe url so it loads with num 2024-02-06 22:21:37 -05:00
61ccc6061c updated api client 2024-02-06 19:21:55 +01:00
98b06b6f3c improved modal 2024-02-06 14:48:18 +01:00
5211fbe6da styling and bg sync message 2024-02-06 13:52:26 +01:00
a2cb1ccf3a Revert "playing with checkbox design"
This reverts commit ece7ca7e82.
2024-02-06 13:25:34 +01:00
010fb0112f Merge branch 'develop' into feature/shopping-ui 2024-02-02 07:46:48 +01:00
ece7ca7e82 playing with checkbox design 2024-02-01 21:09:21 +01:00
bb1b1a40b6 fixed search on userfile and supermarket generic select 2024-02-01 20:00:51 +01:00
f7b25c9b31 easier supermarket select on mobile 2024-02-01 19:39:11 +01:00
7f6cd16a77 changed default supermarket prefs 2024-02-01 19:36:07 +01:00
e5303967df Translated using Weblate (Italian)
Currently translated at 84.6% (469 of 554 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
2024-02-01 17:22:53 +00:00
6ccd74edab Merge branch 'develop' into feature/shopping-ui 2024-01-29 10:29:48 +01:00
1d236998d2 Merge pull request #2909 from tomtjes/fixes-for-beta
fix description scroll
2024-01-29 09:06:49 +01:00
aac729a3a0 fixed firefox 2024-01-29 08:46:34 +01:00
ee7cdacc40 cleared TODOs 2024-01-29 08:41:02 +01:00