Warning: You are not logged in. Your IP address will be publicly visible if you make any edits. If you log in or create an account, your edits will be attributed to your username, along with other benefits.
The edit can be undone.
Please check the comparison below to verify that this is what you want to do, and then save the changes below to finish undoing the edit.
| Latest revision |
Your text |
| Line 344: |
Line 344: |
| | ==August 11th== | | ==August 11th== |
| | * Submitting a PR commit for settings in Meteor.settings the new adminPassword https://github.com/BRL-CAD/OGV-meteor/pull/91/commits/61f7392eb02d72fbc59349d976d14716f78a257f | | * Submitting a PR commit for settings in Meteor.settings the new adminPassword https://github.com/BRL-CAD/OGV-meteor/pull/91/commits/61f7392eb02d72fbc59349d976d14716f78a257f |
| − |
| |
| − | ==August 12th==
| |
| − | * Learning from code reviews from the previous commit. Looking into removing the unwanted files from the email server commit. This PR should only contain validator.js, signup.js, and login.js, but it has files from the PR before it got renamed which I must look into removing. This may not be possible without deleting and readding the files from the branches, closing the PR and creating a new one, or matching the commits on the files to be the same as the other PR so it does not conflict
| |
| − |
| |
| − | ==August 13th==
| |
| − | * Going through trial and error with the command line interface for git and github. Having issues with redacting a file on github with git CLI, researching into merging local and remote branches with git CLI instead. May install a plugin for VSCODE with a different github CLI to more easily complete this operation.
| |
| − |
| |
| − | ==August 14th==
| |
| − | * Going through trial and error learning and using the VSCODE command line interface for github to merge the branches on the PR's, is giving errors and warnings about the changes deleting the previous commits. Trying to solve both PR's without deleting any files. May have to just match the files in both PR's to avoid conflict if merging the branches locally and remotely does not work.
| |
| − |
| |
| − | ==August 15th==
| |
| − | * Before matching the branches, working on implementing a more final solution per the new review given on https://github.com/BRL-CAD/OGV-meteor/pull/91. Looking into making sure this solution works every time the meteor server runs.
| |
| − |
| |
| − | ==August 16th==
| |
| − | * Implemented the solution after testing, now making sure the branches from patch-1 and development match before commiting to both Pull Requests to avoid conflicts
| |
| − |
| |
| − | ==August 17th==
| |
| − | * Resetting Git Locally on computer after dealing with local file path errors when trying to commit. Uninstalling the VSCODE plugin CLI for Github, and installing the official new Microsoft Github CLI for git and not the vanilla git cli
| |
| − |
| |
| − | ==August 18th==
| |
| − | * Taking a break for 2 days to be with sister after her surgery for lung cancer.
| |
| − |
| |
| − | ==August 21th==
| |
| − | * Logic change for account.js for Meteor Admin User Password Pull Request
| |
| − | * https://github.com/BRL-CAD/OGV-meteor/pull/91/commits/8a2748cbf7f5b472f6d472a175daa97760d34437
| |
| − |
| |
| − | * Matching Logic change commit with account.js on the other PR on branch patch-1 to avoid any conflicts with merging and closing both pull requests.
| |
