| Commit message (Collapse) | Author | Age | 
| |\  
| | 
| | 
| | 
| |  | 
# Conflicts:
#	ufund-api/src/main/resources/application.properties
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | | 
| | 
| | 
| |  | 
service as an inbetween with logic
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| |/   | 
 | 
| |  | 
 | 
| |  | 
 | 
| |\  
| | 
| | 
| |  | 
https://github.com/RIT-SWEN-261-02/team-project-2245-swen-261-02-2b
 | 
| | |  | 
 | 
| |/   | 
 | 
| |  | 
 | 
| |  | 
 | 
| |  | 
 | 
| |  | 
 | 
| |  | 
 | 
| |  | 
 | 
| |  | 
 | 
| |  | 
 | 
| |  | 
 | 
| |  | 
 | 
| |  | 
 | 
| |\  
| | 
| |  | 
Merge user-functionality into main
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | | 
| | 
| | 
| |  | 
UserFileDAO to check for conflict
 | 
| | |  | 
 | 
| | | 
| | 
| | 
| |  | 
string name to use to find desired user to update.
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| | |  | 
 | 
| |/   | 
 | 
| |  | 
 | 
| |  | 
 | 
| |\  
| | 
| | 
| | 
| |  | 
# Conflicts:
#	ufund-api/data/cupboard.json
 | 
| | | 
| | 
| | 
| |  | 
current is greater than max
 | 
| |/   | 
 | 
| |  | 
 | 
| |  | 
 |