Commit graph

2723 commits

Author SHA1 Message Date
Gavin Bises
a4be8e88d0 Set expose/cmd for Dockerfile 2015-07-03 00:54:32 -04:00
Gavin Bisesi
dfd5c5e050 Merge pull request #1191 from Cockatrice/docker
Dockerfile for servatrice
2015-07-03 00:02:18 -04:00
Gavin Bises
7ac3201811 Dockerfile for servatrice
Compile & install servatrice

Unhandled currently:
servatrice.ini modification
mysql setup/config/connection
2015-07-02 23:58:25 -04:00
Zach
14e8fcdd44 Merge pull request #1190 from ctrlaltca/fix_1188
oracle: fix broken import of sets; fix #1188
2015-07-02 17:53:36 -04:00
Fabio Bas
5e1566046e removed debug 2015-07-02 15:31:14 +02:00
Fabio Bas
5f28dff30e Fix #1188 2015-07-02 09:22:05 +02:00
Zach
8407d7cc36 Merge pull request #1178 from Cockatrice/woogerboy21-servtriceini_activation_misspelling
Activation Email Misspelling
2015-06-29 17:32:47 -04:00
woogerboy21
304835c526 Activation Email Misspelling
Corrected the misspelling of the word "activating' in the servatrice.ini example file.
2015-06-29 17:05:48 -04:00
Zach
6fd1e839df Merge pull request #1168 from ctrlaltca/oracle_hidpi
Enable HiDpi on oracle too
2015-06-28 09:41:38 -04:00
ctrlaltca
9947af7be9 Merge pull request #1172 from ctrlaltca/translations
Updated translations
2015-06-28 15:18:15 +02:00
Fabio Bas
56db6cd060 Updated translations 2015-06-28 15:17:46 +02:00
ctrlaltca
4f972848a5 Merge pull request #1162 from ctrlaltca/oracle_fixes
Oracle fixes
2015-06-28 15:00:37 +02:00
Zach
36d0a13fc9 Merge pull request #1153 from ctrlaltca/issue_1144
Fix windows size growing out of screen; fix #1144
2015-06-27 21:20:57 -04:00
Zach
d2b71a15fa Merge pull request #1166 from ctrlaltca/fix_232
Support <tablerow> for tokens; fix #232
2015-06-27 20:49:14 -04:00
ctrlaltca
08d7f8e950 Merge pull request #1169 from ctrlaltca/nsis_fix
NSIS: Add components sections on uninstall.
2015-06-27 00:14:39 +02:00
Fabio Bas
74fef04a57 NSIS: Add components sections on uninstall. 2015-06-25 17:43:33 +02:00
Fabio Bas
a8de6d5c67 Enable HiDpi on oracle too 2015-06-25 16:02:26 +02:00
Fabio Bas
f84d6fec1b Never send wrong row numbers 2015-06-25 15:39:03 +02:00
ctrlaltca
816c01e6dd Merge pull request #1159 from poixen/server_usernames
Moved username formatting to INI file
2015-06-24 13:28:07 +02:00
ctrlaltca
a311678153 Merge pull request #1167 from ctrlaltca/translations
Updated translations
2015-06-24 13:26:57 +02:00
Fabio Bas
fa6e9c7344 updated translations 2015-06-24 13:26:02 +02:00
Matt Lowe
23b163341e Escaped additional punctuation 2015-06-24 13:08:38 +02:00
Fabio Bas
d0c0531bfc extracted new translatable strings 2015-06-24 13:01:23 +02:00
ctrlaltca
78a53f0691 Merge pull request #1151 from ZeldaZach/fix_1050
Fix False Notifications
2015-06-24 12:55:13 +02:00
Fabio Bas
ed24b38add support <tablerow> for tokens; fix #232 2015-06-24 10:31:00 +02:00
ctrlaltca
9f24728301 Merge pull request #1160 from ctrlaltca/image_blacklist
Small improvements to card image downloading
2015-06-24 09:57:30 +02:00
Fabio Bas
aed20324da reverted #163 2015-06-23 21:45:08 +02:00
Fabio Bas
f95fe57c1b Import split cards of any size; fix #181 2015-06-23 21:42:25 +02:00
Fabio Bas
6afc6cc4fd Cleaned and commented code 2015-06-23 19:36:40 +02:00
Fabio Bas
a1d28736d7 Oracle remove old code handling split cards; fix #382 2015-06-23 19:23:07 +02:00
Fabio Bas
872177a5ed Card images blacklist; changed fallback urls 2015-06-23 15:44:43 +02:00
Zach H
27fa6eb642 Fix False Notifications 2015-06-22 22:43:59 -04:00
Matt Lowe
d76073cdd1 Added default values 2015-06-22 22:02:36 +02:00
Fabio Bas
ec45a099e1 Made items not collapsible; changed players widget's min height from 60 to 40 px 2015-06-22 18:24:05 +02:00
ctrlaltca
0c24f48aa2 Merge pull request #1145 from ZeldaZach/fix_182
Fix Moved From Error
2015-06-22 17:29:15 +02:00
ctrlaltca
2415ba2605 Merge pull request #1134 from ctrlaltca/related_cards
Related cards
2015-06-22 17:22:47 +02:00
poixen
d7c81a07c6 Merge pull request #1155 from poixen/solid_counters
Solid counters
2015-06-21 08:39:38 +02:00
poixen
325c96dcd6 Merge pull request #1156 from poixen/table_ratio
Reduced min table width
2015-06-21 08:38:07 +02:00
Matt Lowe
a795d7d884 Moved username formatting to INI file
Rather than having the username limitations hard coded, I have moved it
into the ini file. I have added some examples to the code and also to
the ini.

This is only and example and can be expanded on by others.
2015-06-20 23:14:45 +02:00
Matt Lowe
4cc959396f Reduced min table width
The initial table width is too high. The table starts to scale down far
too soon, meaning you have to play in a letterbox ratio.
2015-06-19 23:40:55 +02:00
Matt Lowe
5c526f6c07 Solid counters
Removed gradient to give counters a more solid look
2015-06-19 23:26:36 +02:00
ctrlaltca
e581ef77e5 Merge pull request #1150 from ctrlaltca/deckeditor_fix2
Fix deckeditor jitter problem; fix #1143
2015-06-19 14:57:44 +02:00
Fabio Bas
c400d6d4ec use the new card frame in game; mitigates #1144 2015-06-19 14:57:20 +02:00
Fabio Bas
1ae79fbcaa Removed double margin around chatbox in game 2015-06-19 14:42:13 +02:00
Fabio Bas
1251338619 enforce max size for user avatar on userinfobox; refs #1144 2015-06-19 14:33:23 +02:00
Fabio Bas
d6ce1852a1 Fix deckeditor jitter problem; fix #1143 2015-06-18 23:13:12 +02:00
Zach H
045da30546 fix wording 2015-06-18 00:16:09 -04:00
Zach
853342463a Merge pull request #1138 from ZeldaZach/chatview_www
Fix WWW link error
2015-06-16 20:57:46 -04:00
ctrlaltca
8cf0c3beed Merge pull request #1141 from ZeldaZach/hq_options2
Allow Custom Download URL
2015-06-16 09:02:20 +02:00
Zach H
89f1298a48 change wording 2015-06-15 16:47:02 -04:00