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

378 Commits

Author SHA1 Message Date
Bernd Bestel
a95d6be4f4
Added more product actions on the stock overview page (closes #327) 2019-09-20 13:37:53 +02:00
Bernd Bestel
ca9b8d068a
Reuse existing routes for the by-barcode API routes and complete them (references #331) 2019-09-20 10:45:58 +02:00
Bernd Bestel
58a69d650f
Added an API endpoint to add/remove products to stock by its barcode (closes #331) 2019-09-19 18:36:46 +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
096fb7a116
Implement custom entities / objects (closes #242) 2019-09-18 16:18:15 +02:00
Bernd Bestel
918f84f568
Lazy load all images to increase page load times (references #275) 2019-09-18 13:59:37 +02:00
Bernd Bestel
d209c0bd22
Automatically downscale pictures to reduce page loading times (closes #275) 2019-09-18 11:04:59 +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
9b5f3ba7b8
Render product Userfields also on the shopping list (this now closes #258) 2019-09-17 19:39:55 +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
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
Marc Ole Bulling
d4eb767f1b Add API call for adding products to shoppinglist 2019-08-30 09:21:11 +02:00
Bernd Bestel
28716ed96c
First draft for printable location content sheets (references #341) 2019-08-10 16:34:29 +02:00
Bernd Bestel
fa326fdfda
Added an API endpoint to search for objects by name (closes #337) 2019-08-10 13:07:08 +02:00
Bernd Bestel
cc1c6a6442
Little changes for pull request #338 2019-08-10 08:33:30 +02:00
Marc Ole Bulling
1e33975a96 Use default best before date when adding product through API 2019-08-04 20:58:11 +02:00
Forceu
1a23eaabf1
Add API call to remove an item from the shopping list by productid 
This adds an API call, so a shopping list item can easily be removed

Please note: This is UNTESTED, as I was unable to run the current grocy master commit on my server.
 2019-08-04 20:31:47 +02:00
Niels
94e2ec5e15
Merge branch 'master' into master 2019-07-10 15:11:36 +02:00
Niels Tholenaar
0a61ea0fcf Improved entry page resolving to handle disabled features 2019-07-10 15:10:39 +02:00
Bernd Bestel
b4d2e2a20a
Added the possibility to undo a task (closes #252) 2019-07-06 20:34:01 +02:00
Bernd Bestel
e4d26bb8fd
Make it possible to switch shopping list items between shopping lists (closes #284) 2019-07-06 17:31:17 +02:00
Bernd Bestel
482a520062
Slightly modified new recipe stock fulfillment API endpoints (references #289) 2019-07-06 15:28:49 +02:00
Bernd Bestel
ddef58e2a9
Merge pull request #289 from Aerex/add-resolved-recipes-endpoint 
Add requirement fulfillment recipes endpoint
 2019-07-06 15:02:20 +02:00
Bernd Bestel
3fcede0b7c
Fix that "Track date only" cannot be tracked <> today (fixes #300) 2019-07-06 13:32:40 +02:00
Niels Tholenaar
86f5667039 Allow possibility to choose custom homepage 2019-06-22 16:02:52 +02:00
Aerex
a01a80578c Merge branch 'master' into add-resolved-recipes-endpoint 2019-06-20 23:40:55 -05:00
grocy
7a51fb77b0 feat: Added recipes/requirements route 
- feat: Added requirements route to allow clients to access the requirements fulfilments of recipes
 2019-06-20 23:11:57 -05:00
Bernd Bestel
b1adaa24cf
Fix session problem on 32 bit systems when using "stay logged in permanently" (fixes #278) 2019-06-08 16:47:45 +02:00
Bernd Bestel
91116ee768
Make sure user settings variable is populated always (fixes #277) 2019-06-08 15:54:56 +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
bcae9f9292
Added price field on inventory page (for added products) (references #225) 2019-05-03 22:11:20 +02:00
Bernd Bestel
4c2cf4944d
Added a feature flag to also be able to hide all stock related UI elements and routes (closes #228) 2019-05-03 20:03:04 +02:00
Bernd Bestel
4912dd56d1
Finished migration to use gettext (this now closes #161) 2019-05-02 20:20:18 +02:00
Bernd Bestel
9b2dba2397
Migrated (hopefully) all translations to PO/Gettext (references #161) 2019-05-01 20:19:18 +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
162adeb359
Improve API related changes regarding multiple shopping lists (references #190) 2019-04-22 08:21:57 +02:00
Bernd Bestel
cdd02efcc6
Implemented multiple/named shopping lists (closes #190) 2019-04-20 17:04:40 +02:00
Bernd Bestel
c1674d33b4
Make "next X days" configurable (closes #175) 2019-04-20 15:30:45 +02:00
Bernd Bestel
b6e80580ed
Make it possible to provide a different location for added product during inventory (closes #183) 2019-04-05 21:26:44 +02:00
Bernd Bestel
886e272c03
Show product count per group on the product groups page and added a link to the products page filtered by the current product group (closes #174) 2019-04-05 21:08:30 +02:00
Matej Drobnič
3f4a5cc0d6 Add fetch by barcode API method 2019-03-10 12:20:31 +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
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
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
8020f92d6b
Track on consume for which recipe it was (closes #64 and references #64) 2019-03-03 18:20:06 +01:00
Bernd Bestel
bb5daa5f8b
Display total cost of recipes based on last purchase prices (closes #128) 2019-03-03 16:33:48 +01:00
Bernd Bestel
e9ef7ea6d8
Allow recipe ingredients to be ignored when putting them on the shopping list (closes #125) 2019-03-03 14:49:46 +01:00
Bernd Bestel
89ad25c904
Implemented scalable recipes (closes #127) 2019-03-03 13:27:10 +01:00
Bernd Bestel
b89643ddb1
Allow different locations per product in stock (closes #124) 
Kind of basic for now, a different location can be set on purchase, the filters on the stock overview page handles different locations
 2019-03-01 20:25:01 +01:00
Bernd Bestel
01e9e3f5ce
Move about dialog into separate view and add API endpoint for system info 2019-02-09 13:41:40 +01:00
Bernd Bestel
276bc94cc6
More improvements on the REST API (references #139) 2019-01-21 22:13:42 +01:00
Bernd Bestel
bfa59dd29c
Rework API to be more RESTful (references #139) 2019-01-19 14:51:51 +01:00
Bernd Bestel
f6cf26009d
Better API response when request body is not valid JSON (references #126) 2019-01-05 20:39:22 +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
5da24d2d4f
Added first version of calendar (closes #42) 2018-11-18 15:39:43 +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
973f07b360
Add embedded mode (hides menu and so on), maybe need for #98 2018-11-17 12:57:35 +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
fe83e2fa6f
Created API endpoints to undo battery charge cycles and chore executions (references #63) 2018-10-27 10:55:30 +02:00
Bernd Bestel
da98efa833
Finalize nested recipes / group recipe positions feature (closes #77) 2018-10-27 10:37:31 +02:00
Bernd Bestel
3e6cf545d7
Finalize stock booking undo API (references #63 and #97) 2018-10-27 10:19:06 +02:00
Bernd Bestel
1080c3486c
Created first version of an API endpoint to undo stock bookings (references #63 and #97) 2018-10-26 22:28:58 +02:00
Bernd Bestel
cd7b6b686d
Fix API keys cannot be deleted (fixes #99) 2018-10-26 20:12:48 +02:00
Bernd Bestel
b84e6da0dd
Added recipe position groups (references #77) 2018-10-25 22:45:44 +02:00
Bernd Bestel
fc3a4c6899
Finish first version of nested recipes feature (references #77) 2018-10-25 20:36:29 +02:00
Bernd Bestel
12a2cb0bdf
Created basis edit UI for nested recipes (references #77) 2018-10-23 19:36:39 +02:00
Bernd Bestel
04c93d937e
Make presets for new products configurable (closes #92) 2018-10-20 14:55:49 +02:00
Talmai Oliveira
f13abf483e Grocy docker patch fix (#94) 
fixed:

Warning: Use of undefined constant GROCY_USER_ID - assumed
'GROCY_USER_ID' (this will throw an Error in a future version of PHP) in
/www/controllers/BaseController.php on line 47
 2018-10-20 09:07:05 +02:00
Bernd Bestel
0e723a0a9b Fixed reported login problem ("PHP Warning: date() expects parameter 2 to be integer, float given") 2018-10-16 18:21:38 +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
edb986ce24
Added a quick mockup for equipment / instruction manuals (references #25) 2018-10-02 20:03:08 +02:00
Bernd Bestel
bb9caf9cc9
Fixed volatil stock logic (fixes #69) 2018-10-02 17:06:21 +02:00
Bernd Bestel
f1fc0ee549
Finished first version of "pictures for products" (references #58) 2018-10-01 20:20:50 +02:00
Bernd Bestel
e5fb609c8e
Finalize file API (references #58) 2018-09-30 22:16:33 +02:00
Bernd Bestel
f451e65278
Also log missing localization found in frontend (only when MODE == dev) 2018-09-30 13:02:07 +02:00
Bernd Bestel
d4227d2e41
Make auto reloading the page on external database changes configurable (closes #74) 2018-09-30 11:17:28 +02:00
Bernd Bestel
0bbd2d9880
Prepare user settings API (references #74 and #71) 2018-09-30 10:47:56 +02:00
Bernd Bestel
9c2c2c1fa2
Prepare file upload API (references #58) 2018-09-27 14:01:00 +02:00
Bernd Bestel
b2019ba42d
Fixed new-chore-form did not work (fixes #68) 2018-09-27 12:54:06 +02:00
Bernd Bestel
003d4a567a
Use the last commit time as release date when MODE is prerelease 2018-09-25 16:33:09 +02:00
Bernd Bestel
8d41dcc650
Use current commit hash as version "number" when MODE is prerelease 2018-09-25 08:55:25 +02:00
Bernd Bestel
2a0ec30bb0
Auto reload the current page when the database has changed and when idling (closes #59) 2018-09-24 13:53:18 +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
f85a67a1ff
Continue working on tasks feature 2018-09-23 09:22:54 +02:00
Bernd Bestel
6fe0100927
Start working on tasks feature 2018-09-22 22:01:32 +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
324487d395
Add a "consume all ingredients of this recipe" button (this now closes #32) 2018-08-11 11:48:25 +02:00
Bernd Bestel
71b9d11ff5 Implement that recipe ingredients can have arbitrary quantity units (references #32) 2018-08-09 17:24:04 +02:00
Bernd Bestel
e830805443
Refresh also habit/battery statistics on changes on overview pages (references #26) 2018-08-04 15:44:58 +02:00
Bernd Bestel
ca3f28b615
Refresh stock statistics on consume on stock overview page (references #26) 2018-08-04 14:25:32 +02:00
Bernd Bestel
c64eb27ca1
Add something for product price tracking (references #22) 2018-07-26 20:27:38 +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
bcbdf58376
Prefix all global vars 2018-07-24 19:41:35 +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
Bernd Bestel
3afeb44b1d
Prepare for embedded mode 2018-07-18 19:07:00 +02:00
Bernd Bestel
254e1a9bc1
Fix all the little things for the next release 2018-07-15 13:33:59 +02:00
Bernd Bestel
37dee2a50b
Display first recipe by default on recipes page 2018-07-15 10:16:36 +02:00
Bernd Bestel
ea0f5101ec
Finalize recipes feature 2018-07-15 09:56:10 +02:00
Bernd Bestel
be650d093d
Add a button to clear the whole shopping list 2018-07-15 08:29:26 +02:00
Bernd Bestel
734814d96b
More or less finalize recipes feature 2018-07-14 22:49:42 +02:00
Bernd Bestel
d9246b9b42
Start working on recipes feature 2018-07-14 18:23:41 +02:00
Bernd Bestel
778191fd11
Fixed all (or most of) the broken stuff after the dependency upgrade party 2018-07-11 19:43:05 +02:00
Bernd Bestel
ecf96252b9
Add possibility to filter products by location (references #10) 2018-07-08 15:16:24 +02:00
Bernd Bestel
92e648490a
Sort all dropdowns 2018-07-08 13:59:42 +02:00
Bernd Bestel
0954b5a741
Add option to not use URL rewriting 2018-06-15 20:50:40 +02:00
Bernd Bestel
6fa4e13ba2
Fix API version display 2018-05-13 09:00:14 +02:00
Bernd Bestel
89bae8d25e
Changed how version information is stored and displayed 2018-05-12 15:49:21 +02:00
Bernd Bestel
3e394a3840
Also show due/overdue on bateries- and habitoverview 2018-05-12 15:30:13 +02:00
Bernd Bestel
a9a1358b08
Added a plugin system for looking up products against external services by barcode (references #6) 2018-04-22 19:50:24 +02:00
Bernd Bestel
4853174d03
Validate all API request as the API is now open for third parties (references #5) 2018-04-22 14:25:08 +02:00
Bernd Bestel
99b2a84667
Finish API documentation and token auth (references #5) 2018-04-21 19:18:00 +02:00
Bernd Bestel
9bd6aac09c
Start working on API documentation and token auth (references #5) 2018-04-20 23:09:18 +02:00
Bernd Bestel
eae5b8bad9
Revise session handling to prepare API authentication via token 2018-04-20 11:34:53 +02:00
Bernd Bestel
607a90cccc
Use absolute URLs everywhere, this should fix #3 2018-04-18 19:03:39 +02:00
Bernd Bestel
4656a85732
Added localization support 2018-04-16 19:11:32 +02:00
Bernd Bestel
642f95a3f8
Finalize project reorganization 2018-04-14 11:10:38 +02:00
Bernd Bestel
5a1d21ef31
Reorganize project part 3 2018-04-12 21:13:38 +02:00
Bernd Bestel
feb88ab685
Reorganize project part 2 2018-04-11 19:51:05 +02:00