Unknown
							
						 | 
						
							
							
							
								
							
								0505c85aa1
								
							
								
							
						 | 
						
							
							
								
								Pushin - got callback on button working, need to implement room switch.
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								33cac9190a
								
							
								
							
						 | 
						
							
							
								
								Auto stash before merge of "master" and "origin/master"
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								8b2337cfee
								
							
								
							
						 | 
						
							
							
								
								implemented userlist, remove debug class from roomlist
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								0f564bb094
								
							
								
							
						 | 
						
							
							
								
								Syncing
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								3aabf00e4e
								
							
								
							
						 | 
						
							
							
								
								started user
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								72bc80d2ec
								
							
								
							
						 | 
						
							
							
								
								Commit
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								617a4c6dac
								
							
								
							
						 | 
						
							
							
								
								Fixed Button Hookup
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								09099e73b7
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								87f4afb031
								
							
								
							
						 | 
						
							
							
								
								Fixed the operator blunder
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								09f0c7d682
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								aaf5fc709c
								
							
								
							
						 | 
						
							
							
								
								Server side testing created
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								41588135ba
								
							
								
							
						 | 
						
							
							
								
								Fixed Naming Errors (hopefully)
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jesse Gliesman
							
						 | 
						
							
							
								
								
							
							
								
							
								5de0c58d0b
								
									
								
							
								
							
						 | 
						
							
							
								
								Add files via upload
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								60c456ffef
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								304f72ee21
								
							
								
							
						 | 
						
							
							
								
								Push Before HTML Upload
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Chris Blust
							
						 | 
						
							
							
								
								
							
							
								
							
								f960e0f06c
								
									
								
							
								
							
						 | 
						
							
							
								
								Delete package-lock.json
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								d362e4243a
								
							
								
							
						 | 
						
							
							
								
								basic database design
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								8bb6bc5983
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								97b8d35b95
								
							
								
							
						 | 
						
							
							
								
								updated roomUpdate generate json
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								e13876978b
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								f07c5d0786
								
							
								
							
						 | 
						
							
							
								
								Just a safety push after the scary Git conflict of 8 PM
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								08a0e10c9d
								
							
								
							
						 | 
						
							
							
								
								fixed utils unit test
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								6ce303ab0c
								
							
								
							
						 | 
						
							
							
								
								fix git repro
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								d768eea509
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/jpramassini/GoogleTrendsGame
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								99b7058e39
								
							
								
							
						 | 
						
							
							
								
								fixed null pointer
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								69d067f599
								
							
								
							
						 | 
						
							
							
								
								added words list
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								b9a7c2c596
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								3a9496838d
								
							
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'master' of https://github.com/jpramassini/GoogleTrendsGame"
							
							
							
							
							
							
								
							
							
							This reverts commit bba665e832. 
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								f39c3ef14b
								
							
								
							
						 | 
						
							
							
								
								Revert "updated npm modified files"
							
							
							
							
							
							
								
							
							
							This reverts commit 1f8f72d80d. 
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								25c55182a2
								
							
								
							
						 | 
						
							
							
								
								Revert "added dependencies to package.json"
							
							
							
							
							
							
								
							
							
							This reverts commit 02fcde1091. 
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								bba665e832
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://github.com/jpramassini/GoogleTrendsGame
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								1f8f72d80d
								
							
								
							
						 | 
						
							
							
								
								updated npm modified files
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								02fcde1091
								
							
								
							
						 | 
						
							
							
								
								added dependencies to package.json
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								22f77c3747
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
							
								
							
							
							# Conflicts:
#	googletrendsgame/package.json 
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								b12613706f
								
							
								
							
						 | 
						
							
							
								
								Worked on server
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								517d13e55c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								1f16c1c0b4
								
							
								
							
						 | 
						
							
							
								
								Front End Socket communication works!
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								f046d03ca1
								
							
								
							
						 | 
						
							
							
								
								implemented random word retrieval functionality
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								5d33a7f33e
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								f79709c451
								
							
								
							
						 | 
						
							
							
								
								added year popularity record retrieval functionality
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								d61cc39322
								
							
								
							
						 | 
						
							
							
								
								After Small Frontend Overhaul, got Socket Communication is a go.
							
							
							
							
							
							
								
							
							
							We had a small nuke of the frontend, but now we're back at a good place. Redux is no longer a part of our flow. 
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								e605e33373
								
							
								
							
						 | 
						
							
							
								
								Updated stuff for client - server test
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								a321beeb63
								
							
								
							
						 | 
						
							
							
								
								Updated utils for later implementation
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								4bc8d5d2e2
								
							
								
							
						 | 
						
							
							
								
								Fleshed out socket events and player, and room objects
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   ritfsaecdaq
							
						 | 
						
							
							
							
								
							
								7b786b24cc
								
							
								
							
						 | 
						
							
							
								
								added word scoring functionality
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								8a4479ca3e
								
							
								
							
						 | 
						
							
							
								
								Defined events for socket.io
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								3c2cbec0a3
								
							
								
							
						 | 
						
							
							
								
								Created classes in server for room and player
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								3692c7a3d3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Unknown
							
						 | 
						
							
							
							
								
							
								72e464d8f7
								
							
								
							
						 | 
						
							
							
								
								Added minified Materialize
							
							
							
							
								
							
							
						 | 
						7 years ago | 
					
				
					
						
							
							
								   Jeffery R
							
						 | 
						
							
							
							
								
							
								e7e609757a
								
							
								
							
						 | 
						
							
							
								
								Updated docs
							
							
							
							
								
							
							
						 | 
						7 years ago |