b160a8de0b
Merge branch 'master' into Develop
...
# Conflicts:
# cps/__init__.py
# cps/comic.py
# cps/editbooks.py
# cps/helper.py
# cps/kobo.py
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/uploader.py
# cps/web.py
5 years ago
e3246fd751
Merge remote-tracking branch 'key'
5 years ago
fb18ab1ca5
Fix #866 (Recent book sidebar element can't be removed anymore)
5 years ago
01ff55c84e
Removed non working filters for search
5 years ago
523aab2e9e
Don't use an hardcoded session key
...
This fixes a trivial authentication bypass,
according to https://flask.palletsprojects.com/en/1.1.x/quickstart/#sessions
5 years ago
9a7d9da654
Merge remote-tracking branch 'js_caliblur/xss'
5 years ago
e9446556a1
Merge remote-tracking branch 'ru/master'
5 years ago
806a5f209f
Fix two minor xss
5 years ago
c864b368b0
Russian language update
5 years ago
27eb09fb19
Add unrar Support
5 years ago
bea7223a0a
Renabled cbrimage extraction (via unrar and rarfile)
5 years ago
0297823bda
Merge remote-tracking branch 'codecosmetic/move_var'
5 years ago
d1bce5c2d9
Update nl translation from development branch
5 years ago
46c0ae3ccc
Revert accidently deleted nl translation strings
5 years ago
ce6b689147
Code cosmetics
5 years ago
2d92818613
Code cosmetics
5 years ago
487878819e
Move a few variables around
...
This should prevent a couple of crashes
due to undeclared variables.
5 years ago
6682b1ced1
Fix download of book covers with enabled pillow from url
5 years ago
bc89b0658a
Fix deletion of books with multiple custom column links
...
Fix delete of author-folder in case last book of author was deleted (#1269 )
5 years ago
d9dde36c74
Merge remote-tracking branch 'improve_read/sort-book-name' search results are ordered according to sort field in book title
5 years ago
44284ea5fb
Merge remote-tracking branch 'opds/master'
...
# Conflicts:
# cps/translations/cs/LC_MESSAGES/messages.po
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fi/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/hu/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# messages.pot
5 years ago
9f0c0b34af
Merge remote-tracking branch 'order_category/master'
5 years ago
87ec44aed5
Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input'
5 years ago
898e6b4f80
Calibre-Web is rebooted everytime login type ic shanged (from and to standard authentication and between login methods)
5 years ago
dea2600913
Merge remote-tracking branch 'oauth/patch-2' Fix oauth in combination with nginx reverse proxy
5 years ago
dc46ad16ae
Bugfix view shelfs on book detail page
5 years ago
456550a943
Bugfix view shelfs on detiled page
...
bugfix datetime in archive mode
5 years ago
7b789b3701
Fix opds with shelves
...
Fix errorhandler ldap without ldap
5 years ago
0480d493cf
Fix opds login with ldap, if ldap server is down
5 years ago
b4d7733e0a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/list.html
# cps/translations/cs/LC_MESSAGES/messages.po
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fi/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/hu/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# messages.pot
5 years ago
8b8fe7a0ae
bugfix on create shelv via kobo sync protocol
...
bugfix for totally wrong json requests
prevent empty shelf names on kobo create shelf
Removed errorhandler 404
5 years ago
d657330584
Fix for removing admin role from last admin user (in addition to prevent delete of last admin user) #1326
5 years ago
36cb79de62
Merge remote-tracking branch 'turkish/master'
5 years ago
063ee5e855
Merge remote-tracking branch 'remove_usage_local_var_undeclared'
...
Code cosmetics
5 years ago
7393b69757
Fix for #1326 (typo)
5 years ago
8bd1903d98
Fix for #1326 (opds feed user login not working -> download was not possible)
5 years ago
d8bf540db2
Remove an undeclared and useless local variable
5 years ago
e29f17ac46
Merge remote-tracking branch 'kobo/shelves' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/shelf.py
5 years ago
1770f3fd0d
Update turkish translation headers
5 years ago
4239f2ed71
Add turkish translation
5 years ago
3939ec28ba
Add turkish language names
5 years ago
742ec2b38d
Fix issue with the delete_book changes introduced in
...
41a3623
5 years ago
9296d35517
Fix bug with shelf deletions for Kobo.
...
We were incorrectly setting the user_id field in the ShelfArchive table
5 years ago
06c15a792e
Minor fixes to the Kobo shelves implementation (mostly typos)
5 years ago
95ca1e6a9d
Fix for #1319
5 years ago
1df82110d1
Update Italian language translation
5 years ago
24c743d23d
Code cosmetics
5 years ago
f1b1ebe29e
Updated italian version of messages.po
5 years ago
6384cdc74d
Fix https github oauth
...
while using https domian and nginx as proxy, a `ProxyFix` is required.
5 years ago
d093fbb069
Keep previous search value and focus
5 years ago
f9b4505843
Sort search result by Books sort
...
It is far easier to search for a
series or anything and see
books in sort order
5 years ago
ca2bcc647d
Handle read config
...
Allow advance search
Remove duplicate status on show
5 years ago
b90048d72e
fix badge color on grid view to match list view
5 years ago
a5fe08e84c
Fix button color that now matches HEAD on master
...
Update name for HTML Series that changed with HEAD
5 years ago
2874cf531c
Merge remote-tracking branch 'origin/feature/add-cover-serie-view' into feature/add-cover-serie-view
...
# Conflicts:
# cps/ub.py
# cps/web.py
5 years ago
ea7058e896
Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa
5 years ago
38bb10d36b
apply suggestion from @OzzieIsaacs that fixes sorting with caliblur theme.
...
@OzzieIsaacs : I have no idea what the consequences are about this CSS style change. I played around in caliblur and did not notice anything weird, but I'm no calibre-web hardcore user
5 years ago
58943bb156
update filtering so that it also uses isotope everywhere.
...
Fix asc/desc that did not match list view
5 years ago
2d66da3cb9
restrict button for grid<->list switch to series lists
5 years ago
b7efbf9040
resynced grid view with list view
...
Changed drop-down menu to button, with same style as the other buttons. I'll probably have to make a last sync with master for final approval
5 years ago
5222e157cb
fix standard theme badges so that they stand on top left corner instead of top right: each element's width in the list seems to be double the size of the image, so right alignment gets tricky. https://github.com/janeczku/calibre-web/pull/986#issuecomment-517999218 suggests top-left alignment which does make a lot of sense. Using this for now. Maintainer might have a better idea to fix it
5 years ago
1e3a948977
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
5 years ago
20cc5107da
Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa
5 years ago
a6a4d5f09b
apply suggestion from @OzzieIsaacs that fixes sorting with caliblur theme.
...
@OzzieIsaacs : I have no idea what the consequences are about this CSS style change. I played around in caliblur and did not notice anything weird, but I'm no calibre-web hardcore user
5 years ago
028c53287d
update filtering so that it also uses isotope everywhere.
...
Fix asc/desc that did not match list view
5 years ago
24a9bea137
restrict button for grid<->list switch to series lists
5 years ago
ef1a2d1730
resynced grid view with list view
...
Changed drop-down menu to button, with same style as the other buttons. I'll probably have to make a last sync with master for final approval
5 years ago
6abff36e07
fix standard theme badges so that they stand on top left corner instead of top right: each element's width in the list seems to be double the size of the image, so right alignment gets tricky. https://github.com/janeczku/calibre-web/pull/986#issuecomment-517999218 suggests top-left alignment which does make a lot of sense. Using this for now. Maintainer might have a better idea to fix it
5 years ago
902685a197
Fix text in user config section (random books in Detail View)
5 years ago
c04b146486
Fix #1309 (fix duplicate shelf names in book detail view)
5 years ago
7bb5afa585
Merge remote-tracking branch 'kobo/shelves' into Develop
5 years ago
06fde4fcd0
Fix #1311 (Enable LDAP Anonymous Login)
5 years ago
195845ab0c
Fix
5 years ago
81a329f1e7
Fix for #1087 ( Caliblur! Theme button alignment)
5 years ago
53be752787
Merge remote-tracking branch 'it/patch-10'
5 years ago
42ac06c114
Merge remote-tracking branch 'nl/Develop' into Develop
5 years ago
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
5 years ago
2c42972230
Fix for #1307 (Oauth login not working)
...
- Changed blueprint reference in Backend from name to id, users can now again be found
- Depending on version of flask-dance the resultcode of authorized is set different to prevent redirect loop with newer versions(>1.3)
- Redirect to login page in case no user is linked to current oauth account
- Flash messages upon successfull login, successsfull linked account
5 years ago
f926e58891
Changing ordering logic when showing books from a category
5 years ago
a784c6bd52
Fixes for oauth login after programming basic tests
5 years ago
05d78f5cb5
Update italian version of message.po
...
Have a nice day!
5 years ago
4ef7615d88
Merge remote-tracking branch 'origin/feature/add-cover-serie-view' into feature/add-cover-serie-view
...
# Conflicts:
# cps/ub.py
5 years ago
77c2783a3e
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
5 years ago
ce4f1258b5
Fix #1293 (error 500 on search without query)
5 years ago
3fbaba6693
Fix #1307
5 years ago
4749eccfa5
Added fix for python2 regex
...
Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap
5 years ago
5b1dfc123f
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
5 years ago
41a3623fcc
[Kobo] Add Shelf/Collection support.
...
Implements the v1/library/tags set of endpoints to sync CalibreWeb
shelves with the Kobo device.
Drive-by: Refactors shelf.py to consolidate how user permissions are checked.
Drive-by: Fix issue with the sync endpoint that arrises when a book is
hard-deleted.
5 years ago
296ac203d4
Update messages.po
5 years ago
0c9436ca82
Regenerate translation files
5 years ago
70c9dd1b95
Fix opds format errors & extend info
5 years ago
a194216568
Merge remote-tracking branch 'origin/master'
5 years ago
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
5 years ago
587174b771
Fix #1272
5 years ago
3e1c34efe6
Merge remote-tracking branch 'fix/fix_covers' into Develop
5 years ago
5864637f1c
Merge branch 'master' into Develop
5 years ago
ec6b346ca1
Update Translation
5 years ago
e99f5bcced
Merge remote-tracking branch 'english/master'
5 years ago
b89309ab82
Merge remote-tracking branch 'po/master'
5 years ago
4550333f1e
Added redirect after create shelf
5 years ago
3ba610eb64
Revert accidentally committed changes in opds feed
5 years ago
2436c6a118
Merge remote-tracking branch 'caliblur/master'
5 years ago
bab14a1fbf
Update shelfs handling, bugfix changed updater
5 years ago
0c27ff11b9
Update Updater
5 years ago
734e2ffbb2
Updated Polish translations
5 years ago
da42c51af2
Updated to exclude new modules
5 years ago
7cb6801241
Fix issue with cover images.
5 years ago
f6c04b9b84
Merge branch 'master' into Develop
5 years ago
4eacb21259
Update updater
...
Update change logfile
code cosmetics js files
5 years ago
6d1a3ccdcc
Improve logger for windows
5 years ago
c870f6e87d
English Language V2
5 years ago
6643f0d1e0
Merge remote-tracking branch 'nl/master'
...
# Conflicts:
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
5 years ago
092423adc7
Merge remote-tracking branch 'sv/master'
...
# Conflicts:
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
5 years ago
a50ca1a85f
Fix #1259
5 years ago
f243515261
Fix #950 (sorting order in comics)
5 years ago
a26ce8d8b5
Updated & corrected Dutch translations
...
Un-wonky-fied some literal translations, corrected contexts an respected punctuations, whitespaces, etc.....
See https://github.com/janeczku/calibre-web/issues/606#issuecomment-595913808
5 years ago
de0e27c512
Fix #1164 merge.
5 years ago
09e7d76c6f
Merge remote-tracking branch 'kobo_book_delete' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/services/SyncToken.py
# cps/templates/book_edit.html
# cps/ub.py
5 years ago
d597e05fa9
Merge remote-tracking branch 'reading_state' into Develop
...
# Conflicts:
# cps/kobo.py
5 years ago
1d40434d2b
Merge remote-tracking branch 'it/patch-9'
5 years ago
46b87dc7eb
Fix for testability of kobo
5 years ago
fe7c56d269
italian updated version of messages.po
...
09.03.2020
5 years ago
ad564e25ca
More fixes for Kobo Sync
...
- Fix incorrect maintenance of the Synctoken timestamps.
- Fix issue where the SyncToken isn't included in the response when
kobo_proxying is disabled.
5 years ago
8cbc345f36
Merge remote-tracking branch 'identifier/develop/edit_identifiers' into Develop
5 years ago
89927fd7e9
Merge ComicVine API
5 years ago
18794831e0
Chang link to issue template
5 years ago
3fb851304f
Merge remote-tracking branch 'ru/master'
5 years ago
d267338837
Fixes for Kobo sync
...
Better output on upload cover
Fix for download after access to opds/fileformat
Fix osd search link
Added ratings to opds feed
Change for kobo sync for testing
5 years ago
8e1641dac9
Add support for syncing Kobo reading state.
5 years ago
57d37ffba8
Add schema support for more reading states to the ReadBook table.
5 years ago
82afa81220
up
5 years ago
d730eb8d31
fix
5 years ago
5a219b580f
ru update
5 years ago
fb83bfb363
Fix for #1223 (pdf-reader isn't working on chrome, IE, Edge)
5 years ago
df7d3d18b6
pdf reader
5 years ago
a0535aa3db
Add ComicVine Api
...
Fetching Metadata for comicBook with ComicVine API
5 years ago
202b6121ab
Fix for #1227 (Download books not possible with gevent IPV6 connection)
...
Fix issue where books aren't correctly ordered by Date Added
5 years ago
4e8b814ec2
Fix download URL for IPV6
5 years ago
c8b64d4162
Update chinese translation Merge remote-tracking branch 'cn/patch-1'
5 years ago
0854303710
Update Chinese translation
5 years ago
cba3e62e71
Fix issue where books weren't correctly ordered by Date added on the
...
Kobo device.
5 years ago
6c614c06f6
restricted_tags -> denied_tags
...
Fix for the next error after update:
Traceback (most recent call last):
File "cps.py", line 34, in <module>
from cps import create_app
File "/home/rewerson/lib/web/cps/__init__.py", line 68, in <module>
config = config_sql.load_configuration(ub.session)
File "/home/rewerson/lib/web/cps/config_sql.py", line 348, in load_configuration
update({"restricted_tags": conf.config_mature_content_tags}, synchronize_session=False)
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/query.py", line 3862, in update
update_op.exec_()
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1693, in exec_
self._do_exec()
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1874, in _do_exec
values = self._resolved_values
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/persistence.py", line 1840, in _resolved_values
desc = _entity_descriptor(self.mapper, k)
File "/home/rewerson/.local/lib/python2.7/site-packages/sqlalchemy/orm/base.py", line 402, in _entity_descriptor
"Entity '%s' has no property '%s'" % (description, key)
sqlalchemy.exc.InvalidRequestError: Entity '<class 'cps.ub.User'>' has no property 'restricted_tags'
5 years ago
917132fe26
Update Translation (german and russian)
...
Merge remote-tracking branch 'it/patch-8'
# Conflicts:
# cps/translations/it/LC_MESSAGES/messages.po
5 years ago
187ca5dc8f
Fix #1221
5 years ago
7d795771d3
Fix #1221
5 years ago
040bb4a5a8
Merge remote-tracking branch 'origin/master'
5 years ago
fc4436f091
Update Translation
5 years ago
b9f3ac2eea
Windows compatability
5 years ago
9fc0c3b3de
Merge remote-tracking branch 'English_texts/master'
...
# Conflicts:
# cps/templates/config_edit.html
# cps/templates/config_view_edit.html
# cps/templates/layout.html
# cps/templates/search_form.html
# cps/templates/user_edit.html
5 years ago
4f81184da0
Update translation
5 years ago
32a6beae65
Merge remote-tracking branch 'fix/kobo'
...
# Conflicts:
# cps/kobo.py
5 years ago
146068c936
Merge branch 'Develop'
...
# Conflicts:
# cps/db.py
# cps/templates/user_edit.html
5 years ago
3b8c5ef21a
Merge remote-tracking branch 'get_metadata/patch-1'
...
Fix #1210 Load multiple authors correct via get metadata
5 years ago
e60ef8fc97
Calibre-web version visible in about section
...
Update Calibre-web Version info
5 years ago
24d755b123
Update translations
...
Merge remote-tracking branch 'it/patch-7'
5 years ago
7c89f0b5b9
Merge with branch develop
...
Release version
5 years ago
134a10f56c
Merge remote-tracking branch 'origin/Develop' into Develop
...
# Conflicts:
# cps/updater.py
5 years ago
3a70c86f49
Update updater to handle venv folders
5 years ago
371097eb4d
Update Updater
5 years ago
372c284ad4
Merge branch 'master' into Develop
5 years ago
29cb8bfec4
Fix #1210
5 years ago
b7f3e00fbf
Update updater to handle venv folders
5 years ago
27a18d60a7
Merge remote-tracking branch 'fix/robust_proxy' into Develop
...
# Conflicts:
# cps/kobo.py
5 years ago
6893635251
Handle kobo auth request
...
Handle access from localhost for kobo
5 years ago
94a38a3b47
udate message.po in italian
...
Hello,
updated one more time the translation :-)
I think the string "Author list" is missing.
Thank you!
Quimm
5 years ago
7d99e21d0d
Merge remote-tracking branch 'original/Develop' into kobo_book_delete
5 years ago
df3eb40e3c
Make KoboStore proxying more robust.
...
* Add a timeout to prevent hanging when the KoboStore isn't reachable.
* Add back a the dummy auth implementation for when proxying is
disabled.
* Return the dummy auth response as a fallback when failing to contact
the KoboStore.
* Don't contact the KoboStore during the /sync API call when proxying is
disabled.
5 years ago
ba6b5f8fd1
Merge branch 'master' into Develop
5 years ago
8f518993a4
Merge branch 'master' into master
5 years ago
29f6463ed9
Fix #1149 (Prevent invalid file extensions on Kindle Paperwhite download)
5 years ago
ed0bdbf31d
Fix for #1199 (missing referrer)
5 years ago
b152d3e06d
Merge remote-tracking branch 'auth_token/fix/reverse-proxy-authentication-with-bearer-token'
5 years ago
16cd57fe55
Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'
5 years ago
3f578122a3
Merge remote-tracking branch 'it/patch-6'
5 years ago
51a27322be
Merge remote-tracking branch 'cn/master'
5 years ago
e3ddc16657
Fix opds login not working anymore (due to kobo sync protocol)
5 years ago
33cdf20cd5
Remove trailing whitespaces
5 years ago
317e59df4b
Bugfixes from tests
5 years ago
a9a6f5b97e
Renamed restrict -> deny
5 years ago
8b1444ebc2
Improved testability
...
Less content exposed with restricted content
Tornado restart and stop working with systemd
5 years ago
509071949a
Moved style to css file
5 years ago
697d857549
message.po italian
5 years ago
2ea45b1fdc
Removed shebang on non executable scripts
5 years ago
726595e117
Update for testability
5 years ago
1666e32aaf
Fixes cover layouts in user edit page
5 years ago
6a69bbe4b5
Fixes cover layouts in user edit page
5 years ago
7a608b4fb0
fix binascii.Error with reverse proxy bearer token
...
When an authenticating reverse proxy (e.g. Keycloak Gatekeeper) adds a Bearer token in the Authorization header, every request fails with HTTP status code 500. The corresponding error in the logs is: binascii.Error: Incorrect padding.
Despite "reverse_proxy_header_login" is enabled, calibre-web tries first to base64decode the bearer token and fails. This patch just reverses the order in which the authentication methods are checked.
5 years ago
814ad87a42
Updated pdf viewer to 2.2.228 ( #1184 )
5 years ago
3e4b5e23fa
Updated pdf viewer to 2.2.228 ( #1184 )
5 years ago
ab24ed8088
Handle sorting of hidden books #1123
...
Prevent downloading of covers from hidden books
5 years ago
50ba2e329a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/shelf.py
5 years ago
e04aa80fd6
Fix #1181 and Fix #1182 handle removed "is_xhr" on werkzeug version 1.0.0
5 years ago
2535bbbcf1
Fix #1180 working on windows with tornado and python <3.8 again
5 years ago
6698773d81
Improved testability
5 years ago
aefaf47f4c
Update Simplified Chinese translation
5 years ago
9b49125776
English Language Updates
...
Changes to provide consistency for English language.
5 years ago
b33a2ac90d
Fix #1170 Auth-digest Header no longer crashs calibre-web
...
Fix #1161 Shelfs are reordering again
Update Sortable.js to 2.10.1
Code cosmetics
5 years ago
f67953c447
Update translation
...
Merge remote-tracking branch 'cz/patch-11'
5 years ago
981632f599
Merge remote-tracking branch 'it/patch-5'
5 years ago
a6c453d826
Merge remote-tracking branch 'pl/pl_translate_update'
5 years ago
Ozzieisaacs