grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							40b8ce799b 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools  
						
						
						
					 
					
						2009-08-15 21:53:34 +04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							46085cba5d 
							
						 
					 
					
						
						
							
							Repair missing line in regex, comment out skipping tournaments.  
						
						
						
					 
					
						2009-08-15 13:30:31 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							6648036399 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://repo.or.cz/fpbd-bostik  
						
						
						
					 
					
						2009-08-15 23:38:54 +08:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							b79f0ddccf 
							
						 
					 
					
						
						
							
							Actually call position update on reposition  
						
						... 
						
						
						
						Forgot to commit the call that does hud and aux window repositioning 
						
					 
					
						2009-08-15 14:36:08 +03:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							dede86521a 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/grindi/fpdb-grindi  
						
						
						
					 
					
						2009-08-15 19:06:39 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							ecad66f7d8 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://repo.or.cz/fpbd-bostik  
						
						
						
					 
					
						2009-08-15 19:06:18 +08:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							53eaee4d7c 
							
						 
					 
					
						
						
							
							Fix mucked cards' position update  
						
						... 
						
						
						
						When menu->reposition is called, only the HUD windows were moved to
their new positions. The auxiliary windows used for mucked cards
remained where they were at the time the HUD instance was created. This
caused mucked cards to appear in wrong places after the poker table was
moved.
Split positioning code in Mucked.py to its own method. Now the same
routine that moves HUD windows to their new places also invokes code
to reposition auxiliary windows.
Now the mucked cards are displayed at correct screen coordinates too. 
						
					 
					
						2009-08-15 10:44:04 +03:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							2cfbb07cd1 
							
						 
					 
					
						
						
							
							Merge branch 'experimental'  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/Hand.py 
						
					 
					
						2009-08-12 22:04:41 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							bdfc6ef83f 
							
						 
					 
					
						
						
							
							Unified locale handling.  
						
						... 
						
						
						
						Added support for importing filenames containig non-latin symbols 
						
					 
					
						2009-08-12 21:55:19 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							25923b02d1 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-08-12 19:58:29 +04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							116141b833 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-eric  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/HandHistoryConverter.py 
						
					 
					
						2009-08-12 22:53:49 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							0baabb0368 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/grindi/fpdb-grindi  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/HandHistoryConverter.py 
						
					 
					
						2009-08-12 22:51:49 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							cfd7b40ab6 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://repo.or.cz/fpbd-bostik  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/HandHistoryConverter.py 
						
					 
					
						2009-08-12 22:49:18 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							5a4bcf3997 
							
						 
					 
					
						
						
							
							Add streetXPot and showdownPot to hhc insert  
						
						... 
						
						
						
						totalPot not actually calcuated yet, and valued need to be converted from Decimal() to cents 
						
					 
					
						2009-08-12 22:21:54 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							483334b899 
							
						 
					 
					
						
						
							
							Fix Absolute plugin from recent change  
						
						
						
					 
					
						2009-08-12 18:34:17 +08:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							442d96b862 
							
						 
					 
					
						
						
							
							Removed hack in FTP parser  
						
						
						
					 
					
						2009-08-12 14:30:54 +04:00 
						 
				 
			
				
					
						
							
							
								Eric Blade 
							
						 
					 
					
						
						
						
						
							
						
						
							7dc635670d 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools.git  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/HandHistoryConverter.py
	pyfpdb/SQL.py 
						
					 
					
						2009-08-12 04:26:42 -05:00 
						 
				 
			
				
					
						
							
							
								Eric Blade 
							
						 
					 
					
						
						
						
						
							
						
						
							f31f2e442e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz.git  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/HandHistoryConverter.py 
						
					 
					
						2009-08-12 04:24:04 -05:00 
						 
				 
			
				
					
						
							
							
								Eric Blade 
							
						 
					 
					
						
						
						
						
							
						
						
							bfec6916f6 
							
						 
					 
					
						
						
							
							trying to get my new install of git to freaking work  
						
						
						
					 
					
						2009-08-12 04:09:04 -05:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							dd17155aa9 
							
						 
					 
					
						
						
							
							Fixed bug 7 (  http://trac-git.assembla.com/free_poker_tools/ticket/7  )  
						
						
						
					 
					
						2009-08-12 12:47:18 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							0aed2c2461 
							
						 
					 
					
						
						
							
							Party hhc: fixes  
						
						
						
					 
					
						2009-08-12 11:18:42 +04:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							185f9660c5 
							
						 
					 
					
						
						
							
							Use same locale conversion everywhere  
						
						... 
						
						
						
						It is not enough to use actual system locale in just one spot if all
the other encodings are hard-coded to latin1. Now that we have the real
locale available, do all string conversions [.encode($locale)] with
that. 
						
					 
					
						2009-08-12 10:00:23 +03:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							89dccac169 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/GuiTableViewer.py 
						
					 
					
						2009-08-12 08:30:31 +03:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							35cd58545a 
							
						 
					 
					
						
						
							
							More generic locale use, I hope  
						
						... 
						
						
						
						Instead of assuming conversion is from latin1, use locale information 
						
					 
					
						2009-08-12 08:26:06 +03:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							222d713169 
							
						 
					 
					
						
						
							
							too much changes to go into master  
						
						
						
					 
					
						2009-08-12 01:46:39 +01:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							56a6d77e9c 
							
						 
					 
					
						
						
							
							Hand: added ante support  
						
						
						
					 
					
						2009-08-12 03:48:48 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							433d0948ec 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-08-12 02:43:10 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							70e8a49b10 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/HandHistoryConverter.py 
						
					 
					
						2009-08-12 02:39:33 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							1107d9c6be 
							
						 
					 
					
						
						
							
							Party hhc: removed trailing spaces, fixes  
						
						
						
					 
					
						2009-08-12 02:35:34 +04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							d69ab83ee5 
							
						 
					 
					
						
						
							
							Fix encoding problem in the written Stars HHs.  
						
						
						
					 
					
						2009-08-11 17:43:28 -04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							9d193f236e 
							
						 
					 
					
						
						
							
							Hand: removed trailing spaces  
						
						
						
					 
					
						2009-08-12 01:13:07 +04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							6b4d065f9e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/grindi/fpdb-grindi  
						
						
						
					 
					
						2009-08-12 00:05:21 +08:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							2e60586e65 
							
						 
					 
					
						
						
							
							Party hhc: fixes and one fat hack  
						
						
						
					 
					
						2009-08-11 19:46:21 +04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							836cba6594 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/grindi/fpdb-grindi  
						
						
						
					 
					
						2009-08-11 20:56:43 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							24e5c2252d 
							
						 
					 
					
						
						
							
							Fix inserting into Gametypes  
						
						
						
					 
					
						2009-08-11 20:52:07 +08:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							a67368cc5a 
							
						 
					 
					
						
						
							
							Added hh path normalization  
						
						... 
						
						
						
						Slashes '/' in hh path can lead to import errors on non-posix systems
Path normalization eliminates this problem 
						
					 
					
						2009-08-10 20:10:39 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							dc3c721884 
							
						 
					 
					
						
						
							
							Party hhc: fixes and refactoring  
						
						
						
					 
					
						2009-08-10 18:17:13 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							3d227a42cd 
							
						 
					 
					
						
						
							
							Party hhc: fixed after Matt's refactoring ^_^  
						
						
						
					 
					
						2009-08-10 01:45:55 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							dfac9dfeb1 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/mctfpdb  
						
						
						
					 
					
						2009-08-10 00:39:52 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							4c449059ed 
							
						 
					 
					
						
						
							
							HUD: added max seats submenu  
						
						
						
					 
					
						2009-08-10 00:26:24 +04:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							bd12fc6410 
							
						 
					 
					
						
						
							
							fixes..  
						
						
						
					 
					
						2009-08-09 20:22:23 +01:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							9f2834488c 
							
						 
					 
					
						
						
							
							merged with carl, fixed conflict in hhc  
						
						
						
					 
					
						2009-08-09 20:10:14 +01:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							2510cc66c9 
							
						 
					 
					
						
						
							
							default fairly taciturn logging.conf  
						
						
						
					 
					
						2009-08-09 20:03:43 +01:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							f00a6ebfd2 
							
						 
					 
					
						
						
							
							Party hhc: removed "max seats" recognition  
						
						
						
					 
					
						2009-08-09 22:03:15 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							8ef03b0697 
							
						 
					 
					
						
						
							
							Party hhc: added nl, pl and omaha hi support  
						
						
						
					 
					
						2009-08-09 19:54:35 +04:00 
						 
				 
			
				
					
						
							
							
								Matt Turnbull 
							
						 
					 
					
						
						
						
						
							
						
						
							a32d4e053a 
							
						 
					 
					
						
						
							
							FulltiltToFpdb handles canceled hands  
						
						... 
						
						
						
						Better exception handling during parsing
FpdbParseEcxeption takes an optional HID
Stripped pointless __init__s from *ToFpdb subclasses
Logging now has logging.conf config - default is to log only INFO to
file but easily changed to DEBUG for devel work 
						
					 
					
						2009-08-09 15:19:43 +01:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							7882e735aa 
							
						 
					 
					
						
						
							
							Removed support for the ptrackS database type. File is big enough.  
						
						... 
						
						
						
						ptrackS is the PokerTracker Stud database. An early version of the
HUD supported that db. 
						
					 
					
						2009-08-09 09:29:44 -04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							730c82bc95 
							
						 
					 
					
						
						
							
							Party hhc: added max seats recognition  
						
						
						
					 
					
						2009-08-09 16:38:55 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							ebbb2afcd3 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-08-09 16:31:33 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							c042bea181 
							
						 
					 
					
						
						
							
							Improved table-by-name recognition for non-latin window titles  
						
						... 
						
						
						
						What i mean:
  u'1464739' in 'Speed #1464739  -  \xc1\xcb \xd5\xee\xeb\xe4\xe5\xec' -> Exception
  u'1464739' in 'Speed #1464739  -  \xc1\xcb \xd5\xee\xeb\xe4\xe5\xec'.decode('cp1251') -> True 
						
					 
					
						2009-08-09 16:24:31 +04:00 
						 
				 
			
				
					
						
							
							
								Mika Bostrom 
							
						 
					 
					
						
						
						
						
							
						
						
							b1281385ec 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools  
						
						
						
					 
					
						2009-08-09 14:27:05 +03:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							f431a63070 
							
						 
					 
					
						
						
							
							badHangs -> badHands  
						
						
						
					 
					
						2009-08-08 15:58:30 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							d6529ab42f 
							
						 
					 
					
						
						
							
							Import Hand.insert() work  
						
						... 
						
						
						
						storeHand updated, almost works, just violating some NOT NULL contraints 
						
					 
					
						2009-08-09 01:59:44 +08:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							0a1e6e57b5 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-08-08 09:29:41 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							a24fe93612 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/grindi/fpdb-grindi  
						
						
						
					 
					
						2009-08-08 21:25:57 +08:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							b3e6b1e510 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-sql  
						
						
						
					 
					
						2009-08-08 09:21:17 -04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							5c468d0a38 
							
						 
					 
					
						
						
							
							Added party hh path into HUD_config.xml.example  
						
						
						
					 
					
						2009-08-08 15:47:58 +04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							a70bd9742d 
							
						 
					 
					
						
						
							
							Add Gametype insert  
						
						... 
						
						
						
						Almost done, need to convert 0.25 to 25 for the database - Lookup? 
						
					 
					
						2009-08-08 16:43:52 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							5550166f37 
							
						 
					 
					
						
						
							
							Start of storeHand from HHC code  
						
						... 
						
						
						
						Currently cant actually insert as we need the fk gametypeid 
						
					 
					
						2009-08-08 16:15:36 +08:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							e748f4e2a1 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-08-08 12:09:45 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							88d67dc429 
							
						 
					 
					
						
						
							
							Fixed folder couldn't be displayed error in BulkImport  
						
						
						
					 
					
						2009-08-08 12:07:30 +04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							679393e78d 
							
						 
					 
					
						
						
							
							Minor change to insertPlayer()  
						
						
						
					 
					
						2009-08-08 14:59:23 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							cbc010155d 
							
						 
					 
					
						
						
							
							Add commented out sqlite db option to example config  
						
						
						
					 
					
						2009-08-08 13:58:56 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							4ef4d22c94 
							
						 
					 
					
						
						
							
							Add back in sqlcoders changes for sqlite - fix Grapher  
						
						
						
					 
					
						2009-08-08 13:56:53 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							1dcecf4ae3 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-eric  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/fpdb_simple.py 
						
					 
					
						2009-08-08 13:10:25 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							470d34c65c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://github.com/grindi/fpdb-grindi  
						
						
						
					 
					
						2009-08-08 13:06:41 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							150d8f7160 
							
						 
					 
					
						
						
							
							Revert "Make sure the db connection is encoded using utf8"  
						
						... 
						
						
						
						This reverts commit 2c9982cfff 
						
					 
					
						2009-08-08 13:02:29 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							08a70b75f2 
							
						 
					 
					
						
						
							
							Fix insertPlayer so that it works again  
						
						
						
					 
					
						2009-08-08 12:33:25 +08:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							4445881bfe 
							
						 
					 
					
						
						
							
							somehow a call to get_cursor() got turned into just a db pass .. and removed the debug code in recogniseplayerids  
						
						
						
					 
					
						2009-08-07 17:18:51 -04:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							d905b6e780 
							
						 
					 
					
						
						
							
							revert a line of code to avoid unicode name mangling problems until there's time to fix it properly ...  
						
						
						
					 
					
						2009-08-07 21:18:44 +01:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							43b41e88f4 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdb-sql.git  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/fpdb_simple.py 
						
					 
					
						2009-08-07 04:55:08 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							26016bffb7 
							
						 
					 
					
						
						
							
							Correctly parse fpp tournaments.  
						
						
						
					 
					
						2009-08-06 19:27:52 -04:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							d292cd18d4 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz  
						
						
						
					 
					
						2009-08-07 00:12:22 +01:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							59cfcea95d 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/free_poker_tools  
						
						
						
					 
					
						2009-08-07 00:07:32 +01:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							16319ea039 
							
						 
					 
					
						
						
							
							stop error when switching back from threads to 0 threads  
						
						
						
					 
					
						2009-08-07 00:06:11 +01:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							126dfd7331 
							
						 
					 
					
						
						
							
							get hudcache update to work for sqlite - hud now working!  
						
						
						
					 
					
						2009-08-07 00:04:44 +01:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							c0ddaad2e5 
							
						 
					 
					
						
						
							
							remove test for msql drivers  
						
						
						
					 
					
						2009-08-06 21:12:50 +01:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							0850721ecc 
							
						 
					 
					
						
						
							
							fix problem when using more recent gtk libraries (each refresh was adding an extra chart to the existing one)  
						
						
						
					 
					
						2009-08-06 20:36:11 +01:00 
						 
				 
			
				
					
						
							
							
								sqlcoder 
							
						 
					 
					
						
						
						
						
							
						
						
							6de41be9c9 
							
						 
					 
					
						
						
							
							mainly sqlite fixes, also removed not null on many hudcache columns  
						
						
						
					 
					
						2009-08-06 20:31:46 +01:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							25be578e7d 
							
						 
					 
					
						
						
							
							Fixed imported hands accounting  
						
						
						
					 
					
						2009-08-06 21:26:55 +04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							c6747785e2 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz.git  
						
						
						
					 
					
						2009-08-06 12:27:38 -04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							30ae9da2df 
							
						 
					 
					
						
						
							
							Fixed hung up on incorrect hand history  
						
						
						
					 
					
						2009-08-06 19:15:55 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							054abfc178 
							
						 
					 
					
						
						
							
							Merge branch 'party'  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/Database.py
	pyfpdb/Hand.py
	pyfpdb/PartyPokerToFpdb.py 
						
					 
					
						2009-08-06 18:44:03 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							21d10673d5 
							
						 
					 
					
						
						
							
							Party hhc: cleaned  
						
						
						
					 
					
						2009-08-06 18:11:17 +04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							56ea7c6eab 
							
						 
					 
					
						
						
							
							Add incomplete version of PartyPoker plugin  
						
						
						
					 
					
						2009-08-06 21:14:52 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							d043368c88 
							
						 
					 
					
						
						
							
							Prep for PartyPoker plugin add  
						
						
						
					 
					
						2009-08-06 20:54:39 +08:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							a1cdd76778 
							
						 
					 
					
						
						
							
							Party hhc: fixed cash  
						
						
						
					 
					
						2009-08-06 16:39:14 +04:00 
						 
				 
			
				
					
						
							
							
								grindi 
							
						 
					 
					
						
						
						
						
							
						
						
							ce43ab4d52 
							
						 
					 
					
						
						
							
							Party hhc: now it has to work with tournaments  
						
						
						
					 
					
						2009-08-06 16:09:33 +04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							f65e4e005a 
							
						 
					 
					
						
						
							
							aptofpdb: remove debugging print  
						
						... 
						
						
						
						guiautoimport: import traceback
fpdb_simple/GuiPlayerStats: deal with multiple sites with players with matching names
HUD_main: error file is again HUD-error not fpdb-error-log. 
						
					 
					
						2009-08-06 07:23:57 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							a7f857a90c 
							
						 
					 
					
						
						
							
							Revert "Make sure the db connection is encoded using utf8"  
						
						... 
						
						
						
						This reverts commit 2c9982cfff 
						
					 
					
						2009-08-06 02:11:26 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							afc4c026f9 
							
						 
					 
					
						
						
							
							Tables: change how the case insensitivity is done, so we don't crap out on Everleaf  
						
						
						
					 
					
						2009-08-06 02:10:49 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							42109ec4e4 
							
						 
					 
					
						
						
							
							Tables: windows table title searching now case insensitive  
						
						
						
					 
					
						2009-08-06 00:12:49 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							2e698bb1d4 
							
						 
					 
					
						
						
							
							Merge branch 'master' of git://git.assembla.com/fpdboz.git  
						
						... 
						
						
						
						Conflicts:
	pyfpdb/AbsoluteToFpdb.py 
						
					 
					
						2009-08-06 00:00:29 -04:00 
						 
				 
			
				
					
						
							
							
								eblade 
							
						 
					 
					
						
						
						
						
							
						
						
							2685608294 
							
						 
					 
					
						
						
							
							bump atofpdb siteid  
						
						... 
						
						
						
						configuration should not error if 'site' is empty (ie when running from command line)
guiplayerstats won't auto-load default report
hud should work from command line 
						
					 
					
						2009-08-05 23:57:26 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							b75583c784 
							
						 
					 
					
						
						
							
							Add Absolute to HUD config example  
						
						
						
					 
					
						2009-08-06 11:41:51 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							a37adde67e 
							
						 
					 
					
						
						
							
							Catch up to Eric - fix markStreets regex  
						
						
						
					 
					
						2009-08-06 11:30:21 +08:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							71aaf62c40 
							
						 
					 
					
						
						
							
							Fix my last fix of previous commit.  
						
						
						
					 
					
						2009-08-05 23:25:43 -04:00 
						 
				 
			
				
					
						
							
							
								Ray 
							
						 
					 
					
						
						
						
						
							
						
						
							ee01deb852 
							
						 
					 
					
						
						
							
							Fix problem with previous commit.  
						
						
						
					 
					
						2009-08-05 23:20:28 -04:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							c35132463c 
							
						 
					 
					
						
						
							
							Add absolute hhc to example file  
						
						
						
					 
					
						2009-08-06 10:59:44 +08:00 
						 
				 
			
				
					
						
							
							
								Worros 
							
						 
					 
					
						
						
						
						
							
						
						
							5f5825e30b 
							
						 
					 
					
						
						
							
							Add additional siteids to default data insert  
						
						
						
					 
					
						2009-08-06 10:18:48 +08:00