kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-31 02:36:54 +00:00
Code Issues Projects Releases Wiki Activity
221 Commits 2 Branches 80 Tags
b7f0b0668479ab37260d3ff9f26cb726988d4d0c
Commit Graph

221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bernd Bestel
b7f0b06684 Remove items from shopping list without reloading the whole page 2018-08-11 14:07:44 +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
bc7afe4bdd Auto "click" the shortcut checkbox when manually entering the shortcut date (references #40) 2018-08-09 17:25:27 +02:00
Bernd Bestel
bb5dcb2434 Fixed a warning on embedded and demo installations 2018-08-09 17:24:37 +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
3e73a44576 Merge pull request #41 from BlizzWave/patch-10 
Update no.php
 2018-08-07 21:00:06 +02:00
Marius Boro
dedfe3a854 Update no.php 
updated to follow closed issues
 2018-08-07 20:46:27 +02:00
Bernd Bestel
c4b0ef4d49 Refresh the complete row on all overview pages on changes, including the background color (closes #39) 2018-08-07 20:11:08 +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 v1.17.0 2018-08-04 17:37:43 +02:00
Bernd Bestel
525f1705d1 Update dependencies for next release 2018-08-04 17:22:15 +02:00
Bernd Bestel
5a13cb5ffe Fix jquery timeago update did not really work 2018-08-04 16:54:46 +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
6081b8ee67 Fix some form validation problems (closes #36) 2018-08-04 07:45:24 +02:00
Bernd Bestel
7eef4acd81 Use the same info-bar to explain table colors in shopping list as in stock overview (fixes #27) 2018-08-03 09:06:11 +02:00
Bernd Bestel
678579e933 Don't use ORDER BY in VIEWS (as this is invalid SQL, why does this even work sometimes in SQLite) (fixes #33) 2018-08-03 08:26:59 +02:00
Bernd Bestel
4cc2d39063 Merge remote-tracking branch 'remotes/origin/fix-issue-33' 2018-08-03 08:18:59 +02:00
Bernd Bestel
14cc153422 Removed unused dependency 2018-08-03 08:16:33 +02:00
Bernd Bestel
f5b5c4c7e1 Add default quantity units and locations to reduce confusion (only for new installations) (references #38) 2018-08-03 08:14:23 +02:00
Bernd Bestel
88b76a52a5 Merge pull request #37 from BlizzWave/patch-9 
Update no.php
 2018-08-02 07:48:33 +02:00
Marius Boro
a4a25af460 Update no.php 
typos
 2018-08-01 22:44:23 +02:00
Bernd Bestel
41a72d11da Remove unneeded ORDER BY as this maybe lead to problems like in #33 2018-07-31 17:42:07 +02:00
Bernd Bestel
c8236b101b Fix redefine of constant GROCY_DATAPATH when it's not an embedded AND not a demo installation 2018-07-31 17:31:03 +02:00
Bernd Bestel
ef1df0a446 Unify path references and only use relative ones 2018-07-30 19:16:36 +02:00
Bernd Bestel
5c4953b9b2 Merge pull request #28 from BlizzWave/patch-5 
Update README.md
 2018-07-30 19:12:06 +02:00
Bernd Bestel
ccaf2411fe Merge pull request #30 from BlizzWave/patch-7 
Update de.php
 2018-07-30 19:03:41 +02:00
Bernd Bestel
bce8bd6b35 Merge pull request #31 from BlizzWave/patch-8 
Update batteriesoverview.blade.php
 2018-07-30 19:03:28 +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
be99880ce4 Update batteriesoverview.blade.php 
Some german slipped in there too.
 2018-07-29 23:49:35 +02:00
Marius Boro
e026609972 Update de.php 2018-07-29 23:46:16 +02:00
Marius Boro
3474f55866 Update README.md 
added useful information for new users
 2018-07-29 23:26:34 +02:00
Bernd Bestel
f583810d5c Properly pluralize everything (closes #19) 2018-07-27 19:39:34 +02:00
Bernd Bestel
419445f5ae Don't add a dummy data point on chart initialization (not needed, will lead to that the current price is always 0 - references #22) 2018-07-26 21:23:37 +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
aaa270a52f Hotfix for old user to database migration (this will be included in the v1.16.0 release) 2018-07-25 20:26:23 +02:00
Bernd Bestel
6f47a5415c Added a rudimentary habit analysis possibility v1.16.0 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
4685ff4145 Add an update script for Linux 2018-07-25 08:22:27 +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
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
Bernd Bestel
7246ac55b6 Hide scrollbar in sidebar for now (workaround for #15, found no better solution, this closes #15) 
This also references BlackrockDigital/startbootstrap-sb-admin#73
 2018-07-23 21:21:27 +02:00
Bernd Bestel
848931da21 Mention grocy-desktop in README 2018-07-22 13:59:53 +02:00