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
Gavin Bisesi
3c1a7bc760
Restore xsd files removed in #1428
...
ಠ_ಠ
2015-08-28 18:24:25 -04:00
Zach
6a64e4a2e1
Merge pull request #1432 from ZeldaZach/fix_1427
...
Remove docs in favor of wiki
2015-08-28 15:39:00 -04:00
Zach H
854e0a764c
remove docs in favor of wiki
2015-08-28 14:59:49 -04:00
Zach
e6a8fa59e3
Merge pull request #1428 from tooomm/patch-1
...
text adjustments in oracle
2015-08-27 12:39:00 -04:00
ctrlaltca
885edc8953
Merge pull request #1429 from ctrlaltca/translations
...
Fetched new translations. Arrr!
2015-08-27 18:32:54 +02:00
Fabio Bas
fcff6301ed
Fetched new translations. Arrr!
2015-08-27 18:32:14 +02:00
tooomm
5d8d2f277c
oxford compliance
...
@ZeldaZach grammar nazi :) 👍
2015-08-27 15:55:22 +02:00
tooomm
17665aad60
fixed alignment
...
nice alignment over strict tabbing
2015-08-27 14:55:19 +02:00
tooomm
f18f136d2b
text adjustments
...
- removed some info text since oracle imports all cards now and no longer offers sets selection
- added info about token
- `<br/>` --> `\n`
- capitalized `URL` --> http://www.oxforddictionaries.com/definition/english/URL
2015-08-27 14:43:34 +02:00
Zach
311536d1aa
Merge pull request #1423 from tooomm/patch-1
2015-08-26 10:26:57 -04:00
tooomm
83e9f9deba
typos resolved
...
@marcofernandezheras ok?
2015-08-26 15:33:05 +02:00
woogerboy21
fdea69cfed
Merge pull request #1421 from woogerboy21/fix_proto_warnings
...
Corrected proto warnings & spacing
2015-08-26 08:22:50 -04:00
woogerboy21
cfebd53d5d
Corrected proto warnings
2015-08-25 23:40:08 -04:00
woogerboy21
7453385903
Merge pull request #1417 from woogerboy21/send_clientver
...
Extend the login protocol to send the client version (as optional)
2015-08-24 11:54:04 -04:00
woogerboy21
364df4daf0
Extend the login protocol to send the client id (as optional)
2015-08-24 11:38:24 -04:00
Zach
324ddda4dd
Merge pull request #1416 from ZeldaZach/fix_1411
...
Define URLs
2015-08-23 23:00:22 -04:00
Zach
14da4efe6d
Merge pull request #1414 from ZeldaZach/fix_1412
...
Prevent bad flags
2015-08-23 17:59:52 -04:00
Zach H
a8727d5a50
define URLs
2015-08-23 17:57:26 -04:00
Zach
4d2fdaec08
Merge pull request #1407 from Fizztastic/fix_1396
...
Option to opt-out of remember game settings
2015-08-23 16:28:01 -04:00
Zach H
8ffe310855
prevent bad flags
2015-08-23 16:27:18 -04:00
ctrlaltca
ab33258ce9
Merge pull request #1415 from ctrlaltca/translations
...
Translations: extracted new strings
2015-08-23 20:54:50 +02:00
Fabio Bas
b335bc5e7d
Translations: extracted new strings
2015-08-23 20:54:11 +02:00
Jeff
ca82fd867a
Option to opt-out of remember game settings
2015-08-22 15:52:03 -04:00
Zach
432c856f0d
Merge pull request #1400 from woogerboy21/logout_old_session
...
Log old session out of server if logging in from a second location
2015-08-22 15:37:50 -04:00
woogerboy21
b0630b81ca
Log old session out of server if logging in from a second location
2015-08-22 13:41:02 -04:00
Gavin Bisesi
0c0413f056
Merge pull request #1404 from Cockatrice/docker-tweak
...
Use servatrice as docker entrypoint
2015-08-22 09:57:10 -04:00
Gavin Bisesi
34c78b3113
Use servatrice as docker entrypoint
...
This lets you "docker run servatrice" and pass command line arguments
2015-08-22 08:43:44 -04:00
ctrlaltca
18ec8e20b6
Merge pull request #1381 from ZeldaZach/flags_to_lower
...
Country to lower (fix win bug)
2015-08-22 11:53:22 +02:00
Zach
e9156ecd62
Merge pull request #1391 from woogerboy21/admin_adjustmods
...
Allows admins to promote users to mod and demote mod to user
2015-08-22 00:03:46 -04:00
woogerboy21
2a0197a7ab
Merge pull request #2 from Cockatrice/admin_adjustmods
...
Address PR feedback
2015-08-21 23:08:29 -04:00
Gavin Bisesi
66f14c1168
Address PR feedback
2015-08-21 23:03:15 -04:00
Zach
a6a62b3334
Merge pull request #1354 from Cockatrice/fix-1351
...
Fix #1351 - Server ignores only-reg if in "none" auth mode.
2015-08-21 22:15:32 -04:00
Daenyth
6170c9037f
Fix #1351 - Server ignores only-reg if in "none" auth mode.
...
When in none auth mode, registered users don't exist; hence the setting
makes the game impossible to join.
Normally the setting would be greyed out when the user is unregistered,
but commit 475c54bf
2015-08-21 20:30:46 -04:00
Zach H
41b10308ba
country to lower (fix win bug)
2015-08-21 20:05:49 -04:00
Zach
9c28cdd1f5
Merge pull request #1394 from Fizztastic/fix_1387
...
Add LineEditCompleter to Tab_Game
2015-08-20 23:46:19 -04:00
Jeff
50e0b6dd35
Merge lines
2015-08-20 23:33:06 -04:00
Jeff
97d0cfa3d9
Fix first word completion
2015-08-20 23:01:32 -04:00
woogerboy21
39fcabe921
Allows moderators to promote users to mod and demote mod to user
2015-08-20 22:42:10 -04:00
Jeff
05f2bc8392
Fix Conflicts
2015-08-20 22:27:46 -04:00
Jeff
e9bad2cacb
Merge branch 'master' into fix_1387
...
Conflicts:
cockatrice/CMakeLists.txt
cockatrice/src/tab_game.h
cockatrice/src/tab_room.cpp
2015-08-20 22:23:47 -04:00
Jeff
b3d96cc5da
Merge remote-tracking branch 'Cockatrice/master' into fix_1387
2015-08-20 22:17:06 -04:00
Zach
b2ab2c6eba
Merge pull request #1382 from marcofernandezheras/Customizable-shortcuts
...
Customizable shortcuts
2015-08-20 21:44:05 -04:00
marco
c6aba5a6d0
Renamed file + reduced window size + resfresh on change
2015-08-20 20:23:08 +02:00
Jeff
a64ea17357
Add LineEditCompleter to Tab_Game
2015-08-19 18:46:08 -04:00
woogerboy21
1ef9041815
Merge pull request #1389 from Cockatrice/schema_level_correction
...
Corrected miss-matched schema versions
2015-08-18 08:04:29 -04:00
woogerboy21
65635bcdd8
Corrected miss-matched schema versions
...
Schema version should be 7 (not 6) for current commit level. Not sure exactly why it wasn't updated.
2015-08-18 07:40:12 -04:00
