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 
							
						 
					 
					
						
						
							
						
						57233dba1a 
					 
					
						
						
							
							Added first basic version of meal planning (references  #146 )  
						
						 
						
						
						
						
					 
					
						2019-05-06 19:38:47 +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 
							
						 
					 
					
						
						
							
						
						fc11da3c3f 
					 
					
						
						
							
							Started working on user-defined-fields for all entities (references  #176 )  
						
						 
						
						
						
						
					 
					
						2019-04-22 22:16:35 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Matej Drobnič 
							
						 
					 
					
						
						
							
						
						3f4a5cc0d6 
					 
					
						
						
							
							Add fetch by barcode API method  
						
						 
						
						
						
						
					 
					
						2019-03-10 12:20:31 +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 
							
						 
					 
					
						
						
							
						
						32e878afc9 
					 
					
						
						
							
							Added feature flags to disable/hide parts not needed ( closes   #157 )  
						
						 
						
						... 
						
						
						
						grocy was initally about stock management, so this is always enabled, the rest can be disabled 
						
						
					 
					
						2019-03-01 19:33:33 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chris Forkner 
							
						 
					 
					
						
						
							
						
						0ce8d706a6 
					 
					
						
						
							
							API - A bit more RESTful ( #140 )  
						
						 
						
						... 
						
						
						
						* Restful routes
* Change public/viewjs to match API routes
* Move the GET and POST together. Fixed Typos. PUT for object/user edits.
* Verb-less Generic Entity Interactions
* Create Grocy.Api.Put
* Create Grocy.Api.Delete
* Fix Volatile Slim Error order in routes and adjust to english noun 
						
						
					 
					
						2019-01-19 08:37:21 +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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bernd Bestel 
							
						 
					 
					
						
						
							
						
						edb986ce24 
					 
					
						
						
							
							Added a quick mockup for equipment / instruction manuals (references  #25 )  
						
						 
						
						
						
						
					 
					
						2018-10-02 20:03:08 +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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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 
							
						 
					 
					
						
						
							
						
						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