kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity
1,693 Commits 2 Branches 80 Tags
8d2c3ae584a2f045dd83be0c83a1778d7fad78c1
Commit Graph

640 Commits

Author SHA1 Message Date
Bernd Bestel
8d2c3ae584 Partly reverted b856911f0f 
Loading localization strings async for the fronted currently doesn't work in all cases...
 2021-07-12 21:20:39 +02:00
Bernd Bestel
71cede74a3 Make it possible to copy meal plan days (closes #573) 2021-07-12 20:44:42 +02:00
Bernd Bestel
7b0bc9e472 Fixed stock entries page missing columns 2021-07-12 19:55:53 +02:00
Bernd Bestel
8cb8611b4f Added a new product option "Should not be frozen" (closes #1320) 2021-07-12 19:27:21 +02:00
Bernd Bestel
cf8604e984 Show row_created_timestamp on the stock entries page (closes #1063) 2021-07-12 18:25:07 +02:00
Bernd Bestel
cdf6ac78e2 Optimized product edit page default button handling (closes #1276) 2021-07-12 18:15:57 +02:00
Bernd Bestel
70433aace5 Added an status filter to only show in-stock products on the stock overview page (closes #1263) 2021-07-12 18:02:57 +02:00
Bernd Bestel
247221950d Never extend the original due date on when opening a product which has default_best_before_days (closes #1342) 2021-07-12 17:56:09 +02:00
Bernd Bestel
866d6647d2 Small meal plan page adjustments 2021-07-12 17:43:30 +02:00
Bernd Bestel
6659a5cd08 Add an option to make Userfields mandatory (closes #1339) 2021-07-11 22:05:08 +02:00
Bernd Bestel
21c221b520 Improved recipe page / group by fulfillment status 2021-07-11 21:32:24 +02:00
Bernd Bestel
198216f38b Make it possible to track any information on chore execution (by using Userfields, closes #825) 2021-07-11 19:44:06 +02:00
Bernd Bestel
2847908523 Some small recipe page adjustments 2021-07-10 20:35:38 +02:00
Bernd Bestel
8ff8c1ac5d Made the used grocycode barcode type configurable 
DataMatrix reading via Quagga2 doesn't work currently, so default to an supported 1D barcode (=> Code128)
 2021-07-09 23:08:47 +02:00
Bernd Bestel
72e6ed76bf Fixed an error when adding object and there are no Userfields (references b0d38b87de) 2021-07-09 21:30:35 +02:00
Bernd Bestel
8c5c12cb47 Added new columns on the stock overview page (closes #1351) 2021-07-08 20:42:07 +02:00
Bernd Bestel
8b977644f7 Added the product descrption as a column on the stock overview page (closes #1362) 2021-07-08 20:22:51 +02:00
Bernd Bestel
1ead23cb87 Added on option to only show in-stock products on the /products page (closes #1388) 2021-07-06 20:08:02 +02:00
Bernd Bestel
135ac118b0 Added a filter for only done items on the /shoppinglist page (closes #1406) 2021-07-06 19:40:26 +02:00
Bernd Bestel
ffad8bfa7f Make it possible to search on the stock overview page for product barcodes (closes #1443) 2021-07-06 19:25:34 +02:00
Bernd Bestel
54bf7ed659 Produce a schema-valid OpenAPI specification (closes #1457) 2021-07-05 23:23:59 +02:00
Bernd Bestel
079437384e Use the now available @once directive instead of the legacy hack to only include component scripts once 2021-07-05 22:49:51 +02:00
Bernd Bestel
cb24a7149f Revert "Upgraded gettext/gettext (+ JS-Translator)" 
This reverts commit 9abb92763d.
 2021-07-04 21:47:55 +02:00
Bernd Bestel
9abb92763d Upgraded gettext/gettext (+ JS-Translator) 2021-07-04 21:47:10 +02:00
Bernd Bestel
0dc37fb361 Don't allow a min. stock amount for child products when the parent has "Accumulate sub products min. stock amount" set (references #1409) 2021-07-04 17:36:44 +02:00
Bernd Bestel
47c936e026 Reworked authentication related menu item handling (fixes #1462) 2021-07-03 19:40:42 +02:00
Bernd Bestel
b856911f0f Browser-cache localization strings (+ new API endpoint to get them) 2021-06-29 20:24:02 +02:00
Bernd Bestel
7587ead732 Fixed /tasks group by category (fixes #1274) 2021-06-28 19:31:27 +02:00
Bernd Bestel
69f8c237ff Fixed /stockentries group by purchased_date (fixes #1419) 2021-06-28 19:14:15 +02:00
Bernd Bestel
b8e15b990b Typo 2021-06-28 18:39:08 +02:00
Bernd Bestel
35fb87ab1e Squashed commit 
Use managed fonts
Include userentities dynamically in grocy.openapi.json for /userfields/{entity}/{objectId} endpoints (closes #1218)
Fixed userfieldsform load / save (for products and recipes) handling (fixes #1302)
Fixed PUT/DELETE /objects/{entity}/{objectId} when the given object id was invalid (fixes #1396)
Allow arrays in HTMLPurifier (fixes #1407)
 2021-06-28 17:00:16 +02:00
Bernd Bestel
33ea1e56cf Trigger help-tooltips also by click (instead of only hover, which is Bootstraps default) (fixes #1468) 2021-06-27 19:34:28 +02:00
Bernd Bestel
44d6173569 Also disable generic consume context menu item on /stockoverview when the item is not in stock (fixes #1523) 2021-06-27 18:34:58 +02:00
Katharina Bogad
f5da53a761 Migrated bootstrap3 col-xs-* to bootstrap4 col-* classes (#1521) 2021-06-24 22:46:47 +02:00
Bernd Bestel
f8fa5db3e7 Fixed multiple datetimepicker contextual timeago (references #1520) 2021-06-24 07:46:32 +02:00
Katharina Bogad
2471e78188 Grocycode, label printing (#1500) 
* Grocycode: Productpicker, StockService

* Grocycode: Datamatrix generation

* Grocycode: Display in UI, make Images downloadable

* Grocycode: Do not show on product card

* Grocycode: Stockentry Label view

* Grocycode: Webhooks & Labelprinter Feature

* Grocycode: Manual Label printing

* Grocycode: Print Label from product form

* Quagga2: use zxing for DataMatrix recognition

* Grocycode: Default settings for label printing

* Prepare merge of master

* Grocycode: docs

* Docs: label printing webhook

* Review

- "grocy" is currently written lower-case everywhere, so let's do this also for "grocycode"
- Unified phrases / capitalization
- Minor UI adjustments (mainly context menu item ordering / ordering/spacing on product edit page)
- Documented API changes for Swagger UI (grocy.openapi.json)
- Reverted German localizations (those are managed via Transifex; would cause conflicts when manually edited - will import them later there)
- Reverted a somehow messed up localization string (productform/help text for `cumulate_min_stock_amount_of_sub_products`)
- Suppress deprecation warnings when generating Datamatrix PNG (otherwise the PNG is invalid, https://github.com/jucksearm/php-barcode/issues/3)
- Default `FEATURE_FLAG_LABELPRINTER` to disabled

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2021-06-12 17:21:12 +02:00
rozgonik
980778e599 Fix untranslateable hint values (#1435) 2021-03-31 22:14:42 +02:00
Bernd Bestel
c483c34598 Display calories always per single serving (fixes #1359) 2021-02-21 20:57:34 +01:00
Bernd Bestel
5583074001 Don't initialise numeric Userfields with 1.0 (fixes #1312) 2021-02-21 19:14:49 +01:00
Bernd Bestel
2aca551692 Fixed product page QU conversion hint pluralisation (fixes #1352) 2021-02-21 18:24:04 +01:00
Lauri Niskanen
0a6c7d73a7 Hide unsuitable fields from printed recipe pages (#1332) 
* Hide unsuitable fields from printed recipe pages

Resolves #1330.

* Use proper total energy label in the recipe page
 2021-02-14 12:55:01 +01:00
Bernd Bestel
a455a01204 Fixed print layout display handling (fixes #1272) 2021-01-30 13:11:40 +01:00
Bernd Bestel
d78e156609 Use barcode defaults also for scan mode (fixes #1253) 2021-01-04 21:15:22 +01:00
Bernd Bestel
a646f2c6bd Fixed included recipe missing amount resolving (references #1252) 2021-01-03 22:40:33 +01:00
Bernd Bestel
65f0253307 Fixed product form min tare weight 2021-01-03 16:22:58 +01:00
Bernd Bestel
966211b71a Fixed shopping list product userfields (fixes #1246) 2021-01-02 17:30:28 +01:00
Bernd Bestel
43ef9b793b Fixed chore form weekly day selection labels (fixes #1242) 2021-01-01 14:31:49 +01:00
Bernd Bestel
97b93f23bd Fixed/unified shopping list item button tooltips (fixes #1239) 2020-12-31 13:09:55 +01:00
Bernd Bestel
9f1692e31f Improved shopping list item form validation (closes #1226) 2020-12-29 21:06:31 +01:00
Bernd Bestel
278a5f004a Fix consuming when FEATURE_FLAG_STOCK_LOCATION_TRACKING is disabled (fixes #1229) 2020-12-29 18:06:56 +01:00