Commit Graph

48 Commits

Author SHA1 Message Date
Guangcong Luo
bdcbded0bb Update Font Awesome to 4.4.0
Font Awesome 3 -> 4 was a backwards-incompatible change, so this
update is pretty invasive. I tested everything we use it for and it
still works, though. Including supporting both Font Awesome versions
in battle.js.
2015-09-25 02:46:34 -05:00
Bär Halberkamp
e912b73ac7 Fix the HTML sanitizer in testclient.html 2015-09-25 00:18:24 +02:00
urkerab
a1c674851a Make it possible to minimise the Latest News box 2015-09-09 12:33:09 +01:00
urkerab
84f116be53 Allow non-HTML5 based fragments in the test client 2015-08-18 12:18:17 +01:00
Guangcong Luo
a6e56e969a Update jQuery to 2.1.4 2015-06-28 00:50:16 -04:00
Bryan AA
7c600fdf7c Escape é in "Pokémon"
- Add "é" Instead of "é".
2015-06-20 14:03:25 -06:00
kubetz
f467808606 Remove crossdomain issues on load for testclient over https 2015-06-08 17:56:50 +00:00
kubetz
b77ab203a1 port is now converted into integer when custom server is used 2015-06-06 18:14:03 +00:00
Konrad Borowski
22502eb07e Disable Chrome Frame
Chrome Frame is not supported for two years, which means removing
support for it on Pokémon Showdown should be safe.
2015-05-19 20:08:45 +02:00
Morfent
d2bc6dd260 Update jQuery to version 2.1.3 2015-02-06 05:07:58 -04:00
Guangcong Luo
a39c1078c4 Update links to jQuery and SockJS 2014-03-26 12:31:28 -05:00
小太
ef69e954c2 Rename client-tournament.js to client-chat-tournament.js 2013-12-09 16:16:11 +11:00
小太
4d03e4d393 Merge remote-tracking branch 'upstream/master' into tournaments 2013-11-11 18:38:16 +11:00
Guangcong Luo
83626ee935 New gen-6-only learnsets file
The client doesn't actually need a full learnset file, so this is
enough (even for the dex).
2013-10-23 22:41:44 -05:00
小太
54042f637c Merge remote-tracking branch 'upstream/master' into tournaments
Conflicts:
	testclient.html
2013-10-20 20:43:13 +11:00
Quinella
da1280ba86 Fixes testclient.html; the loading message didn't disappear.
Because of that PMing and challenging others on testclient.html was impossible.
2013-09-22 15:00:53 +02:00
小太
4c13a800d2 Use a different library for rendering the tree and implement draggable brackets to support it 2013-09-17 20:14:17 +10:00
小太
ffcd67478e Add support for tree-type tournaments 2013-09-15 15:36:37 +10:00
小太
dc79480f31 Merge remote-tracking branch 'upstream/master' into tournaments 2013-09-13 21:55:59 +10:00
Quinella
bb88c1f049 Added storage.js include to testclient.html 2013-09-06 00:48:40 +02:00
小太
3c0e3b1a1e Merge remote-tracking branch 'upstream/master' into tournaments 2013-08-20 22:49:31 +10:00
小太
4503e271fb Fix code not using tabs for indenting 2013-08-18 22:54:42 +10:00
小太
cf699c0494 Obliterate trailing whitespace 2013-08-18 22:48:11 +10:00
小太
a7e69c0810 Basic tournament support 2013-08-10 19:19:52 +10:00
sandshrewz
13f3095821 added js/client-rooms.js 2013-07-06 11:18:32 +08:00
Cathy J. Fitzpatrick
89c0fc463b Fix testclient.html query string support 2013-05-24 19:50:10 -06:00
Cathy J. Fitzpatrick
ddca39f096 Re-implement testclient.html to parity with old client 2013-05-24 19:10:28 -06:00
Cathy J. Fitzpatrick
c7a02a9031 Rename some fields of the Config object 2013-04-26 18:37:37 -06:00
Cathy J. Fitzpatrick
53b9d015c6 Remove legacy code for old protocols 2013-04-26 04:15:09 -06:00
Cathy J. Fitzpatrick
c52a0e261b Upgrade to jQuery 2.0.0 2013-04-20 05:42:59 -06:00
Cathy J. Fitzpatrick
5261dc9478 Revert "testclient.html is no longer necessary"
This reverts commit d22a87872c.
2013-04-18 04:20:49 -06:00
Cathy J. Fitzpatrick
d22a87872c testclient.html is no longer necessary 2013-04-17 17:31:38 -06:00
Cathy J. Fitzpatrick
f872ebda0a Move custom name colours to config.js 2013-04-15 19:56:53 -06:00
Cathy J. Fitzpatrick
82de98d166 Refactor action.php
This moves most of the logic of action.php into a separate file
lib/dispatcher.lib.php and separates the actions into ladder-related
actions and non-ladder-related actions. This is intended to make it
possible to have a second action.php that handlers only ladder-related
actions, which can run on the main server computer and allow
that computer to make HTTP requests to `localhost`, which should
help reduce ladder errors.
2013-04-01 23:21:33 -07:00
Cathy J. Fitzpatrick
b5fd671927 Changes to sound support 2013-02-21 21:27:10 -07:00
Cathy J. Fitzpatrick
23f1b56b67 Add support for server alternative ports
If connecting to the server's main port fails, the client will
automatically attempt to connect on the alternative port. If connecting
on the alternative port is successful, this is recorded in localStorage
so that next time, the alternative port is used first.

This is mainly intended to be used by the main server, which has a
primary port of 8000 and a relatively little known alternative port
of 80.
2013-02-21 19:33:56 -07:00
Cathy J. Fitzpatrick
6ed5c51aeb Add query string syntax to testclient.html 2013-02-20 03:55:26 -07:00
Cathy J. Fitzpatrick
4c2526b562 Revert recent changes for now
These changes introduced some unexpected issues.
2013-02-17 23:05:59 -07:00
Cathy J. Fitzpatrick
55581d5a48 Add server chooser to testclient.html 2013-02-17 22:35:04 -07:00
Cathy J. Fitzpatrick
274e9c96de Prevent servers from injecting JavaScript into client
This commit makes various changes to prevent servers from injecting
arbitrary JavaScript into the client. This prevents a variety of
possible exploits. The main changes in the client are as follows:

- Raw HTML from the server is now sanitised using caja to prevent
  excution of JavaScript. See
    https://code.google.com/p/google-caja/wiki/JsHtmlSanitizer
  for details.

- The client now has a variety of CSS classes for possible chat
  command messages that can be sent from the server, rather than the
  server injecting arbitrary CSS `style` attributes into the client.
2013-02-12 02:57:17 -07:00
Cathy J. Fitzpatrick
c6b26c5719 Revise testclient.html to be more user-friendly 2013-02-08 04:18:12 -07:00
Cathy J. Fitzpatrick
7a50b31b6b More changes to cached index.php logging
- check timestamp in index.php rather than sim.js to reduce the chance
  of false positives caused by the user's internet connection being
  slow or the user's clock being slightly wrong

- require timestamp logging to be a POST request
2013-02-06 22:36:32 -07:00
Cathy J. Fitzpatrick
2272b6dcab Cosmetic fix to testclient.html
This doesn't actually matter, but it makes more sense to use the
correct timestamp.
2013-02-06 17:54:27 -07:00
Cathy J. Fitzpatrick
599360c363 Changes for browsers that cache index.php
If the browser uses a cached version of index.php more than 50
seconds old, we now make the AJAX request to action.php?act=upkeep.
2013-02-06 17:47:05 -07:00
Cathy J. Fitzpatrick
0ccaf286ce Eliminate initial AJAX request to login server
Instead of making an AJAX request to action.php?act=upkeep, this
commit now includes the initial token directly in index.php.
2013-02-06 17:08:32 -07:00
Cathy J. Fitzpatrick
87b4712545 Revise testclient.html for safe JSON
This commit adds support for 'config data' that begins with a ']'
character so that output from the upkeep page can be copied directly
without having to manually remove the ']' prefix.
2013-02-06 14:15:19 -07:00
Guangcong Luo
b5f7479ab4 Upgrade jQuery to 1.9.0 2013-01-29 20:01:48 -08:00
Guangcong Luo
e4bde150e0 Add support for a test client 2013-01-23 17:45:03 -08:00