Ozzieisaacs
|
4ab3dc2599
|
Merge branch 'master' into Develop
# Conflicts:
# cps/admin.py
|
2020-01-27 18:20:50 +01:00 |
|
Ozzieisaacs
|
acfad7a982
|
Update Italian translation
|
2020-01-27 18:17:17 +01:00 |
|
Ozzieisaacs
|
b29b5b7ac1
|
Merge remote-tracking branch 'github/fix-admin-view-log-file'
|
2020-01-27 18:14:16 +01:00 |
|
ElQuimm
|
7803ffb995
|
Update italian message.po
Thank you.
|
2020-01-27 15:07:00 +01:00 |
|
Ghighi Eftimie
|
fc79cdfaa2
|
fix mismerge
|
2020-01-27 15:24:11 +02:00 |
|
Ghighi Eftimie
|
647e954e8a
|
fix admin view of error log
|
2020-01-26 20:53:03 +02:00 |
|
Ozzieisaacs
|
004d9118bc
|
Merge branch 'master' into Develop
|
2020-01-26 19:37:14 +01:00 |
|
Ozzieisaacs
|
594c8aad91
|
Update Version Info
|
2020-01-26 19:36:15 +01:00 |
|
Ozzieisaacs
|
542a0008c9
|
Merge remote-tracking branch 'ru/master'
|
2020-01-26 19:33:37 +01:00 |
|
Ozzieisaacs
|
24f7918aa4
|
Merge remote-tracking branch 'it/patch-4'
|
2020-01-26 19:31:52 +01:00 |
|
Ozzieisaacs
|
2eec329bdf
|
Merge branch 'master' into Develop
# Conflicts:
# cps/templates/user_edit.html
# optional-requirements.txt
|
2020-01-26 19:29:36 +01:00 |
|
Ozzieisaacs
|
0411d4a8c9
|
Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo
Added fix for kobo reader generating requests without right port number, causing url_for not working correct
|
2020-01-26 16:52:40 +01:00 |
|
Ozzieisaacs
|
a986faea56
|
Merge remote-tracking branch 'fix/fix_creation_time' into Develop
|
2020-01-26 16:50:38 +01:00 |
|
Ozzieisaacs
|
ad71d0a03f
|
Merge remote-tracking branch 'kobo_/develop/fix-new-user' into Develop
|
2020-01-26 14:43:44 +01:00 |
|
Ozzieisaacs
|
0955c6d6fb
|
Update Kobo
|
2020-01-26 14:42:53 +01:00 |
|
Michael Shavit
|
d30b44ee0f
|
Minor formatting changes per codacy review.
|
2020-01-26 01:12:52 -05:00 |
|
Michael Shavit
|
a6f4db0f25
|
Fix bug where last_created is incorectly set in the SyncToken.
|
2020-01-26 00:32:05 -05:00 |
|
Simon Latapie
|
69fa7d0091
|
new user: disable kobo token on new user page
kobo token generator function is related to a user id, which is not
present on new user page.
Disable the Kobo token part when creating a new user.
|
2020-01-25 22:41:55 +01:00 |
|
ZIzA
|
e1d6aec682
|
quick fix
sorry
|
2020-01-21 23:06:22 +04:00 |
|
ZIzA
|
155795a18e
|
Russian language update
|
2020-01-21 22:29:23 +04:00 |
|
ZIzA
|
8c4052e884
|
Update README.md
|
2020-01-21 22:22:10 +04:00 |
|
Ozzie Isaacs
|
3c63e2b7e4
|
Update version number
|
2020-01-21 07:04:18 +01:00 |
|
ElQuimm
|
a17c1c063e
|
Update messages.po
:-)
Thank you
|
2020-01-20 22:05:11 +01:00 |
|
Ozzieisaacs
|
6728f5da2d
|
Update Czech translation
|
2020-01-20 20:32:41 +01:00 |
|
Lukáš Heroudek
|
16adeae5c3
|
Update messages.po
|
2020-01-20 15:23:54 +00:00 |
|
Lukáš Heroudek
|
485eba94cc
|
Update messages.po
|
2020-01-20 14:41:51 +00:00 |
|
Lukáš Heroudek
|
5a074348ac
|
Update messages.po
|
2020-01-20 14:02:23 +00:00 |
|
Ozzieisaacs
|
cd9bb56db5
|
Cleanup Kobo integration
|
2020-01-20 06:14:53 +01:00 |
|
Сергей
|
8150f934fd
|
Update README.md
|
2020-01-20 01:48:57 +04:00 |
|
Сергей
|
4c8f3f7bae
|
Add files via upload
|
2020-01-20 01:46:41 +04:00 |
|
Сергей
|
ab5f176f58
|
Update README.md
|
2020-01-20 01:45:37 +04:00 |
|
Ozzieisaacs
|
b294ac00ed
|
Update for updated dependencies on comicapi
|
2020-01-19 17:45:04 +01:00 |
|
Ozzie Isaacs
|
165cbad67b
|
Delete tess.py
|
2020-01-19 15:04:49 +01:00 |
|
Ozzieisaacs
|
b30da58eb9
|
Update german translation
|
2020-01-18 12:55:18 +01:00 |
|
Ozzieisaacs
|
b0fb6b858d
|
Merge remote-tracking branch 'swedish/patch-4'
|
2020-01-18 12:29:22 +01:00 |
|
Jony
|
53ce22ef5e
|
Update Swedish translation
I translated the new strings.
|
2020-01-18 12:18:05 +01:00 |
|
Ozzieisaacs
|
8e7a52f44e
|
Merge remote-tracking branch 'swedish/master'
|
2020-01-18 12:04:49 +01:00 |
|
OzzieIsaacs
|
05a35be019
|
Update test result
|
2020-01-18 11:53:23 +01:00 |
|
Jony
|
4406220f70
|
Update Swedish translation
Update file
|
2020-01-18 11:25:07 +01:00 |
|
Jony
|
51a6cff411
|
Merge pull request #2 from janeczku/master
Update respository
|
2020-01-18 11:24:03 +01:00 |
|
Ozzieisaacs
|
8f4253adbd
|
Fix for limiting domains (now no restriction to domain only)
|
2020-01-18 10:32:09 +01:00 |
|
Ozzieisaacs
|
3e404101bd
|
Merge remote-tracking branch 'cc/develop/custom_float' into Develop
|
2020-01-15 17:58:57 +01:00 |
|
Ozzieisaacs
|
65105d9dbe
|
Merge remote-tracking branch 'cc/develop/custom_float' into Develop
|
2020-01-15 17:58:23 +01:00 |
|
Ozzieisaacs
|
3a4d351a57
|
Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop
|
2020-01-15 17:57:00 +01:00 |
|
Ozzieisaacs
|
ce66c752c4
|
Updated czech translation
removed language selection for guest user
|
2020-01-14 18:21:31 +01:00 |
|
Lukáš Heroudek
|
4e42a179fa
|
Update messages.po
|
2020-01-14 16:45:45 +00:00 |
|
Ozzieisaacs
|
973f555544
|
Merge branch 'master' into Develop
(updated tinymce and bootstrap datepicker)
|
2020-01-13 18:39:25 +01:00 |
|
Ozzieisaacs
|
1d7e52c198
|
Merge with develop:
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
|
2020-01-13 18:37:29 +01:00 |
|
Ozzieisaacs
|
1b42dd1043
|
Update czech and german translation
|
2020-01-13 18:24:47 +01:00 |
|
Lukáš Heroudek
|
77e0022252
|
Update messages.po
Added missing and clenup
|
2020-01-13 10:29:14 +00:00 |
|