Commit graph

Select branches

Hide pull requests

master

Mono Color

• b3d96cc5da Merge remote-tracking branch 'Cockatrice/master' into fix_1387 Jeff 2015-08-20 22:17:06 -0400
• b2ab2c6eba Merge pull request #1382 from marcofernandezheras/Customizable-shortcuts Zach 2015-08-20 21:44:05 -0400
• c6aba5a6d0 Renamed file + reduced window size + resfresh on change marco 2015-08-18 23:47:21 +0200
• a64ea17357 Add LineEditCompleter to Tab_Game Jeff 2015-08-18 15:48:07 -0400
• 1ef9041815 Merge pull request #1389 from Cockatrice/schema_level_correction woogerboy21 2015-08-18 08:04:29 -0400
• 65635bcdd8 Corrected miss-matched schema versions woogerboy21 2015-08-18 07:40:12 -0400
• 8c0722953f Merge pull request #1386 from Fizztastic/fix_1383 Zach 2015-08-17 17:14:30 -0400
• f3c43cb50f Fix linked cardwidget not showing PT/Loyalty Jeff 2015-08-16 19:02:55 -0400
• d3d6f70496 Removed 2nd arg from ShortcutsSettings::getShortcut marco 2015-08-16 20:11:17 +0200
• 1ca89e0b09 Moved counters to a new tab marco 2015-08-16 15:38:23 +0200
• 487cbb23cb Merge pull request #1379 from woogerboy21/room_userlevel woogerboy21 2015-08-16 08:57:34 -0400
• 713a8148d3 Customizable shorcuts marco 2015-08-16 14:02:44 +0200
• be82472f35 Merge branch 'master' into Customizable-shortcuts marco 2015-08-16 13:52:34 +0200
• 4cb53ccaed Merge branch 'master' into Customizable-shortcuts marco 2015-08-16 13:52:34 +0200
• beaa4e9383 Configurable shortcuts marco 2015-08-09 20:48:21 +0200
• 702f949196 Updated response block to look better woogerboy21 2015-08-15 21:17:32 -0400
• 3e94c9d283 Define permission levels for rooms woogerboy21 2015-08-15 15:49:59 -0400
• 5634b564e8 Merge pull request #1378 from woogerboy21/last_login woogerboy21 2015-08-15 20:24:18 -0400
• 98fa9eb159 Merge pull request #1356 from Fizztastic/ChatRoomCompleter Zach 2015-08-15 20:08:34 -0400
• bb0b626cee Add last_login column to user table and populate upon login woogerboy21 2015-08-15 02:56:10 -0400
• 0f4dc18074 Merge pull request #1374 from woogerboy21/ban_by_clientid woogerboy21 2015-08-14 11:25:01 -0400
• 4b0ccc30ec Merge pull request #1376 from Fizztastic/customsets_option Zach 2015-08-14 11:04:06 -0400
• b102a05a36 Add ability to ban by client id woogerboy21 2015-08-12 21:55:40 -0400
• 386716b8db Add option to open customsets folder Jeff 2015-08-13 23:06:07 -0400
• 50d67467dc Username Completer in server room Jeff 2015-08-10 00:49:16 -0400
• 26e63a9a3a Merge pull request #1343 from tooomm/readme-toc-change Zach 2015-08-13 21:17:07 -0400
• d5c00b0cb5 remove arrows with link to top tooomm 2015-08-13 16:21:10 +0200
• 8bf58af727 Merge pull request #1365 from woogerboy21/add_clientid_tosessions woogerboy21 2015-08-12 08:07:01 -0400
• 9bf3178b2f Merge pull request #1307 from poixen/hostselection poixen 2015-08-12 12:59:23 +0200
• 54ff4ef417 Merge pull request #1369 from ZeldaZach/fix_1360 Zach 2015-08-11 17:41:13 -0400
• b57a316bfd remove max screen default Zach H 2015-08-11 17:10:05 -0400
• 1c3e13109f Merge pull request #1361 from woogerboy21/servatrice_disable_replaystorage Zach 2015-08-11 16:32:37 -0400
• 26b9560753 Merge pull request #1367 from woogerboy21/add_script_maintcountrycodes Zach 2015-08-11 16:05:56 -0400
• 7c81f8a610 Added lower case country code on correction. woogerboy21 2015-08-11 15:46:59 -0400
• bf230f2c86 Merge pull request #1366 from woogerboy21/add_script_maintcountrycodes Zach 2015-08-11 15:18:11 -0400
• f636c0ee19 Add script to validate/clear invalid country codes in the DB. woogerboy21 2015-08-11 14:20:40 -0400
• d52cf379ee Updated servatrice.sql to reflect new sessions table field. woogerboy21 2015-08-11 12:53:56 -0400
• eb5833609a Add clientid field to sessions table. woogerboy21 2015-08-11 12:45:04 -0400
• e9478ff99c Merge pull request #1362 from woogerboy21/rem_clientid_protoreq Zach 2015-08-10 17:36:31 -0400
• fa77cdf3b5 Removed clientid requirements from the protocol handler. woogerboy21 2015-08-10 16:07:20 -0400
• fefceac2c6 Add option to servatrice to disable replay storage. woogerboy21 2015-08-10 15:29:30 -0400
• ea9e966330 Merge pull request #1353 from Cockatrice/revert-1352-nonreg_nodbserver_fix Gavin Bisesi 2015-08-09 15:52:42 -0400
• 59568bf13c Revert "#1351 Fix" Gavin Bisesi 2015-08-09 15:52:32 -0400
• de1b925b7d Merge pull request #1352 from Cockatrice/nonreg_nodbserver_fix woogerboy21 2015-08-09 15:25:14 -0400
• 5fc0da6ab9 #1351 Fix woogerboy21 2015-08-09 15:07:30 -0400
• 90381aa38f Merge pull request #1350 from woogerboy21/showmoreinfo_logincontexterror woogerboy21 2015-08-09 14:02:34 -0400
• f4942d1ea7 Merge pull request #1346 from woogerboy21/regonly_server_refactor woogerboy21 2015-08-09 13:57:17 -0400
• ff41e69a30 Merge pull request #1349 from ctrlaltca/fix_server_msvc Zach 2015-08-09 13:49:53 -0400
• 3f78e0bec3 Update Error 11 Clarity woogerboy21 2015-08-09 12:56:09 -0400
• 76ba3b557d Fix compilation of servatrice with mdvc Fabio Bas 2015-08-09 18:17:10 +0200
• 1f22f1743c Merge pull request #1348 from woogerboy21/fix_clientid_dbmigration woogerboy21 2015-08-09 09:19:12 -0400
• b4e0c00cca Add database migration script for client id woogerboy21 2015-08-09 08:47:21 -0400
• b0bf94e378 Shorcut read from settings marco 2015-08-08 19:41:18 +0200
• 644ea0482f Merge pull request #1347 from woogerboy21/fix_clientid_localgame woogerboy21 2015-08-08 17:33:34 -0400
• afa2c67e87 Actually pass the generated client id. woogerboy21 2015-08-08 17:22:59 -0400
• 567c1a148d Fix local game due to clientid check in response container. woogerboy21 2015-08-08 17:08:43 -0400
• 17392f1ae5 Moved the RegOnlyRequirement functions out of the Database interface into the proper Server block of code. woogerboy21 2015-08-08 16:24:37 -0400
• 129a6983ed Merge pull request #1345 from Cockatrice/login-error-message woogerboy21 2015-08-08 11:12:50 -0400
• 481a57edf6 Show more informative error on registration failure Gavin Bisesi 2015-08-08 09:55:23 -0400
• bf7cf61b85 Add more informative message on unrecognized login response Gavin Bisesi 2015-08-08 09:48:18 -0400
• c64bc3fb81 Merge pull request #1344 from woogerboy21/clientid_commit_res woogerboy21 2015-08-08 09:23:21 -0400
• b53bd08175 Merge branch 'clientid_commit_res' of ssh://github.com/woogerboy21/Cockatrice into clientid_commit_res woogerboy21 2015-08-08 08:52:47 -0400
• af237c7d07 Fixed space/tabing issues. woogerboy21 2015-08-07 22:32:39 -0400
• bc99024e4f Added server side setting to allow the requirement of a client id from clients. woogerboy21 2015-08-07 15:52:55 -0400
• 94942e1a92 Commit to resolve requests made by @Daenyth discussed after the commit. See https://github.com/Cockatrice/Cockatrice/pull/1340 for details. woogerboy21 2015-08-07 13:21:31 -0400
• 62dc3a7ca3 Merge pull request #1342 from marcofernandezheras/CardInfoLayout woogerboy21 2015-08-08 08:28:12 -0400
• 2211a8de4a Fixed space/tabing issues. woogerboy21 2015-08-07 22:32:39 -0400
• e9e75961f4 Redesigning deck editor to work with docks marco 2015-08-05 00:03:57 +0200
• b62ffdeb0b Added server side setting to allow the requirement of a client id from clients. woogerboy21 2015-08-07 15:52:55 -0400
• 95cc10a278 Commit to resolve requests made by @Daenyth discussed after the commit. See https://github.com/Cockatrice/Cockatrice/pull/1340 for details. woogerboy21 2015-08-07 13:21:31 -0400
• 8ebd8532d6 readme adjustments tooomm 2015-08-06 23:21:51 +0200
• ba90d84a13 Merge pull request #1340 from woogerboy21/clientid woogerboy21 2015-08-06 14:17:06 -0400
• 5a541d6248 Merge pull request #1341 from tooomm/patch-2 poixen 2015-08-06 11:34:04 +0200
• 94d4ff8c1b removed space tooomm 2015-08-06 10:11:00 +0200
• 52db13a1ca Initial release of client ID generation. woogerboy21 2015-08-05 10:15:49 -0400
• 44d757f691 Merge pull request #1328 from marcofernandezheras/FixBug#1296 Zach 2015-08-03 22:47:32 -0400
• 0d10d6f85d Fixes issue #1296 marco 2015-08-04 00:17:44 +0200
• 13011180f7 Merge pull request #1313 from woogerboy21/update_pingtime woogerboy21 2015-08-03 12:31:20 -0400
• dfb7847dab Update README.md Zach 2015-08-01 21:45:14 -0400
• c28da9f066 Merge pull request #1321 from ZeldaZach/readme Zach 2015-08-01 21:35:41 -0400
• ee6020ab8c url fix Zach H 2015-08-01 21:35:21 -0400
• 4b5fb30248 Merge pull request #1318 from ctrlaltca/fix_linking_faq_url ctrlaltca 2015-08-01 11:18:16 +0200
• 622e018cd4 Merge pull request #1320 from ctrlaltca/translations ctrlaltca 2015-08-01 11:18:04 +0200
• 7e7c0ef4d2 Updated translations Fabio Bas 2015-08-01 10:55:06 +0200
• 6dfd2e65f6 Fix "Linking FAQ" url Fabio Bas 2015-08-01 08:07:47 +0200
• 8d2cd29a3f Merge pull request #1308 from ZeldaZach/fix_1301 ctrlaltca 2015-08-01 07:59:58 +0200
• da48b71442 Merge pull request #1310 from ctrlaltca/emails Zach 2015-07-31 10:57:52 -0400
• eb9ca58fd0 Updated pingClockTimeout to account for adjustments in client keep alive settings value. Changed the default value for the client keep alive variable back to 1 (since that is what the setting is if the value is not found in the configuration ini file). woogerboy21 2015-07-30 16:38:02 -0400
• 8c7301b19f Updated server and client ping to 5 seconds. Also changed hard set 1 second value on the ping timers to read values from the settings cache. woogerboy21 2015-07-29 23:44:00 -0400
• 8d325b9e19 Servatrice: do not disclose user emails to clients Fabio Bas 2015-07-28 22:20:40 +0200
• 1ca24b2597 Previous server connection history Matt Lowe 2015-07-28 00:33:37 +0200
• 8a86165890 allow URL redirects Zach H 2015-07-28 02:41:08 -0400
• 183fbd2805 Merge pull request #1305 from poixen/appname Zach 2015-07-27 19:51:24 -0400
• 46f28f92b6 Changed app title when logged in Matt Lowe 2015-07-27 16:19:19 +0200
• c0bb640a37 Merge pull request #1295 from ctrlaltca/servatrice_email_v2 Zach 2015-07-26 21:13:58 -0700
• 9aa161575d Merge pull request #1303 from ZeldaZach/fix_1069 Zach 2015-07-26 21:12:50 -0700
• 475c54bfe1 fix 1032 merge conflicts Zach H 2015-07-26 23:41:19 -0400
• e318b70329 Merge pull request #1286 from ctrlaltca/disabled_sets Zach 2015-07-26 12:10:00 -0700
• bd92f18e9d Merge pull request #1293 from ctrlaltca/fix_1289 Zach 2015-07-26 12:05:52 -0700
• a001238b74 Force cache clear on sets database save. Fabio Bas 2015-07-26 11:46:09 +0200