aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Commit graph

  • f199115b54 Merge pull request #709 from ctrlaltca/oracle_translations Zach 2015-02-08 18:29:47 -0500
  • 5f3f767178 Merge pull request #710 from ctrlaltca/pvt_filters Gavin Bisesi 2015-02-08 17:28:18 -0500
  • 0d974914a3 Disable filters in "show user's games" dialog Fabio Bas 2015-02-08 22:35:37 +0100
  • a813dcb803 Merge pull request #708 from poixen/local_chat_focus Zach 2015-02-08 15:34:18 -0500
  • 40d6caa59d Merge branch 'master' into oracle_translations Fabio Bas 2015-02-08 21:32:32 +0100
  • f80e319900 Added translations for oracle; fix #293 Fabio Bas 2015-02-08 21:17:51 +0100
  • 43a9ac61fb Merge pull request #702 from ctrlaltca/osx_menubar Gavin Bisesi 2015-02-08 15:05:35 -0500
  • f91de7e1f1 Local chat focus Matt Lowe 2015-02-08 20:56:16 +0100
  • 25747a0964 Merge pull request #704 from ctrlaltca/fix_683 Zach 2015-02-07 19:15:44 -0500
  • 1d81cde457 Merge pull request #705 from ctrlaltca/fix_regression_667 ctrlaltca 2015-02-08 01:00:28 +0100
  • b1f5672481 Merge pull request #697 from poixen/kick_message Zach 2015-02-07 18:59:57 -0500
  • 40386a3415 Don't require lib, it's optional Fabio Bas 2015-02-08 00:58:36 +0100
  • ae674e54b0 Merge patch for #684 Fabio Bas 2015-02-08 00:40:28 +0100
  • cbd391b1b8 Second attempt based on feedback Fabio Bas 2015-02-08 00:38:04 +0100
  • 3b0a8c2aa8 Updated Matt Lowe 2015-02-08 00:36:35 +0100
  • 9c6784a1c0 Fix #683 Fabio Bas 2015-02-08 00:26:16 +0100
  • 32fb532ad3 OSX: Test the ability to translate application menu entries Fabio Bas 2015-02-07 23:17:26 +0100
  • 508c444453 Regenerated translations to pick up new string from OS X menubar Fabio Bas 2015-02-07 23:14:37 +0100
  • 5646a76ee7 OSX: merge the duplicate cockatrice menu in the main one Fabio Bas 2015-02-07 23:13:32 +0100
  • 030b02345d Merge pull request #667 from ctrlaltca/oracle_zip Zach 2015-02-07 17:04:22 -0500
  • 7de110306f You have been kicked message box Matt Lowe 2015-02-06 23:14:55 +0100
  • adb259fdd6 Merge pull request #695 from Cockatrice/show-password-games-by-default Gavin Bisesi 2015-02-05 22:04:33 -0500
  • 86b92a25de Merge remote-tracking branch 'origin/master' into show-password-games-by-default Gavin Bises 2015-02-05 21:46:29 -0500
  • f8bb295eef Merge pull request #694 from ZeldaZach/flag_fix Gavin Bisesi 2015-02-05 19:39:49 -0500
  • 296e31b510 flag fix Zach H 2015-02-05 17:24:09 -0500
  • ad8e47a35d flag fix Zach H 2015-02-05 17:23:11 -0500
  • b369da4ad5 Merge pull request #682 from ctrlaltca/fix_674 Zach 2015-02-04 21:30:16 -0500
  • 059a62a00d Merge pull request #689 from Cockatrice/fix-688 Zach 2015-02-04 20:54:26 -0500
  • f22e42428c Fix #688. Reuse chat tabs when user opens more chat with same user Gavin Bises 2015-02-04 20:14:16 -0500
  • 6e5f4d1f06 Merge remote-tracking branch 'origin/master' into jo-remove-name-filters-from-settings Gavin Bises 2015-02-04 20:15:41 -0500
  • 78aa291734 Merge pull request #687 from poixen/base_mention_color Gavin Bisesi 2015-02-04 19:10:10 -0500
  • cf26127dc4 Changed default mention/username color Matt Lowe 2015-02-05 00:28:22 +0100
  • 6d499bdad2 Merge pull request #685 from poixen/mentions_in_om Gavin Bisesi 2015-02-04 18:18:08 -0500
  • 0c32cfaa27 Merge pull request #686 from Cockatrice/woogerboy21-nsisquotefix woogerboy21 2015-02-04 15:57:26 -0500
  • 40610997c2 Corrected NSIS template quoting woogerboy21 2015-02-04 15:30:38 -0500
  • ef607eeb4c Added mentions to PMs Matt Lowe 2015-02-04 17:13:52 +0100
  • 37a05eb731 Merge pull request #671 from kaiserfro/jo-reduce-whitespace-from-game-description Gavin Bisesi 2015-02-04 10:18:23 -0500
  • 06290d2326 Changed popup buttons from "Ok/Cancel" to "Yes/No" Fabio Bas 2015-02-04 14:47:09 +0100
  • 3f38e780f4 Fix #674 Fabio Bas 2015-02-04 12:48:08 +0100
  • 917a29fac0 This error message needs to explain itself a bit better Fabio Bas 2015-02-04 12:18:25 +0100
  • 4ebcfc6b34 Raise a question popup when zip parsing fails Fabio Bas 2015-02-04 12:15:28 +0100
  • 843cd9718e Reduce the whitespace in the server game constructor. Jeffrey Oliver 2015-02-03 22:22:31 -0800
  • cb50fd0e2c Merge pull request #679 from poixen/deckEditorButtons Gavin Bisesi 2015-02-03 18:00:13 -0500
  • f7f651338b Updated deck editor buttons Matt Lowe 2015-02-03 23:35:18 +0100
  • 25cc695190 Merge pull request #672 from ctrlaltca/deckstats Gavin Bisesi 2015-02-03 10:30:28 -0500
  • a29bf2cf0d make -j2 for travis builds Gavin Bises 2015-02-03 09:22:41 -0500
  • e7198edfc7 Merge pull request #676 from poixen/focus_chat Gavin Bisesi 2015-02-03 09:15:25 -0500
  • 787773e949 Chat has focus when starting game Matt Lowe 2015-02-03 13:53:18 +0100
  • 7ce9d3749e Fixed "analyze on deckstats"; Fix #662 Fabio Bas 2015-02-03 08:48:20 +0100
  • bd39d60388 Reduce the game descriptions whitespace. Jeffrey Oliver 2015-02-02 20:59:46 -0800
  • 975c5e0db3 Show password protected games by default Gavin Bises 2015-02-02 19:14:23 -0500
  • b7521bad8b Merge pull request #620 from poixen/mention_punctuation poixen 2015-02-02 21:45:02 +0100
  • 781f8a6603 Oracle: support AllSets.json.zip; Fix #624 Fabio Bas 2015-02-02 19:59:35 +0100
  • 4c418bc9b4 Merge pull request #654 from poixen/chat_buddy_stars poixen 2015-02-02 17:55:14 +0100
  • 72d1b211c4 Merge pull request #644 from poixen/mention_color Zach 2015-02-01 15:39:53 -0500
  • 82ca261ec8 Merge remote-tracking branch 'origin/master' into mention_color Gavin Bises 2015-02-01 13:29:50 -0500
  • a08fc0461f Merge pull request #660 from Cockatrice/ignore-unreg-pm Zach 2015-02-01 13:17:03 -0500
  • 26fa936347 Add settings page option to ignore unreg user pm Gavin Bises 2015-02-01 12:14:25 -0500
  • 5222183ff3 Don't open new PM windows from unreg when ignoring unreg pm Gavin Bises 2015-02-01 12:05:29 -0500
  • 32c6635137 Add settings interface for ignoring unreg pm Gavin Bises 2015-02-01 12:05:04 -0500
  • eeed03b101 Merge pull request #656 from poixen/view_size_fix Gavin Bisesi 2015-02-01 10:35:02 -0500
  • 42c4f4a08c Fixed pile view bug Matt Lowe 2015-02-01 00:31:25 +0100
  • d57a6111aa Buddy stars Matt Lowe 2015-01-31 17:11:17 +0100
  • 3f2c570075 fixed conflict Matt Lowe 2015-01-30 19:23:04 +0100
  • 6d4716b38f Merge pull request #648 from poixen/menu_sep Gavin Bisesi 2015-01-30 10:07:00 -0500
  • d065236ce9 Added separator Matt Lowe 2015-01-30 13:57:16 +0100
  • 75f8ecd6e9 Added label Matt Lowe 2015-01-30 13:06:09 +0100
  • b608d81037 Merge branch 'fix-deck-shuffle-check' Zach H 2015-01-29 21:10:34 -0500
  • a8fcd9ec26 Merge pull request #623 from Cockatrice/country-code Gavin Bisesi 2015-01-29 20:27:19 -0500
  • d0f4d96d17 Don't store shuffle zone check - always check it Gavin Bises 2015-01-29 19:51:16 -0500
  • 6f50266931 Uppercase country code for text display, not flag filename generation Gavin Bises 2015-01-29 20:01:48 -0500
  • de38a294b5 Updated color setting Matt Lowe 2015-01-30 01:54:57 +0100
  • ec8a2de2eb Chat mention color Matt Lowe 2015-01-30 00:48:50 +0100
  • 8d0a5cf86a Merge pull request #639 from tooomm/installer-add-oracle-text Gavin Bisesi 2015-01-29 17:41:49 -0500
  • fe7b976b79 Merge pull request #638 from Cockatrice/search-by-cmc Gavin Bisesi 2015-01-29 17:35:52 -0500
  • acb9bc20c4 Fix #640 - don't add muid-0 cards to splitCards map Gavin Bises 2015-01-29 17:09:14 -0500
  • de336384cd add oracle name at the end of installer tooomm 2015-01-29 22:34:53 +0100
  • 6fa34c6c04 Add cmc to card db filter model Gavin Bises 2015-01-29 13:33:06 -0500
  • 7893ab086f Fix broken cmc parsing from cards.xml Gavin Bises 2015-01-29 13:32:17 -0500
  • a31c15c752 Merge pull request #637 from ctrlaltca/fix_cache_size ctrlaltca 2015-01-29 14:27:36 +0100
  • 29190708c3 Fix merge botch Fabio Bas 2015-01-29 14:11:15 +0100
  • 1ffb5bf76d removed hardcoded table name prefix from query Fabio Bas 2015-01-29 13:54:15 +0100
  • 0f58e8bcde Servatrice: reuse prepared statements Fabio Bas 2015-01-29 13:47:55 +0100
  • dd426cbac9 Merge pull request #634 from Cockatrice/oracle-cmc Gavin Bisesi 2015-01-29 05:48:32 -0500
  • 971c7bce53 Merge pull request #636 from poixen/chat_mention_alert Gavin Bisesi 2015-01-29 05:46:44 -0500
  • 2a78d15792 Taskbar attention when mentioned Matt Lowe 2015-01-29 10:27:16 +0100
  • 3c65fba539 Avoid double locking of sessions, users table Fabio Bas 2015-01-29 09:54:48 +0100
  • 763d8a7919 Merge branch 'master' into jo-remove-name-filters-from-settings Jeffrey Oliver 2015-01-28 20:28:36 -0800
  • e2fe25735b Parse cmc from json and store in cards.xml Gavin Bises 2015-01-28 20:28:38 -0500
  • 1af6486d74 Capitalize country code in user info box Gavin Bises 2015-01-28 19:03:08 -0500
  • b5fbebc883 Add country code to user info box. Gavin Bises 2015-01-28 11:57:17 -0500
  • 78edb8c661 Check for non-characters Matt Lowe 2015-01-28 13:27:45 +0100
  • 739ca6a02e Merge pull request #607 from poixen/osx_fix Gavin Bisesi 2015-01-27 20:10:54 -0500
  • 223b38c27b Add a bool to the gameselector constructor to choose whether or not we should load settings from saved values or use defaults. Jeffrey Oliver 2015-01-27 12:40:13 -0800
  • 8be659ba47 Merge pull request #616 from ideocl4st/korean-translation-150128 Gavin Bisesi 2015-01-27 13:17:04 -0500
  • c20b1747bd Merge pull request #615 from ideocl4st/249-country-flags-svg Gavin Bisesi 2015-01-27 12:24:04 -0500
  • a94cc1c77c Updated Korean Translation Jaeic Lee 2015-01-28 01:57:10 +0900
  • b7dd64d333 Flag images for 249 countries with ISO 3166 codes Jaeic Lee 2015-01-28 00:08:14 +0900
  • 93cf7dbaaf Merge pull request #609 from poixen/chat_mention_fixes Gavin Bisesi 2015-01-27 06:30:20 -0500
  • 3c0aca70e0 Updated method name Matt Lowe 2015-01-27 10:55:52 +0100