 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 |
|
|
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 |
|
|
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 |
|
|
Zach
|
ff41e69a30
|
Merge pull request #1349 from ctrlaltca/fix_server_msvc
|
2015-08-09 13:49:53 -04:00 |
|
|
Zach
|
44d757f691
|
Merge pull request #1328 from marcofernandezheras/FixBug#1296
Ctrl + Double Click: Add card to SB
|
2015-08-03 22:47:32 -04:00 |
|
|
Zach
|
dfb7847dab
|
Update README.md
|
2015-08-01 21:45:14 -04:00 |
|
|
Zach
|
c28da9f066
|
Merge pull request #1321 from ZeldaZach/readme
README fix
|
2015-08-01 21:35:41 -04:00 |
|
|
Zach H
|
ee6020ab8c
|
url fix
|
2015-08-01 21:35:21 -04:00 |
|
|
Zach
|
da48b71442
|
Merge pull request #1310 from ctrlaltca/emails
Servatrice: do not disclose user emails to clients
|
2015-07-31 10:57:52 -04:00 |
|
|
Zach H
|
8a86165890
|
allow URL redirects
|
2015-07-28 02:41:08 -04:00 |
|
|
Zach
|
183fbd2805
|
Merge pull request #1305 from poixen/appname
Changed app title when logged in
|
2015-07-27 19:51:24 -04:00 |
|
|
Zach
|
c0bb640a37
|
Merge pull request #1295 from ctrlaltca/servatrice_email_v2
Refactor servatrice email send
|
2015-07-26 21:13:58 -07:00 |
|
|
Zach
|
9aa161575d
|
Merge pull request #1303 from ZeldaZach/fix_1069
fix 1032 merge conflicts
|
2015-07-26 21:12:50 -07:00 |
|
|
Zach H
|
475c54bfe1
|
fix 1032 merge conflicts
|
2015-07-27 00:01:05 -04:00 |
|
|
Zach
|
e318b70329
|
Merge pull request #1286 from ctrlaltca/disabled_sets
Prefer enabled sets when loading images
|
2015-07-26 12:10:00 -07:00 |
|
|
Zach
|
bd92f18e9d
|
Merge pull request #1293 from ctrlaltca/fix_1289
Force black text color on deck list
|
2015-07-26 12:05:52 -07:00 |
|
|
Zach
|
ac4c745521
|
Merge pull request #1294 from mildmongrel/tablezone_refactor_001
tablezone refactor and cleanup
|
2015-07-25 22:45:06 -07:00 |
|
|
Zach
|
387137fbc7
|
Merge pull request #1292 from ctrlaltca/fix_compile_debug
fix compilation with gcc in paranoic mode
|
2015-07-25 22:37:18 -07:00 |
|
|
Zach
|
f3ee1eac12
|
Merge pull request #1287 from ctrlaltca/servatrice_db_version
Fix misleading error message in servatrice; fix #1275
|
2015-07-25 22:36:01 -07:00 |
|
|
Zach
|
f1b7a422ee
|
Merge pull request #1284 from ctrlaltca/fix_1283
Fix calculation of ban expiration
|
2015-07-25 22:19:58 -07:00 |
|
|
Zach
|
c675cf4010
|
Merge pull request #1272 from Fizztastic/fix_577
Joining a full game joins you as spectator
|
2015-07-25 22:16:00 -07:00 |
|
|
Zach
|
e0b71d3b05
|
Merge pull request #1257 from ctrlaltca/messageparser
Chatview: split message parser and add "highlight words"
|
2015-07-15 20:00:08 -04:00 |
|
|
Zach
|
1d425f5b66
|
Merge pull request #1261 from ZeldaZach/fix_982
Confirmation dialog on close
|
2015-07-15 18:57:03 -04:00 |
|
|
Zach H
|
ebd516fbf3
|
confirmation dialog on close
|
2015-07-15 18:34:21 -04:00 |
|
|
Zach
|
da3ade3205
|
Merge pull request #1264 from ZeldaZach/color_popup
Add colors to popup
|
2015-07-15 16:55:17 -04:00 |
|
|
Zach H
|
d956a1d309
|
add colors to popup
|
2015-07-15 16:38:29 -04:00 |
|
|
Zach
|
97acbbfd41
|
Merge pull request #1262 from ctrlaltca/servatrice_mail
Merge memory leak fix for smtp client
|
2015-07-15 12:24:23 -04:00 |
|
|
Zach H
|
c29bf1ae17
|
require pass & email confirmation
|
2015-07-14 14:12:49 -04:00 |
|
|
Zach
|
7ebf817b17
|
Merge pull request #1197 from Cockatrice/cpp11
|
2015-07-13 13:23:18 -04:00 |
|
|
Zach
|
acaeadfcb3
|
Merge pull request #1241 from ZeldaZach/fix_719
|
2015-07-13 12:52:18 -04:00 |
|
|
Zach H
|
29aecc4eb8
|
Green kick msg
|
2015-07-13 03:05:03 -04:00 |
|
|
Zach H
|
97f298452e
|
first fixes
|
2015-07-12 11:00:11 -04:00 |
|
|
Zach H
|
dc05a14f4c
|
Highlight Custom Words
|
2015-07-11 22:46:00 -04:00 |
|
|
Zach
|
9edacd7b3e
|
Merge pull request #1236 from Fizztastic/fix_574
Double Click to open replays
|
2015-07-09 23:36:33 -04:00 |
|
|
Zach
|
f437dabfbb
|
Merge pull request #1227 from ctrlaltca/oracle_tokens
Oracle: download tokens
|
2015-07-09 23:34:37 -04:00 |
|
|
Zach
|
f733daf18a
|
Merge pull request #1179 from mildmongrel/feature-player-rotation
Added ability to rotate player positions in the local game view.
|
2015-07-08 18:23:10 -04:00 |
|
|
Zach
|
091ca9fc12
|
Merge pull request #1230 from ZeldaZach/fix_97
add shortcut for filter delete
|
2015-07-08 18:11:08 -04:00 |
|
|
Zach
|
2837a4c010
|
Merge pull request #1232 from ZeldaZach/fix_242
show colors of cards
|
2015-07-08 18:10:23 -04:00 |
|
|
Zach
|
2bd0133055
|
Merge pull request #1233 from Fizztastic/fix_340
Play cards only with double left click
|
2015-07-08 18:09:31 -04:00 |
|
|
Zach H
|
afa8b53870
|
show colors of cards
|
2015-07-07 23:50:37 -04:00 |
|
|
Zach H
|
ce42d56a2d
|
add shortcut for filter delete
|
2015-07-07 22:42:05 -04:00 |
|
|
Zach
|
f199e20740
|
Merge pull request #1216 from ZeldaZach/fix_morphs
Fix Morphs from Sharing Information
|
2015-07-07 22:00:32 -04:00 |
|
|
Zach
|
955cc3920f
|
Merge pull request #1189 from mildmongrel/fix_col_layout
Fixed horizontal positioning in multicolumn layout.
|
2015-07-07 21:40:17 -04:00 |
|
|
Zach
|
f0efab5142
|
Merge pull request #1226 from ctrlaltca/fix_241
Add an option to annotate tokens from card text (default off)
|
2015-07-07 21:12:59 -04:00 |
|
|
Zach
|
9b87f9e7e7
|
Merge pull request #1225 from ctrlaltca/fix_247
Order cards by name in deck-load screen
|
2015-07-07 20:42:44 -04:00 |
|
|
Zach
|
db604bce03
|
Merge pull request #1219 from poixen/pic_fix
|
2015-07-07 13:41:06 -04:00 |
|
|
Zach
|
685aa99ad6
|
Merge pull request #1224 from ctrlaltca/profile_edit
Integrate #1210 changing "Gender" to "Pronouns"
|
2015-07-07 10:47:37 -04:00 |
|
|
Zach
|
1c69288f0e
|
Merge pull request #1222 from Fizztastic/fix_740
Added 2 shortcuts to game deck screen
|
2015-07-07 02:43:04 -04:00 |
|
|
Zach
|
6bf421cc31
|
Merge pull request #1210 from ctrlaltca/profile_edit
Profile management
|
2015-07-07 02:01:27 -04:00 |
|
|
Zach
|
2b484aa9ee
|
Merge pull request #1221 from Fizztastic/fix_818
Load .cod files from clipboard in deck editor
|
2015-07-07 00:36:49 -04:00 |
|
|
Zach
|
e76c109f2d
|
Merge pull request #1217 from ZeldaZach/fix_cheat
Prevent Hash Collision
|
2015-07-06 23:49:48 -04:00 |
|
|
Zach
|
29b83c3700
|
Merge pull request #1215 from ZeldaZach/fix_1208
Mod Global Messaging
|
2015-07-06 23:48:46 -04:00 |
|
|
Zach
|
4cf92de44d
|
Merge pull request #1220 from Fizztastic/fix_1011
Add Move to Hand in card menu
|
2015-07-06 22:42:01 -04:00 |
|
|
Zach H
|
339db24b56
|
efficency loop
|
2015-07-06 17:52:20 -04:00 |
|
|
Zach H
|
ae4436ade7
|
mod global msg overrides settings
|
2015-07-06 12:45:08 -04:00 |
|
|
Zach H
|
9e2da24629
|
use QSet for zones
|
2015-07-06 11:02:43 -04:00 |
|
|
Zach
|
bfa002e50a
|
Merge pull request #1213 from ZeldaZach/fix_1057
Link FAQ pages
|
2015-07-06 09:00:55 -04:00 |
|
|
Zach H
|
8e4f0c50af
|
remove breaks
|
2015-07-06 01:31:24 -04:00 |
|
|
Zach H
|
ef268d79c3
|
prevent cheating with hashes
|
2015-07-06 00:30:17 -04:00 |
|
|
Zach H
|
cf09aeccfd
|
local user sees orange too
|
2015-07-05 23:21:46 -04:00 |
|
|
Zach H
|
8221d37bbe
|
don't share PT
|
2015-07-05 23:11:26 -04:00 |
|
|
Zach H
|
1bda6e53b2
|
allow mod global msg
|
2015-07-05 22:06:35 -04:00 |
|
|
Zach H
|
e20c06b639
|
troubleshooting&faq
|
2015-07-05 20:11:42 -04:00 |
|
|
Zach
|
31890450dc
|
Merge pull request #1205 from ZeldaZach/fix_1173
Server Name Rules Information
|
2015-07-04 19:37:50 -04:00 |
|
|
Zach H
|
1f9b3ed28f
|
minor fix
|
2015-07-04 18:52:50 -04:00 |
|
|
Zach
|
c148994ac7
|
Merge pull request #1206 from ZeldaZach/fix_at_space
Fix Crash on Mention Bug
|
2015-07-04 18:38:24 -04:00 |
|
|
Zach H
|
24e54fd291
|
fix crash on mention
|
2015-07-04 18:26:54 -04:00 |
|
|
Zach H
|
1d210e57bd
|
show all rules
|
2015-07-03 23:54:14 -04:00 |
|
|
Zach
|
360498c83f
|
Merge pull request #1194 from ZeldaZach/fix_1192
Fix local mention crash
|
2015-07-03 18:41:48 -04:00 |
|
|
Zach H
|
cc3e4edfd9
|
rename function
|
2015-07-03 00:37:30 -04:00 |
|
|
Zach H
|
e2be1cd897
|
fix local mention crash
|
2015-07-03 00:30:59 -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 |
|
|
Zach
|
8407d7cc36
|
Merge pull request #1178 from Cockatrice/woogerboy21-servtriceini_activation_misspelling
Activation Email Misspelling
|
2015-06-29 17:32:47 -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 |
|
|
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 |
|
|
Zach H
|
27fa6eb642
|
Fix False Notifications
|
2015-06-22 22:43:59 -04: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 |
|
|
Zach H
|
89f1298a48
|
change wording
|
2015-06-15 16:47:02 -04:00 |
|
|
Zach H
|
45c2e6f646
|
Allow Custom HQ URL
|
2015-06-15 01:03:41 -04:00 |
|
|
Zach
|
4c8e83f789
|
Merge pull request #1140 from ZeldaZach/prevent_clear
Remove Autoclear Issue
|
2015-06-14 21:22:20 -04:00 |
|
|
Zach H
|
be4a581f7c
|
remove autoclear
|
2015-06-14 20:53:20 -04:00 |
|
|
Zach H
|
5d5eb05857
|
fix www error
|
2015-06-14 20:35:17 -04:00 |
|
|
Zach
|
50b908c7c4
|
Merge pull request #1124 from ctrlaltca/migrations
|
2015-06-05 12:12:03 -04:00 |
|
|
Zach
|
1a52415b4e
|
QT5 updated to 5.4.2
|
2015-06-04 17:04:52 -04:00 |
|
|
Zach
|
dd16ea78ac
|
Merge pull request #1115 from poixen/text_highlight
Highlight text after adding card
|
2015-05-30 18:51:25 -04:00 |
|
|
Zach
|
544666a3bc
|
Merge pull request #1096 from ctrlaltca/update_spaces
Fix card update under windows
|
2015-05-21 16:07:37 -04:00 |
|
|
Zach
|
5975184d67
|
Merge pull request #1091 from ZeldaZach/oracle_hideaway
|
2015-05-21 14:06:20 -04:00 |
|
|
Zach
|
d71c0b277f
|
Merge pull request #1090 from tooomm/patch-1
expanded wording of name conflicts for tokens /2
|
2015-05-21 09:47:00 -04:00 |
|
|
Zach H
|
56c1a7f8b4
|
hideaway update
|
2015-05-21 09:45:16 -04:00 |
|
|
Zach
|
292d730ca7
|
Merge pull request #1067 from tooomm/patch-1
expanded error msg for name conflicts (tokens)
|
2015-05-19 16:56:39 -04:00 |
|
|
Zach
|
5d08236cbe
|
Merge pull request #1079 from ctrlaltca/fix_918
Removed resolved issues from TODO.md; fix #918
|
2015-05-16 13:08:51 -04:00 |
|
|
Zach
|
07fcde038c
|
Merge pull request #1065 from poixen/die_roll_parent
Connected die roll dlg to parent
|
2015-05-08 16:14:47 -04:00 |
|
|
Zach
|
399122f49d
|
Merge pull request #1047 from poixen/move_filter_boxes
Updated reveal zone check boxes
|
2015-05-04 10:47:44 -04:00 |
|
|
Zach
|
75ea89361f
|
Merge pull request #1052 from poixen/mention_pop_fix
Can now disable desktop mentions
|
2015-05-04 09:36:20 -04:00 |
|
|
Zach
|
d2b6daae0a
|
Merge pull request #1046 from ctrlaltca/version_date
Append last commit date to version string; fix #1036
|
2015-05-02 21:01:26 -04:00 |
|
|
Zach
|
9ff22eaf17
|
Merge pull request #1040 from poixen/fixed_search
Reverted back to full punctuation
|
2015-05-01 18:02:31 -04:00 |
|
|
Zach
|
ca2ff99391
|
Merge pull request #1037 from tooomm/patch-1
fixed typos + small adjustments in contributing.md
|
2015-04-29 09:36:47 -04:00 |
|