Code

Merge Upstream#4

Code

Open

emckee2006 wants to merge 115 commits intoemckee2006:masteremckee2006/PretendYoureXyzzy:masterfrom ajanata:masterajanata/PretendYoureXyzzy:masterCopy head branch name to clipboard

+13,855-18,887

Commits

Commits on Apr 13, 2016

• Update and rename README to README.md

  Show description for 1e23f40
  

  Spencer S

  authored and

  Spencer S

  committed
  1e23f40

Commits on Sep 10, 2016

• Fix typo of "hard" to "hand"

  rootatdebian

  committed
  9a776fb

Commits on Feb 15, 2017

• Remove the CORS filter.

  Show description for eb66ccd
  ajanata

  committed
  eb66ccd

• add git commit id to pyx.properties

  ajanata

  committed
  a390743

• another warning turned on in eclipse

  ajanata

  committed
  d206ed8

• Merge pull request #150 from rootatdebian/master

  Show description for 141876f
  ajanata

  authored
  141876f

• Merge pull request #148 from SSederberg/patch-1

  Show description for a9d3fef
  ajanata

  authored
  a9d3fef

• add instructions on how to avoid buildnumber plugin errors to readme

  ajanata

  committed
  15aced1

• escape card text from cardcast. fixes xss issues.

  ajanata

  committed
  d919c07

• escape the set name and description too

  ajanata

  committed
  f3f9dbe

Commits on Feb 21, 2017

• update admin ip addresses, make chat spam filter more aggressive

  ajanata

  committed
  32aac1b

• use constant value in error message

  ajanata

  committed
  b5fef60

• Add persistent IDs to users, stored via cookie (opt-out availabled).

  Show description for 72b4cd9
  ajanata

  committed
  72b4cd9

• document unused build.properties value

  ajanata

  committed
  e1bc2c4

Commits on Feb 24, 2017

• Add user client information to user metrics info (language, device class, name).

  Show description for 45690c1
  ajanata

  committed
  45690c1

• make metrics methods agree in tense

  ajanata

  committed
  a0d21cd

Commits on Feb 27, 2017

• java 8

  ajanata

  committed
  1e09b55

• fix some warnings

  ajanata

  committed
  a67c721

• fix some hibernate deprecation warnings

  ajanata

  committed
  a38dc53

• implement kafka metrics without tls or authentication

  ajanata

  committed
  23ce041

• configure logging before injector creation so injected constructors can log, and do not bother re-loading pyx.properties immediately after creating the injector which already does so

  ajanata

  committed
  5f18168

Commits on Mar 4, 2017

• kafka tls

  ajanata

  committed
  5e6791e

• fix some cleanup issues when unable to connect to kafka

  ajanata

  committed
  73c41cc

• sasl support for kafka

  ajanata

  committed
  942903e

Commits on Mar 5, 2017

• add privacy page

  ajanata

  committed
  b2c27cd

Commits on Apr 15, 2017

• add watermark to card information sent to metrics

  ajanata

  committed
  9679d0f

Commits on Aug 13, 2017

• Disable global chat except for admins. Add release notes.

  ajanata

  committed
  17ac407

• Handle null HTTP headers for language and user agent

  ajanata

  committed
  5e60e10

Commits on Feb 15, 2018

• Update README with correct command to run via jetty. Fixes #163.

  ajanata

  committed
  88f58fb

Commits on Feb 16, 2018

• Use C3P0 for Hibernate connection pooling. This fixes the issue where everything breaks if Postgres restarts.

  ajanata

  committed
  91db059

Commits on Feb 22, 2018

• * Change card set sort order from 'weight, id' to 'weight, name'.

  Show description for 89a4cee
  ajanata

  committed
  89a4cee

Commits on Feb 26, 2018

• Add card dealt metrics.

  ajanata

  committed
  adab3b7

• Update cards with official CAH cards through Q3 2017 from data provided by CAH. See also pyx-importer project.

  ajanata

  committed
  b80f12e

• Fix default value for idle time multiplier in GameOptions so the dropdown actually has something selected.

  ajanata

  committed
  a94ba4a

Commits on Feb 27, 2018

• * Fix some cases of not all decks being listed because the javascript code assumed that duplicate weights would never occur.

  Show description for d143791
  ajanata

  committed
  d143791

• Revised new card database dump. Addresses cards with the same text but different formatting.

  ajanata

  committed
  ce7e9da

Commits on Feb 28, 2018

• Sort full games to the end of the game list. Fixes #157.

  ajanata

  committed
  216ff63

• * Add stylesheet to privacy and changelog pages.

  Show description for 4b75185
  ajanata

  committed
  4b75185

• make lastpass also ignore the chat entry area

  ajanata

  committed
  e2960ee

• Let global chat enablement be configured via the properties file. Can be adjusted on the fly, though clients are not notified of the change (which doesn't affect the client's operation anyway).

  ajanata

  committed
  cb0f268

Commits on Mar 2, 2018

• HTML cleanup.

  Show description for cdd3846
  ajanata

  committed
  cdd3846

• Fix not focusing the nickname box on page load.

  ajanata

  committed
  dc31b1f

Commits on Mar 3, 2018

• Add ID codes for positive user identification, and minor fixups.

  Show description for 7a24c65
  ajanata

  committed
  7a24c65

Commits on Mar 4, 2018

• Fix an oddly-formatted black card's pick value.

  Show description for feed54d
  ajanata

  committed
  feed54d

Commits on Mar 5, 2018

• Fix "Make a haiku." draw and pick values.

  Show description for 1fb621e
  ajanata

  committed
  1fb621e

Commits on Mar 6, 2018

• Add a /whois command.

  Show description for e157853
  ajanata

  committed
  e157853

• Show the /whois result in the window it was typed in.

  ajanata

  committed
  f7378e0

Commits on Mar 7, 2018

• Allow white cards with images, and minor cleanup.

  Show description for 24881d1
  ajanata

  committed
  24881d1

• Fix stop spectating a game when user disconnects.

  Show description for 204c6be
  ajanata

  committed
  204c6be

Commits on Mar 9, 2018

• Add a crude scrollbar to user preferences and game list filters.

  Show description for b20562d
  ajanata

  committed
  b20562d

Commits on Mar 12, 2018

• port UpdateJsConstants to make Go constants

  ajanata

  committed
  b5c9bff

Commits on Mar 13, 2018

• just type everything as strings for go

  ajanata

  committed
  6a61727

• More extensive Go code generation for constants.

  Show description for 72fd7f8
  ajanata

  committed
  72fd7f8

• Fixes for Go code generation.

  Show description for 89e164e
  ajanata

  committed
  89e164e

Commits on Mar 16, 2018

• Uncomment and fix annotation spelling

  ajanata

  committed
  f7386c8

• Minor fixes for Go API client.

  Show description for 7375dd8
  ajanata

  committed
  7375dd8

Commits on Mar 20, 2018

• Always return serial as a number, never a string. Errors were returning string for some reason.

  ajanata

  committed
  270b590

Commits on Mar 22, 2018

• Delete some old stuff that was never fully implemented or needed.

  ajanata

  committed
  ac48ea0

• Move admin IP addresses to config file.

  ajanata

  committed
  4e2b5e4

Commits on Mar 23, 2018

• Add a ChatFilter class and use it.

  Show description for c6f62c1
  ajanata

  committed
  c6f62c1

• Global and game chats have distinct flood controls.

  Show description for 88bfa34
  ajanata

  committed
  88bfa34

• Fix an NPE when logging out while in a game.

  Show description for 0cf261f
  ajanata

  committed
  0cf261f

Commits on Mar 24, 2018

• Add more chat control.

  Show description for 4bddace
  ajanata

  committed
  4bddace

• Bump the version since I'm adding so much stuff.

  ajanata

  committed
  4f9edbb

• Add more chat filtering.

  Show description for 65f74ef
  ajanata

  committed
  65f74ef

• Updates for shadowban.

  Show description for 783b223
  ajanata

  committed
  783b223

Commits on Mar 26, 2018

• Add logging to (FirstLoad|Register)Handler.

  Show description for 6e6bf61
  ajanata

  committed
  6e6bf61

• Clarify that shadowbanned strings should be provided in lower-case.

  Show description for ace019d
  ajanata

  committed
  ace019d

• Update change log.

  ajanata

  committed
  fa996ab

• Fix IPv6 loopback address for admin, and comment.

  ajanata

  committed
  0678272

• Include some creation times in responses.

  Show description for 988f638
  ajanata

  committed
  988f638

Commits on Mar 27, 2018

• Send sigil/id code/persistent id when reconnecting.

  Show description for 28e040a
  ajanata

  committed
  28e040a

• Refer to verification code in the ui for the mangled version

  ajanata

  committed
  8211726

• Include ? as a basic character, and count spaces as them too.

  ajanata

  committed
  4afab98

Commits on Mar 28, 2018

• Always send admins connect and quit events

  ajanata

  committed
  612bd09

• Tell admins about filtered chat content.

  Show description for a505598
  ajanata

  committed
  a505598

Commits on Mar 29, 2018

• Fix /whois not showing spectators as spectating

  ajanata

  committed
  dcb9553

• GameId needs to be an *int in AjaxResponse for Go, just like LongPollResponse.

  ajanata

  committed
  3cb0e55

Commits on Mar 30, 2018

• AjaxResponse PLAYER_INFO is also an array, oops.

  ajanata

  committed
  21e8f7a

• Fix a typo in a variable name

  ajanata

  committed
  6d289ef

• Fix Go data type for WHITE_CARDS and WINNING_CARD cuz I just guessed when I made them in the first place.

  ajanata

  committed
  43f9b70

Commits on Mar 31, 2018

• Create LICENSE

  ajanata

  authored
  9bbdd38

Commits on Apr 2, 2018

• Add repeated words filtering to chat filter.

  ajanata

  committed
  1c07624

• Merge branch 'master' of github.com:ajanata/PretendYoureXyzzy

  ajanata

  committed
  88ab1ac

Commits on Apr 4, 2018

• Display round permalinks after the round is over, if enabled.

  Show description for 99958c0
  ajanata

  committed
  99958c0

Commits on Apr 5, 2018

• Update changelog

  ajanata

  committed
  f88ed59

Commits on May 13, 2018

• Send global chat enabled with FirstLoad

  devgianlu

  committed
  c71e01b

Commits on May 18, 2018

• Merge pull request #169 from devgianlu/master

  Show description for 2906ffa
  ajanata

  authored
  2906ffa

Commits on May 30, 2018

• Show more permalinks to users.

  Show description for 1e3351a
  ajanata

  committed
  1e3351a

Commits on Jun 1, 2018

• changelog updates

  ajanata

  committed
  67c0e0e

Commits on Jun 13, 2018

• Bugfixes and nick filter.

  Show description for d874025
  ajanata

  committed
  d874025

• Check user address against X-Forwarded-For

  ajanata

  committed
  9e8aa1e

Commits on Jul 1, 2018

• Fix for #174 (#176)

  Show description for 5d05f2e
  

  devgianlu

  authored and

  ajanata

  committed
  5d05f2e

Commits on Jul 28, 2018

• Add option to disable fill-in-the-blank cards entirely.

  ajanata

  committed
  c40c2d1

• Add option to disable game chat.

  ajanata

  committed
  5759766

Commits on Aug 1, 2018

• Allow admins to join any game

  tyzoid

  committed
  332da9b

Commits on Aug 2, 2018

• Merge pull request #182 from tyzoid/master

  Show description for 4cd2af9
  ajanata

  authored
  4cd2af9

Commits on Aug 6, 2018

• Add more info to stats.jsp to allow server lists to disambiguate features

  tyzoid

  committed
  54b3087

Commits on Aug 7, 2018

• Merge pull request #185 from tyzoid/master

  Show description for c27fcc8
  ajanata

  authored
  c27fcc8

Commits on Aug 26, 2018

• Adding Docker docs to README

  emcniece

  committed
  ec62772

Commits on Aug 30, 2018

• Allow admins to spectate any password protected game

  Rubueno

  committed
  f1639dc

• Merge pull request #188 from Rubueno/master

  Show description for 5215d8c
  ajanata

  authored
  5215d8c

• Merge pull request #187 from emcniece/docker

  Show description for a384a02
  ajanata

  authored
  a384a02

Commits on Sep 4, 2018

• update changelog and privacy text

  ajanata

  committed
  8f82a01

Commits on Oct 24, 2018

• Disable inactive card sets by default.

  Show description for 8e1c5e8
  ajanata

  authored
  8e1c5e8

Commits on Sep 29, 2019

• Moved min/default/max player limit, spectator limit, score limit and blank card limit to pyx.properties

  devgianlu

  committed
  631fe14

• Added min/default/max values to js config

  devgianlu

  committed
  21949bc

Commits on Mar 29, 2020

• changed geoip version to 2.8.1 to make build work

  

  Tys vanZeyl

  authored and

  Tys vanZeyl

  committed
  99f9c46

Commits on Apr 4, 2020

• big link to server list page

  ajanata

  committed
  296a692

Commits on May 24, 2020

• Merge pull request #228 from Tysseract/master

  Show description for 47cff64
  ajanata

  authored
  47cff64

• Merge pull request #219 from devgianlu/min-default-max-config

  Show description for 4379c14
  ajanata

  authored
  4379c14

• update postgresql JDBC driver to latest version

  Stary2001

  committed
  f863c13

• Merge pull request #246 from Stary2001/master

  Show description for 15757a6
  ajanata

  authored
  15757a6

Commits on May 26, 2020

• Fix JS error because of prefix

  devgianlu

  committed
  7021691

Commits on May 27, 2020

• Merge pull request #247 from devgianlu/min-default-max-config

  Show description for ed08e37
  ajanata

  authored
  ed08e37