-
Notifications
You must be signed in to change notification settings - Fork 113
Version 2.0.3 to master #328
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ericdost
wants to merge
132
commits into
RaspberryPints:master
Choose a base branch
from
ericdost:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Cleaned up schema.sql and test_data.sql. As a result, massive improvement noticed in installation speed due to greatly reduced transaction overhead.
… the front page correctly. Dropdown list on beer_form.php still broken.
Renamed `ShowAbvImage` to `ShowAbvImg`. Misc. whitespace fixes
- Stylized beer_list.php - Turned off Keg Col showing by default
Added headerTextTruncLen to table `config` (default: 20 characters) Added HeaderTextTruncLen to personalize.php Created update_header_text_trunclen.php Fixed bug RaspberryPints#82 ... again. Because of the new value on index.php, you'll need to either manually create this value in `config` table, or drop and reload schema. Bulk whitespace edits. Who keeps using spaces instead of tabs?!
Resolves issue RaspberryPints#126.
- Fixing broken link to `admin/styles.css` in `email_tou.php` - Fixing typo in `index2.php` - Re-arranging and adding a link in `left_bar.php` - Fixing incorrect color in `reset_account.php` - Fixing grammar and add beta tag to `config` table.
Cleaned up schema.sql and test_data.sql. As a result, massive improvement noticed in installation speed due to greatly reduced transaction overhead.
… the front page correctly. Dropdown list on beer_form.php still broken.
Renamed `ShowAbvImage` to `ShowAbvImg`. Misc. whitespace fixes
- Stylized beer_list.php - Turned off Keg Col showing by default
Added headerTextTruncLen to table `config` (default: 20 characters) Added HeaderTextTruncLen to personalize.php Created update_header_text_trunclen.php Fixed bug RaspberryPints#82 ... again. Because of the new value on index.php, you'll need to either manually create this value in `config` table, or drop and reload schema. Bulk whitespace edits. Who keeps using spaces instead of tabs?!
Resolves issue RaspberryPints#126.
- Fixing broken link to `admin/styles.css` in `email_tou.php` - Fixing typo in `index2.php` - Re-arranging and adding a link in `left_bar.php` - Fixing incorrect color in `reset_account.php` - Fixing grammar and add beta tag to `config` table.
…ints into develop Conflicts: admin/beer_list.php admin/includes/models/beerStyle.php
- Commenting out test data in `beer_list.php`
Removed the */ on line 55
Removed extra } at line 61.
Fixed typo changed mailbock to maibock
Updated to only show the option to input flow meter pin when the Use Flow Meters option is turned on in personalization page.
Update for useFlowMeter
Updated Schema for install with flow meters.
Removed users from the pours table.
…w_monitor Feature flow monitor
Removed extra }
Commented out the print call to enable this to run silent.
Updated path for the pours.php file to point to the /var/www/includes directory
The notes section was pulling the stamped location, I updated this so it now pulls the notes.
Updated keg title to out of beta and set the flow meter and keg column to off by default.
…w_monitor Feature flow monitor
Updated admin/models/tap.php to correct issue for those not using the Flow Meters and tapping a new keg.
Corrected issue of keg showing full if start amount is less than keg volume.
Had to comment out an echo line I used for debugging.
Fixed issue with sql query.
Updated to include instructions for the flowmon init.d script.
Updated mysql calls based on changes by @kmasaryk
Fix typo
Missed mysql updates in v2.0.2
Update version number
Missed a few mysql calls
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Few bug fixes and update to version 2.0.3