Commit Graph

5120 Commits

Author SHA1 Message Date
Eric Blade
cee7617cdb Merge branch 'master' of git://git.assembla.com/fpdb-gimick.git
Conflicts:
	packaging/windows/py2exe_setup.py
2011-03-19 18:56:00 -04:00
gimick
f0798111e5 py2exe: recommit files to correct line endings 2011-03-18 22:01:51 +00:00
gimick
632724d5c0 py2exe: remove two files with windows line endings. To be fixed in next commit 2011-03-18 21:46:21 +00:00
gimick
4a622529c6 py2exe: more automation - walkthrough & script changes 2011-03-18 21:16:34 +00:00
Eric Blade
a0ffc0dfb0 Merge branch 'master' of git://git.assembla.com/fpdb.git
Conflicts:
	packaging/windows/py2exe_setup.py
2011-03-17 23:42:43 -04:00
Eric Blade
600bdbe14a Merge branch 'master' of git://git.assembla.com/fpdb-gimick.git
Conflicts:
	packaging/windows/py2exe_setup.py
2011-03-17 23:40:43 -04:00
Eric Blade
9a073765f7 Merge branch 'master' of git://git.assembla.com/fpdboz.git 2011-03-17 23:38:38 -04:00
Steffen Schaumburg
309c3a408a overdue version string increment 2011-03-18 00:12:20 +01:00
Steffen Schaumburg
b75dc46979 display warning and dont load HUD if running without admin under vista/7 2011-03-18 00:11:47 +01:00
Steffen Schaumburg
96bf04ad5f make fpdb.pyw executable 2011-03-17 21:00:00 +01:00
Steffen Schaumburg
20bd9b4ae3 Revert "trivial string fix"
This reverts commit 92095b1fc0.
2011-03-17 20:59:17 +01:00
Steffen Schaumburg
af1c1d1c1f Merge branch 'carl' 2011-03-17 15:15:45 +01:00
Worros
08ee109ec3 Stars: Allow ' in tablename
Table 'Isildur's NLHE 50 IV' 2-max Seat #2 is the button
2011-03-17 14:29:00 +08:00
Steffen Schaumburg
60d17b0231 Merge branch 'eric' 2011-03-16 12:26:24 +01:00
Steffen Schaumburg
92095b1fc0 trivial string fix 2011-03-16 12:26:21 +01:00
Steffen Schaumburg
90a2f59803 Merge branch 'master' of git://git.assembla.com/fpdb-eric into eric 2011-03-16 12:17:16 +01:00
Steffen Schaumburg
bc7a5c55ff Merge branch 'carl'
Conflicts:
	pyfpdb/WinamaxToFpdb.py (just a comment and an output string
2011-03-16 09:37:44 +01:00
Steffen Schaumburg
b000278000 Merge branch 'gimick'
Conflicts:
	packaging/windows/py2exe_setup.py
2011-03-15 21:52:16 +01:00
Steffen Schaumburg
d7fdac6366 Merge branch 'ferki' 2011-03-15 21:19:26 +01:00
Steffen Schaumburg
5262746996 attempted fix for OSX startup problem 2011-03-15 21:18:42 +01:00
Worros
15bdbfbdf7 Absolute: Allow date variation to parse 2011-03-15 14:44:41 +08:00
Worros
affc697b32 Regression: Absolute HH from email.
Not this file was been modified from the original email format to:
- Remove the ####+ line
- Rename the file into the manner expected.
2011-03-15 14:42:43 +08:00
tribumarchal
180c4be9f6 new and old cards
Signed-off-by: tribumarchal
2011-03-14 16:31:08 +08:00
tribumarchal
2ddc08263a translation ascii utf8
Signed-off-by: tribumarchal
2011-03-14 16:30:41 +08:00
Worros
f1ec659015 WinamaxSummary: Allow satellites to parse 2011-03-14 16:05:59 +08:00
Worros
7e5573f1f5 Winamax: Minor fix to Pierres patch. 2011-03-14 14:12:32 +08:00
tribumarchal
c66ec208c2 fix error only french winnamax poker
Signed-off-by: tribumarchal
2011-03-14 14:11:27 +08:00
tribumarchal
920aac6f73 fix minor bug display GuiRingPlayerStats.py
Signed-off-by: tribumarchal
2011-03-14 14:06:42 +08:00
Erki Ferenc
d2be4b2fb4 l10n: updated and revised Hungarian translation 2011-03-13 17:43:49 +01:00
Steffen Schaumburg
8a9a227735 fix some misplaced newlines in the translations, add checking program to localise script, update mo files 2011-03-12 22:03:06 +01:00
Steffen Schaumburg
d49d2e2220 few more string unifications (I know its too late, but I wanted them in so translators running non-source can try their translations better), update l10n files 2011-03-12 21:47:14 +01:00
gimick
8cab75bf2a Revert "py2exe: add more build automation, activate MS-Windows GTK theme - (merge conflict)"
This reverts commit f16e33c398.
2011-03-12 20:46:29 +00:00
gimick
f16e33c398 py2exe: add more build automation, activate MS-Windows GTK theme - (2nd try) 2011-03-11 17:28:21 +00:00
gimick
26fc81c013 Revert "py2exe: add more build automation, activate MS-Windows GTK theme" filetype mangled
This reverts commit 0dfe6b3d78.
2011-03-11 09:51:53 +00:00
Steffen Schaumburg
2baac68ac7 generate hungarian mo file 2011-03-11 07:15:17 +01:00
Steffen Schaumburg
24f7d5514f Merge branch 'ferki'
Conflicts:
	pyfpdb/locale/fpdb-hu_HU.po
2011-03-11 07:12:58 +01:00
Steffen Schaumburg
1fac2ffe13 more string unification, update l10n files 2011-03-11 07:08:50 +01:00
Worros
d7697f4328 TourneySummary: SQLite complaining about Decimal format.
Variables were already passed in as int - allow them to remain so
2011-03-11 06:40:27 +01:00
Worros
72f6a1ce6a Database: Reformat a some tournament results update code
Reformat to make life easier when debugging
2011-03-11 06:40:10 +01:00
Worros
56db34ae05 Party: Fix Party freeroll tourney parsing 2011-03-11 06:39:56 +01:00
Worros
292cea1fb9 Regression: Party freeroll tourney, sample 2011-03-11 06:39:42 +01:00
Erki Ferenc
78c19a7e88 l10n: updated Hungarian translation 2011-03-11 01:36:41 +01:00
gimick
0dfe6b3d78 py2exe: add more build automation, activate MS-Windows GTK theme 2011-03-10 21:03:32 +00:00
Steffen Schaumburg
1f355c1638 dont load configuration in test_python_libs as the import fails 2011-03-10 17:35:58 +01:00
Worros
eef755ac01 Merge branch 'master' of git://git.assembla.com/fpdb 2011-03-10 18:06:30 +08:00
Worros
0955656585 TSI: Add Winamax lines 2011-03-10 18:05:36 +08:00
Worros
07d2d5733c TourneySummary: SQLite complaining about Decimal format.
Variables were already passed in as int - allow them to remain so
2011-03-10 18:03:21 +08:00
Worros
e0124d2d11 Database: Reformat a some tournament results update code
Reformat to make life easier when debugging
2011-03-10 18:01:25 +08:00
Eric Blade
0bc0d97bbf Merge branch 'master' of git://git.assembla.com/fpdb.git
Conflicts:
	pyfpdb/WinTables.py
	pyfpdb/fpdb.pyw
2011-03-10 02:45:27 -05:00
Steffen Schaumburg
d0f6f53ae1 update pot/po/mo files 2011-03-10 06:17:56 +01:00