Commit Graph

8975 Commits

Author SHA1 Message Date
blitzmann
ed48a8b5d0 Re-work the exceptions related to logging a character in 2022-05-08 13:21:23 -04:00
blitzmann
5a6fe373f1 Merge branch 'master' into huangzheng2016-master
# Conflicts:
#	gui/builtinPreferenceViews/pyfaEsiPreferences.py
2022-05-08 12:35:46 -04:00
blitzmann
cceaed8d61 rename gh_pages -> docs 2022-05-08 12:34:00 -04:00
Ryan Holmes
d9df4958a6 Merge pull request #2440 from pyfa-org/merge-gh-pages
Merge gh pages
2022-05-08 12:32:07 -04:00
blitzmann
e43e7ba51e move gh pages files to subdirectory 2022-05-08 12:31:47 -04:00
blitzmann
50e76deab7 Merge branch 'gh-pages' into merge-gh-pages 2022-05-08 12:30:05 -04:00
blitzmann
3c6eb6d054 Some updates to allow code / token paste regardless of server setting 2022-05-08 12:24:12 -04:00
blitzmann
e109cce36b Update the callback to always allow the code to be shown 2022-05-07 22:44:51 -04:00
blitzmann
dc997f0dc4 Various updates to support server-aware calls per character 2022-05-07 12:35:16 -04:00
Anton Vorobyov
893f9f8467 Merge pull request #2424 from pyfa-org/issue2402
Add option in settings to disregard JWT exp issues
2022-05-05 20:53:49 +03:00
DarkPhoenix
c612545636 Bump version 2022-05-05 21:43:44 +04:00
DarkPhoenix
4fe729c512 Move Bobook to limited issue ships 2022-05-05 21:43:09 +04:00
DarkPhoenix
a7d52c9fc2 Update icons 2022-05-05 21:15:58 +04:00
DarkPhoenix
207e9018a8 Update effects 2022-05-05 21:12:17 +04:00
DarkPhoenix
a9598d4fc9 Update static data 2022-05-05 19:35:51 +04:00
Ryan Holmes
60015fb3b8 Merge branch 'master' into issue2402 2022-05-03 13:31:29 -04:00
blitzmann
14afc83e86 Fix client ID that is used 2022-04-30 10:17:51 -04:00
hz2016
216dd2a787 Update the SSO Login for Serenity and Singularity server's player 2022-04-28 15:58:33 +08:00
DarkPhoenix
ebd7a1a4ad Fix lock amount effect 2022-04-08 21:45:25 +03:00
DarkPhoenix
63c9d98e3f Bump version 2022-04-05 21:20:52 +03:00
DarkPhoenix
14aafef866 Update effects 2022-04-05 21:20:16 +03:00
DarkPhoenix
55d6bb57d6 Process renames 2022-04-05 18:00:47 +03:00
DarkPhoenix
4bb71dbdb8 Update effects 2022-04-05 17:29:01 +03:00
DarkPhoenix
c9117c2a73 Merge branch 'master' of github.com:pyfa-org/Pyfa 2022-04-05 17:04:17 +03:00
DarkPhoenix
0a193939ed Update static data to 2027534 2022-04-05 17:03:42 +03:00
Anton Vorobyov
a0a27720ef Merge pull request #2426 from nmalaguti/feature/fix-readme-linux-standalone
Update README for self-contained Linux AppImage.
2022-04-03 17:19:08 +03:00
Nick Malaguti
d38417de9e Update README for self-contained Linux AppImage.
Also update OS X to macOS.
2022-04-01 21:50:40 -04:00
DarkPhoenix
2de214d7cd Fix orca shield burst bonus 2022-03-31 23:29:19 +03:00
DarkPhoenix
d9d546ca25 Bump version 2022-03-31 23:11:12 +03:00
DarkPhoenix
2c0e6fa73b Update static data to 2024431 2022-03-31 21:14:39 +03:00
Ryan Holmes
9dc18ac81b Add option in settings to disregard JWT exp issues 2022-03-30 15:17:11 -04:00
DarkPhoenix
86e171f13d Add condenser pack damage profiles 2022-03-30 21:49:25 +03:00
DarkPhoenix
20f222b9bf Split team burner damage patterns into their separate group 2022-03-30 21:28:43 +03:00
Ryan Holmes
01721f9dac Merge pull request #2419 from pyfa-org/issue2410
AppImage
2022-03-30 00:39:19 -04:00
Ryan Holmes
e57b7e5a8f Merge pull request #2422 from nmalaguti/feature/jwt-aud-fix
Skip validation of JWT "aud" claim
2022-03-30 00:38:17 -04:00
Nick Malaguti
4ba037d6e1 Skip validation of JWT "aud" claim
Due to unexpected ESI SSO breakage by adding an "aud" claim, skip
validation of the claim. If in the future CCP specifies which "aud"
claim to verify against, this can be changed to pass the appropriate
"audience" value.

Fixes #2421
2022-03-28 21:36:49 -04:00
Ryan Holmes
f89061a9d8 Merge branch 'master' into issue2410 2022-03-27 09:31:39 -04:00
Ryan Holmes
52b8b4bc6c Merge pull request #2356 from pyfa-org/crowdin_master
New Crowdin updates
2022-03-24 00:07:28 -04:00
Ryan Holmes
51e351d1ba Merge branch 'master' into crowdin_master 2022-03-24 00:07:01 -04:00
blitzmann
518b4abf8c fix crowdin error for PRs 2022-03-23 22:55:22 -04:00
blitzmann
67119fcff1 fix crowdin error for PRs 2022-03-23 22:32:54 -04:00
blitzmann
b1beebda26 Convert makefile to shell commands in appveyor config, various other tweaks 2022-03-23 10:28:04 -04:00
blitzmann
f7ea438ebc Merge tag 'v2.39.2docker' into issue2410 2022-03-23 10:27:12 -04:00
DarkPhoenix
ee6b57ecc1 Rename burner damage profiles and fix sentinel profile 2022-03-19 12:59:53 +03:00
Tomas S
e17fe434ee Update with GTK3 Info 2022-03-17 12:02:19 +01:00
wereii
7cad0b2658 AppImage build 2022-03-16 20:39:55 +01:00
DarkPhoenix
9e06106a1c Save & restore RAH-specific damage pattern through do-undo actions 2022-03-12 13:49:18 +03:00
DarkPhoenix
ae115b640a Allow RAH-specific pattern control 2022-03-12 02:19:03 +03:00
DarkPhoenix
0c292e8d6e Add more burner profiles 2022-03-09 19:20:00 +03:00
DarkPhoenix
68fad93282 Bump version 2022-03-09 00:38:19 +03:00