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,095 Commits 2 Branches 80 Tags
37054475c291564322bd4ad36775670e5b2dd1ec
Commit Graph

1095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zack Arnett
f076b0d0c6 Recipe updates (#795) 2020-04-24 17:41:57 +02:00
kriddles
385e7287fe Create Inverse QU Conversions (#788) 2020-04-24 17:41:50 +02:00
Bernd Bestel
60f321d9c2 Added changelog for #793 2020-04-23 20:51:34 +02:00
Marc Ole Bulling
49e5eda30f Make GetUriParam work with special characters (eg. "&") (#793) 2020-04-23 20:48:48 +02:00
Bernd Bestel
5833bb1e8f Added changelog for #784 2020-04-22 18:05:05 +02:00
Zack Arnett
29b4672346 Link to respective page on Calendar Event Click (#784) 
* Link to Page on calendar event click

* Undo my Prettier Changes.. Oops
 2020-04-22 18:03:05 +02:00
Bernd Bestel
fbb8999513 Fixes and changelog for #767 2020-04-22 18:00:25 +02:00
Bernd Bestel
1ea26cadcc Merge branch 'master' of https://github.com/grocy/grocy 2020-04-22 17:38:37 +02:00
kriddles
9a921cfc86 Purchase Price Hints (#767) 
* productcard update last price with per qu purchase name

* Purchase price hints

* purchase set default to 2999-12-31 if not best before date tracking

* purchase- move amount above best buy date and focus amount after product selection
 2020-04-22 17:38:24 +02:00
Bernd Bestel
16b9e2c30a Return Access-Control-Allow-Origin for all API (content) requests (references #681) 2020-04-22 17:36:20 +02:00
Bernd Bestel
5e6a9dd443 Return status code 204 for CORS OPTIONS requests (references #681) 2020-04-21 21:15:45 +02:00
Bernd Bestel
53a0a2f4e1 Also allow just all headers and request methods for CORS OPTIONS requests (references #681) 2020-04-21 21:09:49 +02:00
Bernd Bestel
98f2276e17 Send just * for Access-Control-Allow-Origin header in CORS OPTIONS requests (again closes #681) 2020-04-21 21:05:32 +02:00
Zack Arnett
7fb76df33a Recipe Pages UI updates (#776) 
* Recipe updates

* Add help text icon
 2020-04-21 08:18:09 +02:00
Bernd Bestel
f4b70e9ae3 Fixed product edit page barcodes field tab handling (fixes #764) 2020-04-19 15:01:58 +02:00
Bernd Bestel
8cbfd5fedb Added changelog for #763 2020-04-19 14:56:29 +02:00
tsia
eb190537e9 Fixed Timezone in CalendarApiController (#763) 
`PHP Warning:  DateTime::setTimezone() expects parameter 1 to be DateTimeZone, string given in /var/www/grocy/controllers/CalendarApiController.php on line 22`
 2020-04-19 14:55:08 +02:00
Bernd Bestel
0e2a067e30 Added changelog for #753 2020-04-19 14:53:33 +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
59650728a2 Make sure to include /data/.htaccess in release ZIPs v2.7.1 2020-04-17 20:12:06 +02:00
Bernd Bestel
743395ff93 Pulled translations from Transifex 2020-04-17 20:07:15 +02:00
Bernd Bestel
6931d2a764 Prepared next release 2020-04-17 20:07:01 +02:00
Bernd Bestel
356cdf4991 Fixed pre requisite checker paths (fixes #748) 2020-04-17 19:57:22 +02:00
Bernd Bestel
b4a480aa37 Downgrade / use QuggaJS again instead of Quagga2 (fixes #749) 2020-04-17 19:48:11 +02:00
James Addison
b2dbc64f29 Remove NodeJS dependency check (#745) 2020-04-17 08:24:02 +02:00
Bernd Bestel
1cb0ba5e68 Pulled translations from Transifex v2.7.0 2020-04-16 19:21:20 +02:00
Bernd Bestel
d4fefa846b Hotfix (will be included in the v2.7.0 release): Downgraded jQuery (fixes #743) 2020-04-16 19:14:26 +02:00
Bernd Bestel
7121e814b0 Updated dependencies 2020-04-16 18:22:38 +02:00
Bernd Bestel
70a1704bc2 Pulled translations from Transifex 2020-04-16 18:12:50 +02:00
Bernd Bestel
629b3c0706 Prepared next release 2020-04-16 18:05:45 +02:00
Bernd Bestel
db3021e475 Revert "Use a route cache file (speed optimization)" 
This reverts commit 59cd4dbac4.
 2020-04-14 09:02:48 +02:00
Bernd Bestel
e897570968 Only adjust the camera barcode scanning live stream picture size once (fixes #734) 2020-04-13 22:34:52 +02:00
Bernd Bestel
2e625f330d Little style changes and changelog for #733 2020-04-13 22:30:35 +02:00
Michael Frikke Madsen
a6030798c7 Add camera picker button (#733) 
* Add camera picker button

* Remove button and nested dialog - make it a select
- Also make Cancel button gray again
 2020-04-13 22:07:38 +02:00
Bernd Bestel
71770540f6 Fixed stock overview page did not load when GROCY_FEATURE_FLAG_STOCK_BEST_BEFORE_DATE_TRACKING is disabled (references #673) 2020-04-13 21:56:24 +02:00
Bernd Bestel
59cd4dbac4 Use a route cache file (speed optimization) 2020-04-13 21:26:34 +02:00
Bernd Bestel
6f4769a7b3 Make product groups on the shopping list collapsible (closes #604) 2020-04-13 19:11:13 +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
886721e972 Fixed consuming tare weight handling enabled products from the stock overview page (fixes #731) 2020-04-13 17:29:00 +02:00
Bernd Bestel
1686fcca8e Fixed that product-opened-actions had no transaction_id in stock_log (fixes #732) 2020-04-13 17:04:59 +02:00
Bernd Bestel
7d9bad58b5 Added changes of #601 to grocy.openapi.json 2020-04-13 16:57:06 +02:00
Bernd Bestel
25be604b31 Also return userfields in generic object(s) GET API routes (closes #601) 2020-04-13 16:52:34 +02:00
Bernd Bestel
87e68523e5 Typo... 2020-04-13 16:27:36 +02:00
Bernd Bestel
858315ed3f Added DataTables accent neutralise plugin (closes #654) 2020-04-13 16:27:02 +02:00
Bernd Bestel
f36d9c46ed Make Quagga2 setting "numOfWorkers" adjustable (closes #713) 2020-04-13 16:14:43 +02:00
Bernd Bestel
45d96cb60f Use Quagga2 instead of QuaggaJS (closes #579) 2020-04-13 16:08:46 +02:00
Bernd Bestel
10f890ef89 Added a camera-barcode-scanner-button to the barcodes field on the product edit page (closes #723) 2020-04-13 15:55:27 +02:00