Commit Graph

5032 Commits

Author SHA1 Message Date
Worros
0cd5b50b2f Merge branch 'master' of git://git.assembla.com/fpdb
Conflicts:
	pyfpdb/FulltiltToFpdb.py
2010-07-28 11:49:07 +08:00
sqlcoder
9c5581caf0 rename stealattempt fields to raisefirstin and derive accordingly 2010-07-27 22:27:18 +01:00
steffen123
acbe15fadd remove another near-duplicate from TourneyFilters 2010-07-27 19:14:23 +02:00
steffen123
0266a707ac move method from TourneyFilters to Filters 2010-07-27 19:07:14 +02:00
steffen123
3f4c5d45e8 for fear of repeating myself, removed another dupe from TourneyFilters 2010-07-27 18:54:40 +02:00
steffen123
31aa76abc9 and another dupe from TourneyFilters.. 2010-07-27 18:44:06 +02:00
steffen123
fd4e421ca3 remove another dupe from TourneyFilters 2010-07-27 18:41:51 +02:00
steffen123
e006db3a2d move 2 more methods from TourneyFilters to Filters 2010-07-27 18:35:38 +02:00
steffen123
c5ae1e785b remove another method from TF - this was only an almost-dupe 2010-07-27 18:33:01 +02:00
steffen123
9781cd1d87 yet more dupe removal from TourneyFilters 2010-07-27 18:31:35 +02:00
steffen123
90c81cb4ee move method from TF to F 2010-07-27 18:25:27 +02:00
steffen123
9006a7f45b remove another dupe method from TourneyFilters 2010-07-27 18:24:07 +02:00
steffen123
84df9ad567 remove more duplicate methods from TourneyFilters 2010-07-27 18:21:43 +02:00
steffen123
c996a11ed6 move method from TourneyFilters to Filters 2010-07-27 18:17:25 +02:00
steffen123
20ebd040c1 remove some methods in TourneyFilters that are identical in Filters 2010-07-27 18:16:46 +02:00
steffen123
e0b194ddf0 minor cleanup 2010-07-27 17:43:47 +02:00
steffen123
77a3b0b8cb Merge branch 'master' of git://repo.or.cz/fpbd-bostik 2010-07-27 16:39:09 +02:00
steffen123
5b432bcd99 GUI: remove obselete and broken table viewer 2010-07-27 15:48:19 +02:00
Mika Bostrom
ff835a0427 Update changelog for 0.20.902 snapshot 2010-07-24 09:06:40 +03:00
Mika Bostrom
9a9832b784 Merge branch 'master' of git://git.assembla.com/fpdb 2010-07-24 09:05:49 +03:00
steffen123
71df9b06dd HUD: make it work again after my previous overzealous removal of HP.TTid 2010-07-23 04:45:57 +02:00
steffen123
1f933563ee EVERLEAF: add comment where to get tourney info 2010-07-23 04:03:35 +02:00
steffen123
7f25cf6da8 DB: allow NULL for TT.currency/buyin/fee for when this info is not available 2010-07-23 04:00:25 +02:00
steffen123
a2243c8542 EVERLEAF: remove comment about converting to ET - we do not want to do that! 2010-07-23 03:55:45 +02:00
steffen123
de8b9e89c5 FTP: fix import 2010-07-23 02:07:49 +02:00
Gerko de Roo
9aeef5aafb Merge branch 'master' of git://git.assembla.com/fpdb-gimick.git 2010-07-23 00:02:50 +02:00
Gerko de Roo
bc492d7a83 Merge branch 'master' of git://git.assembla.com/fpdb.git 2010-07-23 00:02:29 +02:00
gimick
dfca631280 py2exe script update 2010-07-22 22:21:46 +01:00
steffen123
3759af4902 GUI: update version indicator to include "plus git" again 2010-07-22 22:59:53 +02:00
Mika Bostrom
9eba555fe5 Update changelog and version for snapshot 2010-07-22 23:33:34 +03:00
Mika Bostrom
d50030e479 Merge branch 'master' of git://git.assembla.com/fpdb 2010-07-22 23:29:24 +03:00
steffen123
4eefd15175 GUI: update version for snapshot 2010-07-22 21:18:55 +02:00
steffen123
61034680fe GUI: indicate that TPS is only for mysql right now 2010-07-22 21:18:20 +02:00
steffen123
ad28168d02 DB/TOUR: remove HandsPlayers.tourneyTypeId 2010-07-22 21:03:01 +02:00
steffen123
b73ee36602 Merge branch 'sqlcoder' 2010-07-22 20:28:25 +02:00
steffen123
7063bc8905 TOURNEY: stop it from creating new TT for each tourney 2010-07-22 20:23:27 +02:00
steffen123
a6c43cdca7 TOUR: a trivial fix, a trivial change, and a few debug prints 2010-07-22 19:26:11 +02:00
Eratosthenes
ba66f85f8a Merge branch 'master' of git://git.assembla.com/fpdboz 2010-07-22 13:26:03 -04:00
Eratosthenes
8de59c0400 Merge branch 'master' of git://git.assembla.com/fpdb 2010-07-22 13:25:45 -04:00
Mika Bostrom
1c45aa25a1 Merge branch 'packagingfix'
Conflicts:
	packaging/debian/changelog

Merge changelog manually
2010-07-22 09:02:15 +03:00
Mika Bostrom
19d400c0b1 Update changelog, release version 2010-07-22 08:48:05 +03:00
Mika Bostrom
3ed0476709 Merge branch 'master' of git://git.assembla.com/fpdb 2010-07-22 08:44:13 +03:00
Worros
72f395bab0 Merge branch 'master' of git://git.assembla.com/fpdb
Conflicts:
	pyfpdb/FulltiltToFpdb.py
2010-07-22 10:49:22 +08:00
Worros
6da2c6de82 Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo
Conflicts:
	pyfpdb/FulltiltToFpdb.py
2010-07-22 10:48:22 +08:00
Eratosthenes
902a4ad722 Merge branch 'master' of git://git.assembla.com/fpdb
Conflicts:
	pyfpdb/FulltiltToFpdb.py
2010-07-21 22:45:14 -04:00
steffen123
85200e8dd5 PKG/GENTOO: many improvements from ferki, update to 0.20.1 2010-07-22 03:46:11 +02:00
steffen123
d169733adf GUI: update version display for -git 2010-07-22 02:23:07 +02:00
steffen123
fe345c7cf3 Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo
Conflicts:
	pyfpdb/FulltiltToFpdb.py

conflict had obvious resolution
2010-07-22 01:11:52 +02:00
Eratosthenes
21981a921b Merge branch 'master' of git://github.com/kangaderoo/fpdb-kangaderoo
Conflicts:
	pyfpdb/FulltiltToFpdb.py
2010-07-21 18:52:43 -04:00
Eratosthenes
64d76855f1 Merge branch 'master' of git://git.assembla.com/fpdboz
Conflicts:
	pyfpdb/py2exe_setup.py
2010-07-21 18:46:34 -04:00