Commit graph

2935 commits

Author SHA1 Message Date
woogerboy21
3e94c9d283 Define permission levels for rooms 2015-08-15 21:00:51 -04:00
woogerboy21
5634b564e8 Merge pull request #1378 from woogerboy21/last_login
Add last_login column to user table and populate upon login
2015-08-15 20:24:18 -04:00
Zach
98fa9eb159 Merge pull request #1356 from Fizztastic/ChatRoomCompleter
Username Completer in server room
2015-08-15 20:08:34 -04:00
woogerboy21
bb0b626cee Add last_login column to user table and populate upon login 2015-08-15 03:00:34 -04:00
woogerboy21
0f4dc18074 Merge pull request #1374 from woogerboy21/ban_by_clientid
Ban by client ID
2015-08-14 11:25:01 -04:00
Zach
4b0ccc30ec Merge pull request #1376 from Fizztastic/customsets_option 2015-08-14 11:04:06 -04:00
woogerboy21
b102a05a36 Add ability to ban by client id 2015-08-14 00:06:37 -04:00
Jeff
386716b8db Add option to open customsets folder 2015-08-13 23:52:38 -04:00
Jeff
50d67467dc Username Completer in server room
Adds QCompleter in server room and a setting to enable/disable it.
2015-08-13 23:51:39 -04:00
Zach
26e63a9a3a Merge pull request #1343 from tooomm/readme-toc-change
readme adjustments
2015-08-13 21:17:07 -04:00
tooomm
d5c00b0cb5 remove arrows with link to top 2015-08-13 16:21:10 +02:00
woogerboy21
8bf58af727 Merge pull request #1365 from woogerboy21/add_clientid_tosessions
Add clientid field to sessions table.
2015-08-12 08:07:01 -04:00
poixen
9bf3178b2f Merge pull request #1307 from poixen/hostselection
Previous server connection history
2015-08-12 12:59:23 +02:00
Zach
54ff4ef417 Merge pull request #1369 from ZeldaZach/fix_1360
remove max screen default
2015-08-11 17:41:13 -04:00
Zach H
b57a316bfd remove max screen default 2015-08-11 17:10:05 -04:00
Zach
1c3e13109f Merge pull request #1361 from woogerboy21/servatrice_disable_replaystorage
Add option to servatrice to disable replay storage.
2015-08-11 16:32:37 -04:00
Zach
26b9560753 Merge pull request #1367 from woogerboy21/add_script_maintcountrycodes
Added lower case country code on correction.
2015-08-11 16:05:56 -04:00
woogerboy21
7c81f8a610 Added lower case country code on correction. 2015-08-11 15:46:59 -04:00
Zach
bf230f2c86 Merge pull request #1366 from woogerboy21/add_script_maintcountrycodes
Add script to validate/clear invalid country codes in the DB.
2015-08-11 15:18:11 -04:00
woogerboy21
f636c0ee19 Add script to validate/clear invalid country codes in the DB. 2015-08-11 14:20:40 -04:00
woogerboy21
d52cf379ee Updated servatrice.sql to reflect new sessions table field. 2015-08-11 12:53:56 -04:00
woogerboy21
eb5833609a Add clientid field to sessions table. 2015-08-11 12:45:04 -04:00
Zach
e9478ff99c Merge pull request #1362 from woogerboy21/rem_clientid_protoreq
Removed clientid requirements from the protocol handler.
2015-08-10 17:36:31 -04:00
woogerboy21
fa77cdf3b5 Removed clientid requirements from the protocol handler. 2015-08-10 16:07:20 -04:00
woogerboy21
fefceac2c6 Add option to servatrice to disable replay storage. 2015-08-10 15:29:30 -04:00
Gavin Bisesi
ea9e966330 Merge pull request #1353 from Cockatrice/revert-1352-nonreg_nodbserver_fix
Revert "#1351 Fix"
2015-08-09 15:52:42 -04:00
Gavin Bisesi
59568bf13c Revert "#1351 Fix" 2015-08-09 15:52:32 -04:00
woogerboy21
de1b925b7d Merge pull request #1352 from Cockatrice/nonreg_nodbserver_fix
#1351 Fix
2015-08-09 15:25:14 -04:00
woogerboy21
5fc0da6ab9 #1351 Fix
This update address's the issue were a server with no db has only non-registered users but when creating a game will cause the dialogue to only allow the check box of "registered users only" resulting in a game that no user will ever be able to join.
2015-08-09 15:07:30 -04:00
woogerboy21
90381aa38f Merge pull request #1350 from woogerboy21/showmoreinfo_logincontexterror
Update Error 11 Clarity
2015-08-09 14:02:34 -04:00
woogerboy21
f4942d1ea7 Merge pull request #1346 from woogerboy21/regonly_server_refactor
Reg only server cleanup
2015-08-09 13:57:17 -04:00
Zach
ff41e69a30 Merge pull request #1349 from ctrlaltca/fix_server_msvc 2015-08-09 13:49:53 -04:00
woogerboy21
3f78e0bec3 Update Error 11 Clarity 2015-08-09 12:56:09 -04:00
Fabio Bas
76ba3b557d Fix compilation of servatrice with mdvc
Should fix #1336
2015-08-09 18:17:10 +02:00
woogerboy21
1f22f1743c Merge pull request #1348 from woogerboy21/fix_clientid_dbmigration
Add database migration script for client id
2015-08-09 09:19:12 -04:00
woogerboy21
b4e0c00cca Add database migration script for client id 2015-08-09 08:47:21 -04:00
woogerboy21
644ea0482f Merge pull request #1347 from woogerboy21/fix_clientid_localgame
Fix local game not starting properly.
2015-08-08 17:33:34 -04:00
woogerboy21
afa2c67e87 Actually pass the generated client id. 2015-08-08 17:22:59 -04:00
woogerboy21
567c1a148d Fix local game due to clientid check in response container. 2015-08-08 17:08:43 -04:00
woogerboy21
17392f1ae5 Moved the RegOnlyRequirement functions out of the Database interface into the proper Server block of code. 2015-08-08 16:24:37 -04:00
woogerboy21
129a6983ed Merge pull request #1345 from Cockatrice/login-error-message
Add more informative message on unrecognized login response
2015-08-08 11:12:50 -04:00
Gavin Bisesi
481a57edf6 Show more informative error on registration failure 2015-08-08 09:55:23 -04:00
Gavin Bisesi
bf7cf61b85 Add more informative message on unrecognized login response
When logging in and receiving a reply that isn't understood, show a more informative error message.

`tr() + tr()` for better translation flexibility.
2015-08-08 09:48:18 -04:00
woogerboy21
c64bc3fb81 Merge pull request #1344 from woogerboy21/clientid_commit_res
Commit to resolve requests made by @Daenyth discussed after the commit.
2015-08-08 09:23:21 -04:00
woogerboy21
b53bd08175 Merge branch 'clientid_commit_res' of ssh://github.com/woogerboy21/Cockatrice into clientid_commit_res 2015-08-08 08:52:47 -04:00
woogerboy21
af237c7d07 Fixed space/tabing issues. 2015-08-08 08:52:19 -04:00
woogerboy21
bc99024e4f Added server side setting to allow the requirement of a client id from clients. 2015-08-08 08:52:19 -04:00
woogerboy21
94942e1a92 Commit to resolve requests made by @Daenyth discussed after the commit.
See https://github.com/Cockatrice/Cockatrice/pull/1340 for details.
2015-08-08 08:52:19 -04:00
woogerboy21
62dc3a7ca3 Merge pull request #1342 from marcofernandezheras/CardInfoLayout
Deck Editor layout
2015-08-08 08:28:12 -04:00
woogerboy21
2211a8de4a Fixed space/tabing issues. 2015-08-07 22:32:39 -04:00