Zach
|
3bc61eb2e9
|
Merge pull request #1473 from woogerboy21/user_stats_table
Added user analytics table to database
|
2015-09-09 08:46:52 -04:00 |
|
Zach
|
05aa8b2c92
|
Merge pull request #1474 from woogerboy21/no_tab_close
Do not close message tabs on disconnect
|
2015-09-09 00:04:06 -04:00 |
|
woogerboy21
|
d7d50def51
|
Added user analytics table to database
|
2015-09-08 14:56:10 -04:00 |
|
woogerboy21
|
7bfea03af8
|
Do not close message tabs on disconnect
|
2015-09-08 14:38:48 -04:00 |
|
ctrlaltca
|
c984a7c962
|
Merge pull request #1488 from ctrlaltca/translations
Translations update
|
2015-09-08 19:25:34 +02:00 |
|
Fabio Bas
|
fcc5370082
|
Fetched new translations
|
2015-09-08 19:12:41 +02:00 |
|
Fabio Bas
|
5951c95e81
|
extracted new translatable strings
|
2015-09-08 19:10:57 +02:00 |
|
Fabio Bas
|
c214234bb2
|
fix typo
|
2015-09-08 19:08:34 +02:00 |
|
Fabio Bas
|
09b926a7ac
|
Added transifex cli configuration
|
2015-09-08 19:08:04 +02:00 |
|
Zach
|
aac980a8cb
|
Merge pull request #1485 from ctrlaltca/fix_notification_click
Don't change window maximized state when clicking a notification
|
2015-09-08 12:49:00 -04:00 |
|
Zach
|
601ada8473
|
Merge pull request #1484 from ctrlaltca/fix_f12
Fix loading of "increase life counter" shortcut in settings
|
2015-09-08 12:43:27 -04:00 |
|
Zach
|
b47aa86c84
|
Merge pull request #1483 from ctrlaltca/deckeditor_filter_buttons
Add back "remove" buttons to deck editor's filter
|
2015-09-08 12:33:15 -04:00 |
|
Zach
|
73f2d2b0e5
|
Merge pull request #1478 from ctrlaltca/fix_replay_crash
Fix replay crash due to completer
|
2015-09-08 12:31:59 -04:00 |
|
Zach
|
433c5703e7
|
Merge pull request #1479 from ctrlaltca/fix_autoconnect
Fix autoconnect
|
2015-09-08 12:29:53 -04:00 |
|
Fabio Bas
|
4ee12f0b69
|
Don't change window maximized state when clicking a notification
|
2015-09-08 17:49:31 +02:00 |
|
Fabio Bas
|
db18c7da10
|
Fix loading of "increase life counter" shortcut in settings
|
2015-09-08 17:13:47 +02:00 |
|
Fabio Bas
|
3be1bcd356
|
Add back "remove" buttons to deck editor's filter
|
2015-09-08 10:25:33 +02:00 |
|
Fabio Bas
|
50aa6e3a4d
|
Fix autoconnect
|
2015-09-08 08:37:19 +02:00 |
|
Fabio Bas
|
f14ebb0028
|
Fix replay crash due to completer
|
2015-09-08 08:12:00 +02:00 |
|
Zach
|
2a83f6dd4b
|
Merge pull request #1472 from marcofernandezheras/Fix-Portable-Paths
Fix thememanager on portable build
|
2015-09-07 18:03:46 -04:00 |
|
marco
|
36f19be06a
|
Fix thememanager on portable build
|
2015-09-06 18:29:48 +02:00 |
|
woogerboy21
|
dd4900b038
|
Merge pull request #1471 from ctrlaltca/deckeditor_theme_cardback
get cardback image from theme
|
2015-09-06 08:25:48 -04:00 |
|
Fabio Bas
|
e50d0c6db2
|
get cardback image from theme
|
2015-09-06 11:44:19 +02:00 |
|
woogerboy21
|
15e8121cf2
|
Merge pull request #1468 from woogerboy21/fix_old_gcc
Fix older gcc nested pre-def with portable builds
|
2015-09-05 18:01:31 -04:00 |
|
woogerboy21
|
9dc77d674f
|
Fix older gcc nested pre-def with portable builds
|
2015-09-05 17:44:51 -04:00 |
|
Zach
|
60ed9fd1ff
|
Add slash
|
2015-09-03 14:56:23 -04:00 |
|
Zach
|
4eb708c3b0
|
Merge pull request #1458 from marcofernandezheras/Fix-Portable
fix Decks, Pics replays & sounds paths on Portable build
|
2015-09-03 14:52:17 -04:00 |
|
marco
|
44fefc20c2
|
Fix portable on OSX
|
2015-09-03 19:47:07 +02:00 |
|
Zach
|
d97a9bdb15
|
Merge pull request #1459 from Cockatrice/portable_readme
Add portable info
|
2015-09-03 13:32:46 -04:00 |
|
Zach
|
48f68343a2
|
Add portable info
Portable info
|
2015-09-03 13:11:42 -04:00 |
|
marco
|
b4c5729bf5
|
fix Decks, Pics replays & sounds paths on Portable build
|
2015-09-03 18:31:11 +02:00 |
|
Gavin Bisesi
|
dbbfa82977
|
Merge pull request #1456 from Cockatrice/restore-python-register-script
Restore register.py script removed in 5ace0dd892
|
2015-09-03 09:14:54 -04:00 |
|
Gavin Bisesi
|
ebc4011559
|
Restore register.py script removed in 5ace0dd892
This is intended to be an example of using the protocol from something
other than C++ and to be a building block for future test clients.
|
2015-09-03 09:13:31 -04:00 |
|
Zach
|
f4ae08f8b1
|
Merge pull request #1439 from woogerboy21/feature_check
Added server/client feature set communication
|
2015-09-02 23:38:53 -04:00 |
|
woogerboy21
|
044c2356ff
|
Added server/client feature set communication
|
2015-09-02 17:54:06 -04:00 |
|
Zach
|
3188ef4cde
|
Merge pull request #1444 from woogerboy21/fix_blank_ban
Detect if a use is trying to place an invalid ban
|
2015-09-01 22:20:05 -04:00 |
|
marco
|
baa61d0571
|
Merge branch 'master' into Refactor-settings
Conflicts:
oracle/CMakeLists.txt
|
2015-09-01 21:28:53 +02:00 |
|
ctrlaltca
|
0a9057d1b8
|
Merge pull request #1451 from ctrlaltca/fix_1449
Let git track the empty dir "themes/Default"
|
2015-09-01 10:29:35 +02:00 |
|
Fabio Bas
|
d9ecb5db8b
|
Let git track this empty dir
|
2015-09-01 08:57:30 +02:00 |
|
Zach
|
f5f5074023
|
Merge pull request #1081 from ctrlaltca/themes_clean
Theme manager
|
2015-08-31 18:50:36 -04:00 |
|
Fabio Bas
|
6d7baec37b
|
Merge with master
|
2015-08-31 22:55:46 +02:00 |
|
Fabio Bas
|
5cfb034452
|
merged with master
|
2015-08-31 22:48:14 +02:00 |
|
ctrlaltca
|
949b0183c8
|
Merge pull request #1448 from woogerboy21/log_session_mismatch
Log inconsistent session / session table situation
|
2015-08-31 21:45:55 +02:00 |
|
woogerboy21
|
de073a51d6
|
Log inconsistent session / session table situation
|
2015-08-31 08:29:26 -04:00 |
|
woogerboy21
|
66c19ab727
|
Detect if a use is trying to place an invalid ban
|
2015-08-31 01:00:13 -04:00 |
|
woogerboy21
|
13e536013e
|
Merge pull request #1442 from woogerboy21/fix_oldsession
Fix bug that crashes server when old session is logged out during login
|
2015-08-30 23:51:33 -04:00 |
|
woogerboy21
|
66dce1bf46
|
Fix bug that crashes server when old session is logged out during login
|
2015-08-30 23:33:11 -04:00 |
|
woogerboy21
|
8bb6bb04d7
|
Merge pull request #1441 from woogerboy21/fix_check
Fix ban issue
|
2015-08-30 19:45:04 -04:00 |
|
woogerboy21
|
d8b53f9345
|
Update ban check to exclude empty client id's
|
2015-08-30 18:48:57 -04:00 |
|
Gavin Bisesi
|
c0a0775323
|
Merge pull request #1434 from Cockatrice/restore-xsd
Restore xsd files removed in #1428
|
2015-08-28 18:25:14 -04:00 |
|