github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-05 20:36:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,598 Commits 2 Branches 81 Tags 29 MiB
3d7b176344
Commit Graph

1598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bernd Bestel
3d7b176344
Merge branch 'master' into master 2021-06-18 20:40:22 +02:00
Bernd Bestel
5a3d3eae21
Fixed merge conflicts 2021-06-18 20:37:38 +02:00
Bernd Bestel
f6e3546d3f
Review 
- Default FEATURE_FLAG_THERMAL_PRINTER to disabled
- Added missing localization strings (and slightly adjusted one)
 2021-06-18 20:34:24 +02:00
Bernd Bestel
fe59fac1c3
Fixed client side webhook runner (references #1500) 2021-06-13 08:40:16 +02:00
Bernd Bestel
26979a4321
Set HTMLPurifier cache path (fixes #1497) 2021-06-12 20:56:58 +02:00
Kendell R
a0e5f45da3
More night mode improvements (#1336) 
* More night mode improvements

* Update grocy_night_mode.css

* Update extensions.js

* Update grocy_night_mode.css

* Update public/css/grocy_night_mode.css
 2021-06-12 20:39:08 +02:00
Bernd Bestel
739379fabb
Fixed stock entry grocycode download (references #1500) 2021-06-12 20:15:48 +02:00
Bernd Bestel
96fff2e5f4
Added changelog for #1500 2021-06-12 17:21:48 +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
Bernd Bestel
d23fda245e
Fixed that the number picker up/down buttons did not work when the input field was empty or contained an invalid number 2021-03-31 22:26:27 +02:00
Bernd Bestel
791a17fcad
Default shopping list item amount to 1 2021-03-31 22:22:28 +02:00
Bernd Bestel
dabc48fed3
Typo 2021-03-31 22:15:41 +02:00
rozgonik
980778e599
Fix untranslateable hint values (#1435) 2021-03-31 22:14:42 +02:00
Kai
68c5fd0617
Update README.md (#1432) 2021-03-31 22:14:05 +02:00
Edward Betts
7bbcec91aa
Correct spelling (#1420) 2021-03-31 22:12:51 +02:00
Bernd Bestel
c483c34598
Display calories always per single serving (fixes #1359) 2021-02-21 20:57:34 +01:00
Bernd Bestel
906a9db628
Fixed embedded /transfer from /stockentries (fixes #1303) 2021-02-21 19:36:37 +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
e4c8f6b023
Don't require 1 to be in stock for "Only check if any amount is in stock" 2021-02-21 19:10:10 +01:00
Bernd Bestel
4555bf3b63
Enforce product barcodes to be unique (references #1205) 2021-02-21 18:55:48 +01:00
Bernd Bestel
2aca551692
Fixed product page QU conversion hint pluralisation (fixes #1352) 2021-02-21 18:24:04 +01:00
Bernd Bestel
f5eff8ab49
Include due_type = "Expiration date" products in /stock/volatile API endpoint (fixes #1372) 2021-02-21 18:18:34 +01:00
Bernd Bestel
36f5fb23e9
Added changelog for #1347 2021-02-21 18:13:16 +01:00
Lauri Niskanen
33dcd17fbd
Fix rounding error on total value calculation (#1347) 
* Fix rounding error on total value calculation

* Remove unused 'amountSum' calculation
 2021-02-21 18:10:41 +01:00
Bernd Bestel
3d82c9abbd
Disabled platform-check (references #1285) 2021-02-18 12:14:57 +01:00
Marc Ole Bulling
2b0bbc34c0
Merge branch 'master' into master 2021-02-14 19:15:39 +01:00
Marc Ole Bulling
97f9d486cd
Fixed error when using notes instead of products 2021-02-14 19:12:41 +01:00
Bernd Bestel
779ac31ffe
Added changelog for #1332 2021-02-14 12:56:21 +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
fc05044353
Added changelog for #1331 2021-02-14 12:51:40 +01:00
Kendell R
55ac768521
Night mode improvements (#1331) 
* Night mode readability improvements

* Update grocy_night_mode.css

* Update grocy_night_mode.css
 2021-02-14 12:49:44 +01:00
Bernd Bestel
a455a01204
Fixed print layout display handling (fixes #1272) 2021-01-30 13:11:40 +01:00
Bernd Bestel
8b963ae0f1
Merge branch 'master' of https://github.com/grocy/grocy 2021-01-30 13:07:16 +01:00
Bernd Bestel
a1adc80c29
Fixed consuming Scan Mode timing (fixes #1292) 2021-01-30 13:06:44 +01:00
Marius Boro
760914bf82
Update grocy_night_mode.css (#1269) 
Night mode updates for Grocy 3
 2021-01-30 12:49:51 +01:00
Bernd Bestel
42689ecefe
Added changelog for #1297 2021-01-30 12:49:17 +01:00
Marc Ole Bulling
c889416c0a
Fix for #1289 and #1261 (#1297) 2021-01-30 12:47:12 +01:00
Bernd Bestel
bfb5525ec1
Added changelog for #1286 2021-01-30 12:41:09 +01:00
Marc Ole Bulling
20380faeb3
Fix for #1271 (#1286) 2021-01-30 12:39:10 +01:00
Marc Ole Bulling
b3be8b155f
Added note about user permission 2021-01-15 14:43:24 +01:00
Marc Ole Bulling
1c1adc5f89
Formatting 2021-01-15 14:32:52 +01:00
Marc Ole Bulling
283962b8af
Added padding 2021-01-15 14:27:00 +01:00
Marc Ole Bulling
2b3f0978b7
Fixed that checkbox was undefined, as dialog was already closed 2021-01-15 14:12:04 +01:00
Marc Ole Bulling
a31283fbc3
Increse feed 2021-01-15 14:05:33 +01:00
Marc Ole Bulling
983ab48945
Added quantity conversion 2021-01-15 13:59:45 +01:00
Marc Ole Bulling
a8142fed05
Added printing notes 2021-01-15 13:40:25 +01:00
Marc Ole Bulling
f007b92911
Add flag to print quantities as well 2021-01-15 13:20:32 +01:00
Marc Ole Bulling
039bdb58fd
Undo translation 2021-01-15 13:09:30 +01:00
Marc Ole Bulling
5aa562b5e9
Fixed API call and added error message parsing 2021-01-15 12:16:22 +01:00
Marc Ole Bulling
8e0b995808
Only show thermal print button when Feature Flag is set 2021-01-15 11:12:30 +01:00