Commit graph

1409 commits

Author SHA1 Message Date
Ozzieisaacs
ea98323c06 Fixes Google Drive
Improved user guidance for Google Drive
Improved Errorhandling for Google Drive
Update french translation
Added ukranian translation
Improvements on updater: calibre-web.log1, calibre-web.log2, gdrive_credentials, settings.yaml, gdrive.db, .git are no longer deleted upon update
2019-02-03 16:38:27 +01:00
Ozzieisaacs
b75b91606c Fix config oauth-UI 2019-01-27 11:32:16 +01:00
Ozzieisaacs
80582573f5 Merge remote-tracking branch 'oauth/oauth' into Develop
# Conflicts:
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/web.py
2019-01-27 11:22:22 +01:00
Ozzieisaacs
3683e4e7eb Merge remote-tracking branch 'ldap/master' into Develop 2019-01-27 11:18:08 +01:00
Ozzieisaacs
8ababf9f77 Merge remote-tracking branch 'simple_shelf/shelf-down' into Develop 2019-01-27 11:16:11 +01:00
Ozzieisaacs
5971194678 Merge remote-tracking branch 'audiobook/Branch_c27805b'
# Conflicts:
#	cps/templates/detail.html
#	cps/web.py
#	readme.md
2019-01-27 11:14:38 +01:00
Ozzieisaacs
d81cb2927a Update Test results 2019-01-27 08:32:26 +01:00
Ozzieisaacs
e8ce88095e Fix viewing Publisher settings for other users
Fix Visiblilty of read/unread category
2019-01-26 19:06:54 +01:00
Ozzieisaacs
9128615f48 Fix #424
Fix #425
2019-01-26 09:43:17 +01:00
Ozzieisaacs
ec81a3cd92 Fix Authors page pagination
Update infinite scroll plugin
2019-01-25 21:58:19 +01:00
Ozzieisaacs
97064db2a4 Restart python3 fix, stop and restart python2 working again 2019-01-23 18:14:45 +01:00
Ozzieisaacs
341dd77b9d Bugfix Restart and Stop server on python3 2019-01-21 21:01:16 +01:00
Ozzieisaacs
836c6fd245 Updated translations
Added license texts in flies
2019-01-20 19:37:45 +01:00
Ozzieisaacs
bacb6fb561 New updater with default setting -> only stable releases #653 2019-01-20 17:46:26 +01:00
Ozzieisaacs
62574939b2 Fix #770 2019-01-19 16:48:04 +01:00
Ozzieisaacs
8e95636599 Merge remote-tracking branch 'caliblur/master' 2019-01-19 16:39:44 +01:00
Matt
b1d2b68bb1 Revert "Merge pull request #1 from hexeth/reader-theme"
This reverts commit fb7bd0c49b, reversing
changes made to ae55dd6c27.
2019-01-18 14:31:41 -08:00
hexeth
fb7bd0c49b
Merge pull request #1 from hexeth/reader-theme
reader theme
2019-01-18 14:28:41 -08:00
hexeth
3ba9e4d96e
reader theme 2019-01-18 14:28:11 -08:00
leram84
ae55dd6c27 Update caliBlur.min.css 2019-01-18 14:17:17 -08:00
Matt
7341819606 Revert "Update caliBlur.min.css"
This reverts commit df8806e182.
2019-01-18 14:11:39 -08:00
Matt
68f143dc30 Revert "Create dark-reader.css"
This reverts commit a69e43922a.
2019-01-18 14:11:31 -08:00
Matt
ae14236698 Revert "Add Dark-Reader"
This reverts commit 7e9d6a3cf9.
2019-01-18 14:11:24 -08:00
Matt
9ee4b7f77c Revert "Not ready for commit"
This reverts commit 6a2ebba85b.
2019-01-18 14:11:17 -08:00
hexeth
6a2ebba85b
Not ready for commit 2019-01-18 14:06:39 -08:00
hexeth
7e9d6a3cf9
Add Dark-Reader 2019-01-18 13:50:21 -08:00
leram84
a69e43922a
Create dark-reader.css 2019-01-18 16:43:36 -05:00
leram84
df8806e182
Update caliBlur.min.css 2019-01-18 14:43:04 -05:00
hexeth
83a905bfe1
Don't remove the dropdown toggle 2019-01-18 11:35:13 -08:00
Matt
e01872fc79 Revert "Update caliBlur.min.css"
This reverts commit 2b7b55846b.
2019-01-18 11:27:19 -08:00
leram84
2b7b55846b
Update caliBlur.min.css 2019-01-18 14:22:48 -05:00
hexeth
c0792b7225
Add .sendtokindle-drop to click-off 2019-01-18 11:10:54 -08:00
Matt
8825352af6 Revert "Add sendtokindle-drop to click-off array"
This reverts commit d83ba315f0.
2019-01-18 11:09:26 -08:00
hexeth
d83ba315f0
Add sendtokindle-drop to click-off array 2019-01-18 11:07:50 -08:00
hexeth
16e23cb1fe
Fix upload tooltip not appearing 2019-01-18 11:04:28 -08:00
leram84
df2b1ba09d
fix for send button dropdown 2019-01-18 14:01:51 -05:00
hexeth
9a12e60b1c
Toggle for dropdown 2019-01-18 11:00:55 -08:00
hexeth
c620453ebf
UL positioning 2019-01-18 10:57:42 -08:00
hexeth
4988e3b631
add tooltip and move UL higher in DOM 2019-01-18 10:50:29 -08:00
Matt
aa27e0e476 Revert "Update ID of button from sendbtn2 to sendbtn"
This reverts commit a9277da85a.
2019-01-18 10:43:26 -08:00
Ozzie Isaacs
9e5fa45df7
Removed unnecessary wait message 2019-01-16 17:50:51 +01:00
leram84
d5ff3b6a0b smtp setup page (#774)
fix for https://github.com/janeczku/calibre-web/issues/773
2019-01-15 21:20:03 +01:00
Ozzie Isaacs
cc618ecee7
Fix Limiting domains (related to #773) 2019-01-15 20:08:47 +01:00
Ozzieisaacs
f4977c3767 Merge remote-tracking branch 'theme/master' 2019-01-15 18:22:09 +01:00
hexeth
a9277da85a
Update ID of button from sendbtn2 to sendbtn
The ID of this button is currently `sendbtn` if the condition is true, but `sendbtn2` when false. Propose renaming both to `sendbtn` as neither button will appear in the template at the same time. This will assist in caliBlur more easily targeting both states.
2019-01-14 11:43:29 -08:00
Ozzieisaacs
32568c9009 Update testing
Update custom columns unicode enums
2019-01-14 20:27:53 +01:00
Krakinou
d48cdcc789 Correct authentication in case LDAP not activated 2019-01-13 11:21:11 +01:00
Krakinou
d763168dec Merge branch 'master' of https://github.com/Krakinou/calibre-web 2019-01-13 11:04:32 +01:00
Krakinou
7ccc40cf5b Moving import LDAP
Correct optional-requirements-ldap.txt spelling
2019-01-13 11:02:03 +01:00
Krakinou
aafb267787
Merge branch 'master' into master 2019-01-12 23:46:59 +01:00