Skip to content

Commit

Permalink
Merge branch 'release/1.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Henjuro committed Jun 8, 2018
2 parents 529f4bc + 1864bfb commit 9865772
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 3 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
#Changelog
* 1.3.2
* Fixes
* Feedbacks open ingame mail button not working (this was broken with esipy upgrade in 1.3.0)
* Improvement
* Intercepting ajax calls to urls with /universe/types/ in url and setting Accept-Language header to'en-us, en;q=0.9'
to counter the change where ccp's esi started looking at that header for the name of modules

* 1.3.1
* Fixes
* fixed for possible race contition between checking if a character exists in db and creating it
Expand Down
10 changes: 9 additions & 1 deletion static/js/eve-ui-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,12 @@ var eveui_imageserver = function(image_ref) {
return eve_image(encodeURI(image_ref), 'jpg');
}
return eve_image(encodeURI(image_ref), 'png');
};
};
// fix for getting names for modules from ccp api that are in the users browser language
$.ajaxSetup({
beforeSend: function(xhr, settings) {
if (settings.url.includes('/universe/types/')) {
xhr.setRequestHeader('Accept-Language', 'en-us, en;q=0.9');
}
}
});
2 changes: 1 addition & 1 deletion waitlist/data/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = "1.3.1-$Format:%h$"
version = "1.3.2-$Format:%h$"
3 changes: 2 additions & 1 deletion waitlist/utility/swagger/evemail.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ def open_mail(token: SSOToken, recipients: Sequence[int], body: str, subject: st
payload['recipients'] = [0]

client = get_esi_client(token, False)
response = client.request(client.security.app.op['post_ui_openwindow_newmail'](new_mail=payload))
api: App = get_api()
response = client.request(api.op['post_ui_openwindow_newmail'](new_mail=payload))
if response.status == 204:
return ESIResponse(get_expire_time(response), response.status, None)

Expand Down

0 comments on commit 9865772

Please sign in to comment.