Manon Brun
b70a3bce9f
Merge branch 'develop' into fixRounding
2024-04-08 09:13:57 +01:00
Manon Brun
78686faad3
fix: rounding units
2024-04-05 15:57:09 +01:00
vabene1111
4293ec77c0
fixed changing categories of shopping items
2024-04-04 20:49:48 +02:00
vabene1111
37fb0418ac
fixed default page setting and made PWA respect that setting
2024-03-09 07:44:32 +01:00
vabene1111
ae70064c06
renamed ingredients_markdown and removed ingredients_vue
2024-02-24 13:05:23 +01:00
vabene1111
b109e28b0c
almost all unit conversion working
2024-02-19 17:20:04 +01:00
vabene1111
6b6556d532
fixed showing import numbers on open data component
2024-02-19 08:09:09 +01:00
vabene1111
b0439cc13b
food editor open data slug fix
2024-02-18 18:20:45 +01:00
vabene1111
55b8b78a16
show where properties are missing
2024-02-18 17:48:47 +01:00
vabene1111
28479e96e9
improved property system to differentiate between unknown and zero
2024-02-18 11:26:16 +01:00
vabene1111
717d4d2346
added open data slug to food editor
2024-02-18 09:06:51 +01:00
vabene1111
d62ba2f5e8
Merge branch 'develop' into add-human-friendly-css-classes
2024-02-18 08:04:27 +01:00
vabene1111
705fa18dd6
fixed open data property type and category
2024-02-17 08:43:41 +01:00
vabene1111
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
tomtjes
f34dc4d242
move escapeCSS function to mixins
2024-02-15 14:56:04 -05:00
vabene1111
43443305e6
basic bold function
2024-02-15 20:54:54 +01:00
tomtjes
b5a204265a
fix CSS escape (remove HTML sanitize)
2024-02-14 17:18:26 -05:00
tomtjes
8e72108290
use BEM classes
...
add class names for foods, units, keywords (not following BEM closely)
2024-02-14 16:44:12 -05:00
Patrick Magauran
cf190734b2
Switches to named GET Parameter for servings
2024-02-13 20:59:04 -05:00
Patrick Magauran
a9a3dd6e51
Revert "Add Setting to enable / disable feature"
...
This reverts commit 768e9f8801 .
2024-02-13 20:30:59 -05:00
vabene1111
00ff13ae08
basic button affecting editor
2024-02-13 17:59:44 +01:00
vabene1111
8f272eba3b
able to edit template strings
2024-02-11 10:41:15 +01:00
vabene1111
ca35052ac0
some more markdown editor progress
2024-02-11 10:00:49 +01:00
vabene1111
cca7b7f558
codemirror history and highlighting
2024-02-10 12:10:21 +01:00
vabene1111
3f962345f7
placeholder working
2024-02-10 10:08:32 +01:00
vabene1111
6aa2aa42c7
added more editing capabilities to line item modal
2024-02-10 08:56:15 +01:00
tomtjes
0ee5164aac
remove class used twice
2024-02-07 20:51:59 -05:00
tomtjes
1819ff2bbd
add classes to main components/views
2024-02-07 19:18:51 -05:00
tomtjes
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
Patrick Magauran
768e9f8801
Add Setting to enable / disable feature
2024-02-06 22:52:59 -05:00
Patrick Magauran
13f532a67b
Add serving size to recipe url so it loads with num
2024-02-06 22:21:37 -05:00
vabene1111
98b06b6f3c
improved modal
2024-02-06 14:48:18 +01:00
vabene1111
5211fbe6da
styling and bg sync message
2024-02-06 13:52:26 +01:00
vabene1111
a2cb1ccf3a
Revert "playing with checkbox design"
...
This reverts commit ece7ca7e82 .
2024-02-06 13:25:34 +01:00
vabene1111
ece7ca7e82
playing with checkbox design
2024-02-01 21:09:21 +01:00
vabene1111
6ccd74edab
Merge branch 'develop' into feature/shopping-ui
2024-01-29 10:29:48 +01:00
vabene1111
aac729a3a0
fixed firefox
2024-01-29 08:46:34 +01:00
vabene1111
0f1a3ba5d8
improvements
2024-01-29 08:37:53 +01:00
vabene1111
fff2ecd58d
some fixes
2024-01-28 20:31:24 +01:00
tomtjes
f54a6480f7
fix description scroll
2024-01-28 13:20:00 -05:00
vabene1111
79b57eab13
fixed paddings/horizontal scrol
2024-01-28 16:29:53 +01:00
vabene1111
44f6a581c7
some more icons
2024-01-28 12:11:25 +01:00
vabene1111
5853ca9243
handle partially delayed/checked
2024-01-28 12:06:27 +01:00
vabene1111
09c1446c06
fixed pdf export
2024-01-28 11:39:00 +01:00
vabene1111
3e51bdc7f0
Merge branch 'develop' into feature/shopping-ui
...
# Conflicts:
# cookbook/serializer.py
2024-01-28 11:05:56 +01:00
vabene1111
6b4b2a8f87
removed use_plural space attribute and left over settings
2024-01-28 08:42:42 +01:00
vabene1111
8e4c8821dc
recipe list and detail modal background
2024-01-23 18:48:29 +01:00
vabene1111
7673e794bf
moved date format functions to utilities
2024-01-23 18:25:56 +01:00
vabene1111
64e54ceaec
added mealplan info to recipes tab
2024-01-23 18:09:13 +01:00
vabene1111
c118dca2c0
Merge branch 'develop' into feature/shopping-ui
2024-01-23 16:04:18 +01:00