github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-03-27 23:29:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,550 Commits 2 Branches 81 Tags 29 MiB
master
Commit Graph

476 Commits

Author SHA1 Message Date
kriddles
5ae36e6ba8
Value information (#1045) 
* viewjs stockoverview: add total value to stock overview

* view stockoverview.blade: add Value column

* refresh stockOverview value column

* Removed the total units info

* Properly format the total stock value number

* Added new localization strings

* Resolved merge conflict

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-10-15 19:46:27 +02:00
Bernd Bestel
7b8438bfa2
Added new localization strings for #1049 2020-10-14 18:03:49 +02:00
SourceFactory.at
617b25bda8
added button to add expired products to shoppinglist (#1026) 
* added button to add expired products to shoppinglist

* Localizations are managed via Transifex

Revert "added button to add expired products to shoppinglist"

This reverts commit ad1ab5d6a0.

* Revert unnecessary change

* Reuse existing function (GetExpiringProducts) to get expired products

Co-authored-by: Mario Klug <mario.klug@sourcefactory.at>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-10-04 15:20:34 +02:00
fipwmaqzufheoxq92ebc
0454c128f0
Stock-Journal: API, Summary, Done By (#989) 
* Stockjournal: Add "Done by"

* Add API for Stock-Journal

* Add "Journal-Summary"

* Use ALTER TABLE

* Moved the "Jounral summary" button to the stock journal page

* Changed icon & context menu position for new stock journal summary page

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-09-06 13:18:51 +02:00
fipwmaqzufheoxq92ebc
07beee93a9
Add user-field-type "file" (#977) 
* Add user-field-type "file"

* Add userfield-type "picture"

* Also limit image height on userfieldsform

* Prevent empty userfields (cause warnings in tables after deleting a file)

* Show files in dialogs

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-08-31 20:07:46 +02:00
fipwmaqzufheoxq92ebc
6f8ad9b76e
Locales: use http-accept-language or cookie (#976) 
* Locales: use http-accept-language or "language"-cookie

* Add user-setting "locale"

Rename CULTURE to DEFAULT_LOCALE

* Use LocaleMiddleware also in dev mode

* CORS: don't require authentication on OPTIONS

* Use a standard user-settings-control and start a new generic user settings page, not a separate page for the locale setting

* Fixed (broken by myself) link-return handling

* Clarify language settings

* Removed unneeded files

* Better user settings icon

* Added localization hints

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-08-31 19:11:51 +02:00
Bernd Bestel
0f499c69d9
Fixed .pot file syntax error 2020-08-29 18:34:05 +02:00
Bernd Bestel
86300b7025
Refined permissions by existing feature structure (closes #971, references #960) 2020-08-29 18:31:28 +02:00
Bernd Bestel
22384aaa2e
Error page style improvements 2020-08-29 16:58:06 +02:00
Bernd Bestel
3b0d29bed0
Applied EditorConfig settings to all files 2020-08-29 16:41:27 +02:00
fipwmaqzufheoxq92ebc
b7d1b21f1d
[WIP] Implemented basic permissions (#960) 
* Add permissions to Database & add "User"-classes

* Add UI & API for Permissions, protect "User"-(Api)-Controller with new permissions.

* Add some permissions.

* Add permission localization

* Add error handling.

* Error pages: only redirect on 404

* ExceptionController: return JSON-Response on api-routes

* Rename PRODUCT_ADD to PRODUCT_PURCHASE

* Move translation to new file

* Fix checkboxes stay selected on reload.

* Remove configurable User-implementation

* Remove MASTER_DATA_READ

* Disable buttons the user isn't allowed to use.

* Add default permissions for new users

* When migration to permissions, everyone starts as ADMIN

* Permission-Localization: add to transifex & LocalizationService

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-08-29 12:05:32 +02:00
Bernd Bestel
f28697e5b4
Added a "Clear filter" button on the stock overview page (closes #879) 2020-08-25 20:20:51 +02:00
Bernd Bestel
471a8665d0
Remove the new help icons where not needed and translate help text 2020-08-25 19:28:44 +02:00
Bernd Bestel
c8c540970d
Added missing localization string 2020-08-24 18:16:49 +02:00
duck
7e276289e0
WIP: Fix typo on "Consumed Amount" localization string (#880) 
* Fix typo on localization string in strings.pot

Should be "Consumed Amount"

* Remove typo Consumed Amount string in locationcontentsheet template
 2020-08-18 18:28:39 +02:00
kriddles
e8845fe2e8
Qu factor purchase to stock & Product Barcode Details (#801) 
* Puchase add qu_factor_to_stock

* qu_factor_purchase_to_stock for stock edit

* product barcodes with QU and Stores

* remove product barcode tags

* migrations/0103 add value and factor_puchase_amount to stock_current and stock_current_location_content

* Remove unused method

* StockService#GetProductDetails: include stock_value

* productcard: include stock_value

* Add Purchase Factor to Stock Overview

* update demo data with stock qu_factor_purchase_to_stock

* recipes_pos_resolved update

* avg_price and oldest_price in product details

* add average price to product card

* hint for recipe costs not included if not in stock

* Round value and factor_purchas_amount. Include currency for stock value

* Add factor_purchase_amount to product card stock amount

* Allow editing qu_factor_purchase_to_stock for stock entries

* fix update qu_factor_purchase_to_stock for Transfers

* Add barcode to existing product update to add to product_barcodes table

* Add barcode to new product workflow update to add to product_barcodes table

* *** Price now saved as 1 QU to stock in stock tables ***

* remove column product barcode and use product_barcodes

* Allow products to be deactivated instead of deleted

* Embedded barcode and qu-conversion with page reload on change

* Save current product barcode into new product_barcodes table

* Embedded popup for product group add/edit

* barcode scanner added to product barcodes input

* Edit product qu_stock is unavailable after first purchase

* StockOverview: Filters break when columns are reordered so for now just disable colReorder

* view stockoverview.blade: display product_group column

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-08-17 21:47:33 +02:00
Bernd Bestel
d1e395b45e
Added the Korean translation (closes #903) 2020-08-17 18:22:42 +02:00
Bernd Bestel
7f461bfa51
Added the Greek translation (closes #952) 2020-08-17 18:07:05 +02:00
Bernd Bestel
cadf61d641
Pulled translations from Transifex 2020-08-17 17:57:40 +02:00
Bernd Bestel
37054475c2
Little adjustments and changelog for #795 2020-04-24 18:06:57 +02:00
Bernd Bestel
9e824e1845
Little adjustments and changelog for #788 2020-04-24 17:51:48 +02:00
Bernd Bestel
fbb8999513
Fixes and changelog for #767 2020-04-22 18:00:25 +02:00
Zack Arnett
7fb76df33a
Recipe Pages UI updates (#776) 
* Recipe updates

* Add help text icon
 2020-04-21 08:18:09 +02:00
Zack Arnett
4629df17b4
Cosmetic Update (#753) 
* UI changes

* New (header) style was missing on some pages

* Added/changed new localization strings

* Unify page titles / apply .title class everywhere

* Reduce spacing below page title

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-04-19 14:51:02 +02:00
Bernd Bestel
743395ff93
Pulled translations from Transifex 2020-04-17 20:07:15 +02:00
Bernd Bestel
1cb0ba5e68
Pulled translations from Transifex 2020-04-16 19:21:20 +02:00
Bernd Bestel
70a1704bc2
Pulled translations from Transifex 2020-04-16 18:12:50 +02:00
Bernd Bestel
1390c65864
Show optionally an icon on the stock overview page if the product is already on the shopping list (closes #708) 2020-04-13 18:47:41 +02:00
Bernd Bestel
840b35b30d
Add tooltips to shopping list item buttons (closes #572) 2020-04-13 18:26:53 +02:00
Bernd Bestel
390af436ab
Fixed that the stock entries page was broken when there were product userfields defined with enabled "Show as column in tables" (fixes #677) 2020-04-12 14:13:28 +02:00
Bernd Bestel
4e5e191b22
Fixed the conversion factor hint on the purchase page (fixes #625) 2020-04-12 14:09:38 +02:00
Bernd Bestel
6867057b6e
Clarify button tooltips on the stock entries page (closes #621) 2020-04-12 14:02:24 +02:00
Bernd Bestel
bfb46494cf
Added new at least 80 % complete localizations 2020-04-05 08:41:08 +02:00
Bernd Bestel
caf7127c13
Added changelog for #672 2020-03-27 19:32:25 +01:00
Bernd Bestel
d7738aa1ec
Added some demo data to showcase the new price tracking per store feature (references #658) 2020-03-25 20:56:33 +01:00
Mik-
f3b504b7de
Optionally use number pad input in best-before-date fields on mobile Chrome (#657) 
* Add missing translation for de

* Add option to set best-before-date field input-type to number
This allows faster input in mobile devices

* Fix datetimepicker with inputmode

* Fix datatimepicker with numeric input

* Add missing translation for de

* Add option to set best-before-date field input-type to number
This allows faster input in mobile devices

* Fix datetimepicker with inputmode

* Fix datatimepicker with numeric input

* Use more precise name for number pad option

* Update localization/de/strings.po

Co-Authored-By: Bernd Bestel <bernd@berrnd.de>

* Fix merge conflict

* Fix merge conflict try 2

Co-authored-by: Michael Neuendorf <neuendorf@gonicus.de>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-03-25 20:26:54 +01:00
Bernd Bestel
305f5b67e4
Name shopping locations "Stores" on the frontend (references #658) 2020-03-25 20:09:28 +01:00
Bernd Bestel
c3d4be352d
Fix product card chart rendering error when there is no shopping location (references #658) 2020-03-25 19:49:10 +01:00
Immae
a45317aea1
Add shopping location for price tracking (#658) 2020-03-25 19:34:56 +01:00
Bernd Bestel
9f6daac010
Added new demo data localization string 2020-03-06 21:23:31 +01:00
Bernd Bestel
e0f71aa308
Pulled translations from Transifex 2020-03-06 21:14:50 +01:00
Bernd Bestel
48dc8e45ba
Fixed localization string (references #588) 2020-03-06 20:58:01 +01:00
Bernd Bestel
2b1dc7756d
Added new demo localization string 2020-02-24 13:44:23 +01:00
Bernd Bestel
aa787e765e
Changelog, small changes and added missing localization strings for #556 2020-02-10 18:24:15 +01:00
Bernd Bestel
472c083bca
Little changes, changelog and added missing localization strings for #555 2020-02-09 21:16:47 +01:00
Bernd Bestel
5a65f37f4a
Little wording change/fix 2020-02-09 21:03:11 +01:00
Bernd Bestel
62dae64a88
Make meal plan entries editable (references #545) 2020-02-09 17:15:13 +01:00
Bernd Bestel
0359003e09
Little changes for #551 2020-02-09 15:36:03 +01:00
Bernd Bestel
23efe0c87a
Added an option to hide the calendar on the shopping list (closes #531) 2020-02-01 12:55:12 +01:00
Bernd Bestel
fcd421d17b
Pulled translations from Transifex 2020-01-31 08:47:50 +01:00
Bernd Bestel
28e3f6226f
Added the new hungarian translation 2020-01-30 07:30:46 +01:00
Bernd Bestel
caa4edf7e3
Added new demo_data localization string 2020-01-29 11:26:24 +01:00
Bernd Bestel
0e0c58542e
Added the slovak localization 2020-01-29 11:19:43 +01:00
Bernd Bestel
15b4f2ede3
Added new demo_data localization string 2020-01-28 22:30:09 +01:00
Bernd Bestel
dceed6759a
Added missing localization string 2020-01-27 20:23:05 +01:00
Bernd Bestel
05aceb72ae
Squashed commit 
- Only refresh contextual number/datetime info/formatting where needed (closes #513)
- Also refresh correlated stock journal entries on undo (closes #471)
- Prefill "New amount" with the current stock amount on the inventory page (closes #434)
- Ensure that the location_id of the stock and stock_log tables is never empty after migration 95 (references #421)
- Load initial values of the /stockedit form server side to improve loading performance (references #421)
- Use more or less the same input ordering as on the purchase page for the /stockedit page (references #421)
- Also display the "Compact view" button on the shopping list page when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS is disabled (references #453)
- Ensure that the currently active sidebar menu item is visible
- Optimized sidebar menu item grouping/spacing
- Properly order the API documentation route groups and put the "by-barcode" routes into a separate group
- Updated dependencies
- Pulled translations from Transifex
- Prepared changelog for next release
 2020-01-27 19:00:49 +01:00
Bernd Bestel
2764bb680c
Changed some localization strings 2020-01-26 20:13:15 +01:00
Bernd Bestel
71a57c9dcb
Implement "Free products" (closes #426) 2020-01-26 20:01:30 +01:00
Bernd Bestel
c7bcb9984a
Implemented "Scan mode" 2020-01-26 15:35:01 +01:00
Bernd Bestel
7a048136c6
Added missing localization strings 2020-01-26 13:40:26 +01:00
Bernd Bestel
e111d07f4e
Added the ability to directly add products to the meal plan (closes #450) 2020-01-25 11:51:00 +01:00
Bernd Bestel
3cbeea7d95
Added an option to filter for only undone items on the shopping list (closes #452) 2020-01-24 22:26:36 +01:00
Bernd Bestel
ad54253d72
Added a compact view for shopping list (for mobile shopping) (closes #453) 2020-01-24 22:05:08 +01:00
Bernd Bestel
fd5a72264d
Meal plan recipe and notes also fit into one table (references #477) 2020-01-23 21:57:47 +01:00
Bernd Bestel
8d7f985b59
Make it possible to add notes to meal plan (days) (closes #477) 2020-01-23 20:59:19 +01:00
Bernd Bestel
d7c7e0f53c
Added missing localization string 2020-01-23 20:05:57 +01:00
Bernd Bestel
a9d235d9ce
Added missing localization string 2020-01-22 22:36:21 +01:00
Bernd Bestel
0816359867
Some refinements for #501 2020-01-21 20:45:34 +01:00
Bernd Bestel
f543a3a472
Fixed and optimized some things related to #421 (& some more cleanup) 2020-01-21 17:30:09 +01:00
Bernd Bestel
d4bec3bd10
Added a "keep screen on" option using NoSleep.js (closes #427) 2020-01-05 10:03:02 +01:00
Bernd Bestel
485eb262f9
Show some more info when camera access is not possible (closes #437) 2020-01-05 09:20:58 +01:00
Bernd Bestel
2a361a9f72
Forgot to save strings.pot... 2019-12-19 20:11:34 +01:00
Bernd Bestel
d617a72397
Again small localization string changes (references #421) 2019-12-19 20:03:27 +01:00
kriddles
6c7420ea08 Stock Service Updates (#421) 
* viewjs consume: implement location and update stock specific

* Transfer Products

* services StockService#GetProductStockEntriesByLocation: add method

* services StockService#AddProduct: check for stock and locations

* services StockService: include location_id

* services StockService#LocationExists: add method

* services StockService#UndoBooking: fix based on stockRow

* Reimplement StockServer->TransferProduct (one loop for the whole action to preserve stock_id)

* Ensure that the location_id is never NULL in the stock and stock_log table (checked by an INSERT trigger, sets the products default location if empty)

* Only consider stock amount at the given location on consume, if supplied

* Restore more/old display text for "specific stock entry"

* Don't allow transfering tare weight enabled products

* Various small changes (code style, missing OpenAPI endpoint, remove location_id null checking)

* Updated translations strings

* Added transaction_id and correlation_id to stock_log entries to group them together

* ProductCard - location to default location label change

* Also undo correlated bookings on undo

* Added API endpoints for listing and undoing transactions and use them on purchase/consume/inventory/stockoverview

* Initial Stock detail page

* Allow Undo for Tranfers

* Price step to .01

* Some localization string changes & fixes
 2019-12-19 19:48:36 +01:00
Bernd Bestel
709afac1af Proper pt-br localization/demo 2019-11-26 11:13:14 +01:00
Bernd Bestel
9bd43cf67a Added the Portuguese translation files 2019-11-13 14:47:23 +01:00
Lewis Juggins
9ba66aeac2 Rename location to "Default location" on product page (#416) 
* Rename location to default location on product page

* Move resource
 2019-10-12 14:27:15 +02:00
Bernd Bestel
d994551f75
Pulled translations from Transifex 2019-10-05 13:15:54 +02:00
Bernd Bestel
ff92e8235f
Added missing translation string (source language) 2019-10-04 11:27:59 +02:00
Bernd Bestel
ba6bfa6a2c
Added a chore period type "yearly" (closes #407) 2019-10-04 11:24:51 +02:00
Bernd Bestel
28b23fd313
Implemented chore period intervals to have more flexible schedules (closes #312) 2019-10-04 11:14:11 +02:00
Bernd Bestel
554ac104f8
Added missing translation string 2019-10-04 10:31:06 +02:00
Bernd Bestel
35b569c832
Pulled translations from Transifex 2019-09-28 13:27:20 +02:00
Bernd Bestel
dea2ffeaaf
Added a "clear" button above the new notes field on the shopping list page 2019-09-28 08:48:58 +02:00
Bernd Bestel
4aa575e0e8
Display just "unlimited" on the product card for the average shelf life if it is > 200 years 2019-09-27 14:04:44 +02:00
Bernd Bestel
765f908966
Make it possible to provide the purchase price also as a total price (closes #390) 2019-09-27 13:50:16 +02:00
Bernd Bestel
7369603d78
Added missing localization string 2019-09-26 14:55:31 +02:00
Bernd Bestel
828ab8eba0
Allow accumulating min. stock amounts on parent product level (closes #384) 2019-09-26 10:36:49 +02:00
Bernd Bestel
6bb9d2c51d
Some little changes for pull request #369 (also references #367) 2019-09-24 08:35:30 +02:00
Bernd Bestel
e92843a9bf
Added new demo strings 2019-09-23 13:21:02 +02:00
Bernd Bestel
6ca694226b
Pulled translations from Transifex 2019-09-22 09:49:09 +02:00
Bernd Bestel
fc2a37d3fc
Typo... 2019-09-21 20:20:32 +02:00
Bernd Bestel
c32ea087df
Added a little barcode scanner testing page (references #362) 2019-09-21 20:01:49 +02:00
Bernd Bestel
c228126c3a
Added a new field calories for products (closes #268) 2019-09-20 20:06:24 +02:00
Bernd Bestel
5a91c86b81
Added an option to print a shopping list (references #245) 2019-09-20 17:40:45 +02:00
Bernd Bestel
292b652437
Updated localizations & improved some special and demo translation string data handling 2019-09-20 16:26:50 +02:00
Bernd Bestel
a95d6be4f4
Added more product actions on the stock overview page (closes #327) 2019-09-20 13:37:53 +02:00
Bernd Bestel
aa670adefc
Added a say-thanks-button on the about page 2019-09-20 10:08:10 +02:00
Bernd Bestel
7c114cfec3
Implemented a price factor option for recipe ingredients (closes #295) 2019-09-19 21:30:24 +02:00
Bernd Bestel
5e9a7fb7ca
Implemented browser barcode scanning (closes #102) 2019-09-19 12:48:02 +02:00
Bernd Bestel
346b589534
Make it possible to test quantity unit plural forms (closes #261) 2019-09-18 20:21:09 +02:00
Bernd Bestel
2522b3748c
Just name it "fields" not "userfields" for custom objects (references #242) 2019-09-18 16:25:38 +02:00
Bernd Bestel
096fb7a116
Implement custom entities / objects (closes #242) 2019-09-18 16:18:15 +02:00
Bernd Bestel
3df44697bf
Implemented the option to automatically consume a product on tracking a chore execution (closes #279) 2019-09-18 10:02:52 +02:00
Bernd Bestel
0fa0138972
Implemented new Userfield type "Link" (references #258) 2019-09-17 19:33:06 +02:00
Bernd Bestel
0c27157db6
Implemented new Userfield type "Select list" (closes #325) 2019-09-17 19:11:06 +02:00
Bernd Bestel
bc487b4867
Make it possible to also filter by chore assignments on the chore overview page (references #253) 2019-09-17 16:50:29 +02:00
Bernd Bestel
b5761ae544
Show to whom the chore execution is assigned in calendar events (references #253) 2019-09-17 16:28:11 +02:00
Bernd Bestel
74f9470769
Implemented that chores can be assigned to users (closes #253) 2019-09-17 13:13:26 +02:00
Bernd Bestel
3dcd513094
Fixed new translation strings 2019-09-16 11:02:03 +02:00
Bernd Bestel
a799f2b43f
Finished qu unit conversion handling (closes #177) 2019-09-16 09:35:20 +02:00
Bernd Bestel
6094096675
Started working on qu unit conversion handling (references #177) 2019-09-15 16:40:54 +02:00
Bernd Bestel
a0a0e104b0
Implemented product variations (closes #196) 2019-09-14 17:34:36 +02:00
Bernd Bestel
be4b5c81b2
ixed that the delete button not always deleted the currently selected equipment item (fixes #307) 2019-08-15 13:53:30 +02:00
Bernd Bestel
7004cf4400
Finished the implementation of "Location Content Sheet" (closes #341) 2019-08-11 09:24:47 +02:00
Bernd Bestel
28716ed96c
First draft for printable location content sheets (references #341) 2019-08-10 16:34:29 +02:00
Bernd Bestel
e6020432c6
Add chores due date rollover (closes #340) 2019-08-10 12:44:09 +02:00
Bernd Bestel
3dbce7547f
Fixed "datatables_localization" localization JSON-string (fixes #323) 2019-07-20 15:48:58 +02:00
Bernd Bestel
001d5c5d1d
Prepared next release 2019-07-06 20:43:30 +02:00
Bernd Bestel
b4d2e2a20a
Added the possibility to undo a task (closes #252) 2019-07-06 20:34:01 +02:00
Bernd Bestel
1eb1aa8b11
Added a "consume this recipe"-button to the meal plan (and also a button to consume all recipes for a whole week) (closes #283) 2019-07-06 20:02:40 +02:00
Bernd Bestel
8c205941c7
Added that products can now also be consumed as spoiled from the stock overview page (option in the more/context menu per line) (closes #251) 2019-07-06 18:15:53 +02:00
Bernd Bestel
c6c10c87e4
Improved date display for dates of today and no time 
Instead of the hours since midnight now just "Today" will be shown
 2019-07-06 17:19:28 +02:00
Bernd Bestel
df529c3c0b
Show 2999-12-31 as "Never" everywhere (closes #296) 2019-07-06 15:43:54 +02:00
Bernd Bestel
b76e51ba41
Fixed nested recipes costs calculation (fixes #299) 2019-07-06 14:48:46 +02:00
Bernd Bestel
eec6270cb7
Prepared next release 2019-06-09 09:30:18 +02:00
Bernd Bestel
43710b5062
Properly show the API error when it failed to undo a stock booking (fixes #267) 2019-06-08 16:53:31 +02:00
Bernd Bestel
9e7d62b62d
Make sure to hide all tooltips before removing an element (fixes #260) 2019-06-08 16:39:35 +02:00
Bernd Bestel
41b8b5d11e
Prepared new release 2019-05-16 22:25:46 +02:00
Bernd Bestel
1787690795
Added missing translations string 2019-05-10 21:04:28 +02:00
Bernd Bestel
3eb8b5f381
Pulled translations from Transifex 2019-05-10 21:01:58 +02:00
Bernd Bestel
d8cefeffb7
Added missing translations strings 2019-05-10 20:57:49 +02:00
Bernd Bestel
338c6c0a9d
Added a new userfield type "preset-list" (closes #239) 2019-05-07 21:24:59 +02:00
Bernd Bestel
8504eb9b38
Finished first version of meal planning (for now closes #146) 2019-05-07 19:48:14 +02:00
Bernd Bestel
57233dba1a
Added first basic version of meal planning (references #146) 2019-05-06 19:38:47 +02:00
Bernd Bestel
e240260f9f
Unify translations strings which include an amount + quantity unit (references #161) 2019-05-05 14:31:27 +02:00
Bernd Bestel
dd148a8fc3
Use named arguments for all gettext strings which have more than 1 argument (again closes #161) 2019-05-05 14:13:50 +02:00
Bernd Bestel
9ef55f1f01
Make it possible to track a chore execution without the time part, only the day 2019-05-04 16:13:05 +02:00
Bernd Bestel
12ba99f649
Added "variable amount" for recipe ingredients (closes #181) 2019-05-04 14:50:15 +02:00
Bernd Bestel
314e434fd1
Updated translations 2019-05-04 13:43:14 +02:00
Bernd Bestel
0eb974bd92
Make it possible to customize the default amount for purchase/consume (closes #215) 2019-05-04 13:19:34 +02:00
Bernd Bestel
dae5bb2b34
Make it possible to filter recipes by stock availability (closes #231) 2019-05-03 19:22:58 +02:00
Bernd Bestel
595171afa5
Properly show and handle that the new amount during inventory cannot equal the current stock amount (this now closes #224) 2019-05-03 19:08:54 +02:00
Bernd Bestel
ae156ed0e6
Removed accidentally added strings 2019-05-02 20:31:47 +02:00
Bernd Bestel
4912dd56d1
Finished migration to use gettext (this now closes #161) 2019-05-02 20:20:18 +02:00
Bernd Bestel
5d3f248d94
Pulled translations from Transifex (references #161) 2019-05-01 20:38:25 +02:00
Bernd Bestel
9b2dba2397
Migrated (hopefully) all translations to PO/Gettext (references #161) 2019-05-01 20:19:18 +02:00
Bernd Bestel
310cdd7d4c
Pulled translations from Transifex 2019-04-28 19:17:31 +02:00
Bernd Bestel
6442665f6c
Just some technical corrections for the new sv_SE translation 2019-04-23 09:49:25 +02:00
Bernd Bestel
04ca6edbd3
Pulled translations from transifex 2019-04-23 09:40:04 +02:00
Bernd Bestel
c5993ad994
Finalize user-defined-fields (closes #176) 2019-04-23 09:06:18 +02:00
Bernd Bestel
fc11da3c3f
Started working on user-defined-fields for all entities (references #176) 2019-04-22 22:16:35 +02:00
Bernd Bestel
77f3b80540
Implemented daily/weekly/monthly recurrence patterns for chores (closes #151) 2019-04-22 14:01:31 +02:00
Bernd Bestel
d72fe69a17
Show more info in product card (closes #173) 2019-04-22 10:11:58 +02:00
Bernd Bestel
49d16b458d
Added missing localization strings 2019-04-20 19:25:59 +02:00
Bernd Bestel
cdd02efcc6
Implemented multiple/named shopping lists (closes #190) 2019-04-20 17:04:40 +02:00
Bernd Bestel
42a9d5af2b
Pulled translations from Transifex 2019-04-06 16:03:43 +02:00
Bernd Bestel
50a782c8c0
Added missing translation strings 2019-04-06 16:00:02 +02:00
Bernd Bestel
5b304c5e97
Added new changelog and update translations 2019-03-10 16:27:34 +01:00
Bernd Bestel
bfcd05473a
Allow best before date on purchase/inventory to be today or in the past, but display a hint when so (closes #172) 2019-03-10 16:02:13 +01:00
Bernd Bestel
e693460894
Finalized next version 2019-03-09 17:19:02 +01:00
Bernd Bestel
bfd29def8d
Show purchase to stock conversion factor on purchase page when QU units are different (closes #169) 2019-03-09 17:00:57 +01:00
Bernd Bestel
cd0ca4a67c
Prepared next release 2019-03-09 16:42:46 +01:00
Bernd Bestel
6de4b120b3
Include changelog as markdown files and show it in the about dialog 2019-03-09 15:54:16 +01:00
Bernd Bestel
8fec262184
Added missing translation strings 2019-03-09 13:14:36 +01:00
Bernd Bestel
acd1e7337c
Prepared next release 2019-03-06 19:38:22 +01:00
Bernd Bestel
2d8ad24887
Implemented that included recipes can have a serving amount (closes #163 and references #127) 2019-03-05 23:45:04 +01:00
Bernd Bestel
45db9ff90c
Added scripts for Transifex upload/download & updated translations 2019-03-05 21:22:54 +01:00
Bernd Bestel
fcdeda91d9
Show the iCal sharing link instead of directly open it (references #141) 2019-03-05 19:36:14 +01:00
Bernd Bestel
816eb03147 Added a "recipe gallery" view (closes #147) 2019-03-05 17:59:33 +01:00
Bernd Bestel
8504429f5f Implemented tare weight handling (closes #132) 2019-03-05 17:51:50 +01:00
Bernd Bestel
90291fdbca Added possibility to export the calendar in iCal format (closes #141) 2019-03-04 17:44:48 +01:00
Bernd Bestel
77b0bc675c Varios small UI changes / improve UI consistency 2019-03-04 17:43:12 +01:00
Bernd Bestel
8020f92d6b
Track on consume for which recipe it was (closes #64 and references #64) 2019-03-03 18:20:06 +01:00
Bernd Bestel
38825c70da
Added missing translations strings & pulled translations from Transifex 2019-03-03 17:01:35 +01:00
Bernd Bestel
b5ac319a90
Pull translations from Transifex 2019-02-03 17:02:40 +01:00
Bernd Bestel
9e139e2b73
Remove missing translation and improve database migration for #149 2019-01-26 14:12:18 +01:00
Bernd Bestel
04dacacd73 Pull translations from Transifex for new release 2018-11-27 17:30:40 +01:00
Bernd Bestel
a9502d1ddb
Fix wrong translation string 2018-11-26 20:03:14 +01:00
Bernd Bestel
5c25e91984
Add possibility to skip items in "all shopping list items to stock workflow" (closes #116) 2018-11-26 20:02:01 +01:00
Bernd Bestel
2b3516dadd
Pull translations from Transifex 2018-11-24 20:39:42 +01:00
Bernd Bestel
ff341d8547
Typo... 2018-11-21 22:17:51 +01:00
Bernd Bestel
01fab6999f
Add new demo translation string 2018-11-21 22:16:02 +01:00
Bernd Bestel
b6152ce874
Pull translations from Transifex 2018-11-21 21:54:15 +01:00
Bernd Bestel
306d0f7da6
Add "one click shopping list to stock workflow" (closes #110) 2018-11-21 19:08:36 +01:00
Bernd Bestel
f7f90238f2
Show optionally a clock in the header (closes #109) 2018-11-20 19:23:48 +01:00
Bernd Bestel
589ad36855
Remove unneeded translation string 2018-11-18 15:52:48 +01:00
Bernd Bestel
5da24d2d4f
Added first version of calendar (closes #42) 2018-11-18 15:39:43 +01:00
Bernd Bestel
34d1bdd53f
Added missing translation string 2018-11-18 14:15:11 +01:00
Bernd Bestel
862fd7c644
Added missing translation string 2018-11-17 19:46:59 +01:00
Bernd Bestel
10ea9c44fd
Make it possible to mark a product as opened (closes #86) 2018-11-17 19:39:37 +01:00
Bernd Bestel
816ca6460f
Make it possible to pick a specific stock item on consume (closes #62) 2018-11-17 17:51:35 +01:00
Bernd Bestel
6f67619784
Finish "shopping list to stock workflow" (closes #98) 2018-11-17 14:50:52 +01:00
Bernd Bestel
83985e9f21
Migrate translations to use Transifex 2018-11-03 14:29:14 +01:00
Bernd Bestel
04e9ba8e34
Allow fraction numbers for recipe ingredients when not checked against stock and add option to not check stock for a recipe position (closes #105) 2018-11-02 19:53:01 +01:00
Bernd Bestel
364f6b2051
Add journal and undo UI for stock bookings, chore executions and battery charge cycles (closes #63, closes #97) 2018-10-27 17:26:00 +02:00
Bernd Bestel
da98efa833
Finalize nested recipes / group recipe positions feature (closes #77) 2018-10-27 10:37:31 +02:00
Bernd Bestel
fc3a4c6899
Finish first version of nested recipes feature (references #77) 2018-10-25 20:36:29 +02:00
Bernd Bestel
04c93d937e
Make presets for new products configurable (closes #92) 2018-10-20 14:55:49 +02:00
Bernd Bestel
03eaa6c79f
Add possibility to filter by product group on stock overview page 2018-10-06 18:19:31 +02:00
Bernd Bestel
188407e3c7
Merge branch 'master' of https://github.com/berrnd/grocy 2018-10-06 18:02:30 +02:00
Bernd Bestel
8cf68ade30
Fix missing translation (references #85) 2018-10-06 18:02:13 +02:00
Marius Boro
d62657c698 Better translation (#84) 
* Update no.php

* Update no.php

minor fix
 2018-10-06 17:57:21 +02:00
Bernd Bestel
3262e534dc
Hotfix (will be included in v1.21.0 release): Fixed a syntax error in norwegian localization file 2018-10-06 12:08:44 +02:00
Marius Boro
9e24586190 Update no.php (#82) 2018-10-06 09:15:40 +02:00
Bernd Bestel
b242a5de52
Finish equipment / instruction manuals feature (references #25) 2018-10-03 16:11:39 +02:00
Bernd Bestel
6090ac621e
Prevent deletion of products with current stock (closes #81) 2018-10-02 18:17:26 +02:00
Bernd Bestel
9dd57decdf
Finish "pictures for products" features (now closes #58) 2018-10-02 16:48:39 +02:00
Marius Boro
04f34ea6b0 Update no.php (#80) 2018-09-30 22:17:15 +02:00
Bernd Bestel
c675b534ef
Fix missing german translation 2018-09-30 21:41:30 +02:00
Marius Boro
6c74881f95 Update no.php (#79) 2018-09-30 21:40:26 +02:00
Bernd Bestel
8b815fce93
Finalize auto night mode feature (references #71) 2018-09-30 18:02:59 +02:00
Marius Boro
83624eaf27 Update no.php (#75) 2018-09-30 09:22:30 +02:00
Marius Boro
d7180bd7b2 Updated no.php (#70) 
* Update no.php

* Update no.php
 2018-09-27 20:39:11 +02:00
Bernd Bestel
7401971884
Make info bars clickable and add a filter for them on all overview pages (references #60) 2018-09-24 19:13:53 +02:00
Bernd Bestel
8540fc44f3
Added option to stay logged in permanently 2018-09-24 13:16:57 +02:00
Bernd Bestel
66095738e3
Added product groups (this closes #55) 2018-09-24 13:02:52 +02:00
Bernd Bestel
06f25b7006
Finish first version of tasks feature 2018-09-23 19:26:13 +02:00
Bernd Bestel
4075067a10
Renamed habits to chores as this is more what it is about 2018-09-22 13:26:58 +02:00
Bernd Bestel
8a71d55f0f
Added missing German translation for last changes 2018-09-08 09:27:50 +02:00
Bernd Bestel
b01b49d10c
Show generic error message on saving master data (this closes #45) 2018-09-08 09:26:12 +02:00
Marius Boro
e50b1eb359 Update no.php (#50) 
* Update no.php

* Update no.php

* Update no.php

* Update no.php

* Update no.php

* Update no.php
 2018-09-04 17:25:52 +02:00
Bernd Bestel
92e0245387
Merge pull request #49 from BlizzWave/patch-14 
Update it.php
 2018-09-04 08:54:04 +02:00
Bernd Bestel
67d0d3c3d6
Merge pull request #48 from BlizzWave/patch-13 
Update de.php
 2018-09-04 08:53:54 +02:00
Marius Boro
085d9a0bc7 Update no.php (#46) 
* Update no.php

Updated for version 1.18.0 some typos fixed and more fluent translations.

* Update no.php

* Update no.php
 2018-09-04 08:53:28 +02:00
Marius Boro
368df142cf
Update it.php 
typo
 2018-09-03 22:09:37 +02:00
Marius Boro
d38edabb14
Update de.php 
typo
 2018-09-03 22:09:02 +02:00
Bernd Bestel
324487d395
Add a "consume all ingredients of this recipe" button (this now closes #32) 2018-08-11 11:48:25 +02:00
Bernd Bestel
9a8c61497b Fixed typo 2018-08-09 17:32:21 +02:00
Bernd Bestel
71b9d11ff5 Implement that recipe ingredients can have arbitrary quantity units (references #32) 2018-08-09 17:24:04 +02:00
Marius Boro
dedfe3a854
Update no.php 
updated to follow closed issues
 2018-08-07 20:46:27 +02:00
Bernd Bestel
339d81318f
Add a checkbox to set the "never expires date" (closes #40) 2018-08-06 22:41:35 +02:00
Bernd Bestel
282ee0885b
Hotfix - syntax error in norwegian localization file (this will be included in the v1.17.0 release) 2018-08-04 17:46:40 +02:00
Bernd Bestel
5833364e51
Add pluralization of demo and default quantity units 2018-08-04 17:37:43 +02:00
Marius Boro
a4a25af460
Update no.php 
typos
 2018-08-01 22:44:23 +02:00
Bernd Bestel
ccaf2411fe
Merge pull request #30 from BlizzWave/patch-7 
Update de.php
 2018-07-30 19:03:41 +02:00
Marius Boro
66c07887cb Update no.php (#29) 
* Update no.php

Keeping it updated

* Update no.php
 2018-07-30 19:02:02 +02:00
Marius Boro
e026609972
Update de.php 2018-07-29 23:46:16 +02:00
Bernd Bestel
f583810d5c
Properly pluralize everything (closes #19) 2018-07-27 19:39:34 +02:00
Bernd Bestel
c64eb27ca1
Add something for product price tracking (references #22) 2018-07-26 20:27:38 +02:00
Bernd Bestel
f4eb5196f7
Merge pull request #24 from BlizzWave/patch-4 
Updated for Version 1.16.0
 2018-07-26 17:30:51 +02:00
Bernd Bestel
9e493430d8 Battery charge interval was not editable and not shown anywhere 2018-07-26 17:28:30 +02:00
Marius Boro
7690eedd70
Update no.php 
Updated for Version 1.16.0
 2018-07-25 23:40:57 +02:00
Bernd Bestel
6f47a5415c
Added a rudimentary habit analysis possibility 2018-07-25 20:01:58 +02:00
Bernd Bestel
42c1709633
Optimize and refactor latest changes 2018-07-25 19:28:15 +02:00
Bernd Bestel
249b01d7a8
Added possibility to track who did a habit (this implements and closes #21) 2018-07-24 20:45:14 +02:00
Bernd Bestel
7f8540ff4e
Replace the single user (defined in /data/config.php) with a multi user management thing 2018-07-24 19:31:43 +02:00
Marius Boro
b52ab91606 Update no.php (#23) 
* Update no.php

Better translation and minor typos

* Update no.php
 2018-07-23 21:23:55 +02:00
BlizzWave
5f826be82c
Update no.php 
typos
 2018-07-16 19:17:47 +02:00
BlizzWave
db9ee93d2b Norwegian localization (#16) 
* Create no.php

* Update no.php
 2018-07-15 21:46:16 +02:00