mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-15 14:24:57 +00:00
Code Issues Releases Wiki Activity
1,296 Commits 3 Branches 23 Tags 101 MiB
7c69589c5b
Commit Graph

1098 Commits

Author SHA1 Message Date
Ozzieisaacs
17b7333992 Merge remote-tracking branch 'caliblur/master' 2019-02-20 20:00:08 +01:00
leram84
ae279c5123
fixed description read-more button 2019-02-20 12:57:38 -05:00
Ozzieisaacs
e92497b34e Merge branch 'master' into Develop 
# Conflicts:
#	cps/gdriveutils.py
#	cps/helper.py
 2019-02-20 18:09:42 +01:00
Ozzieisaacs
ae7c4908f9 Fix #767 2019-02-20 18:04:55 +01:00
Ozzieisaacs
ea1a882353 Merge remote-tracking branch 'origin/master' 2019-02-20 18:04:40 +01:00
hexeth
9a0e8fefb7
re-add loader code 2019-02-19 13:56:49 -08:00
Matt
c07cb23ef2 Merge branch 'master' of git://github.com/janeczku/calibre-web 2019-02-19 13:47:53 -08:00
hexeth
5a863541de
Fix object object 2019-02-19 13:44:40 -08:00
Ozzie Isaacs
4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7 2019-02-19 19:32:00 +01:00
Ozzieisaacs
2505f0c1e4 Merge remote-tracking branch 'filename/patch-1' 
Fixes for Google Drive
 2019-02-18 20:52:58 +01:00
Fabian Wüthrich
7fb9bf8889
Truncate single quote in upload file name 2019-02-18 13:35:30 +01:00
Ozzieisaacs
3d5d95904a Oauth working somehow (?) 2019-02-17 19:10:16 +01:00
Ozzieisaacs
a0be02e687 Ldap working 2019-02-17 09:09:20 +01:00
Ozzieisaacs
237502ae6b Output of errormessage for invalid CALIBRE_PORT value 2019-02-16 10:18:32 +01:00
Ozzieisaacs
37007dafee Merge branch 'master' into Develop 
# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
 2019-02-16 10:17:46 +01:00
Ozzieisaacs
56826f67fc progressbar during upload thanks to jim3ma 2019-02-16 10:05:51 +01:00
Ozzieisaacs
0fa45f5800 Merge remote-tracking branch 'github/master' 
Improvement for #814
 2019-02-16 08:03:42 +01:00
Ozzieisaacs
4230226716 Link fixes 
Fixes reader button visible in detail view
Fix formats to convert (added htmlz)
Fix logger in updater
Added request "v3" of github api on update
Fix quotes parameter on external calls
E-Mail logger working more stable (also on python3)
Routing fixes
Change import in ub
 2019-02-16 07:23:36 +01:00
lorek123
d508b909d1 update js and css libs, especially to fix xss in Jquery and Bootstrap 2019-02-10 18:17:33 +01:00
Ozzieisaacs
c1ef1bcd19 User and admin pages are working again 2019-02-09 21:26:17 +01:00
Ozzieisaacs
1fc4bc5204 Fix routes 
Fix error page
 2019-02-09 19:01:57 +01:00
Ozzieisaacs
f5235b1d4c Uploader progress bar 
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
 2019-02-09 18:46:41 +01:00
Ozzieisaacs
d58d792f56 Catch Imagemagick policy error 2019-02-09 12:58:43 +01:00
Ozzieisaacs
d6ee8f75e9 More refactoring 2019-02-08 20:12:16 +01:00
Ozzieisaacs
a00d93a2d9 Working again (basically) 2019-02-06 21:52:32 +01:00
Ozzieisaacs
561d40f8ff Merge branch 'master' into Develop 2019-02-03 20:30:37 +01:00
Ozzieisaacs
6fc4b318e8 cover folders beautified 2019-02-03 20:29:16 +01:00
Ozzieisaacs
36229076f7 Refactor subprocess calls 2019-02-03 18:32:27 +01:00
Ozzieisaacs
7f34073955 Merge branch 'master' into Develop 
# Conflicts:
#	cps/web.py
#	readme.md
 2019-02-03 17:33:54 +01:00
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
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
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
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
Krakinou
2e37c14d94 Clean some comment 2019-01-12 18:40:32 +01:00
Krakinou
91f0908059 insert into db 
connect via LDAP config
 2019-01-12 18:07:03 +01:00
Krakinou
8d284b151d Edit html config 2019-01-12 12:52:27 +01:00
Ozzieisaacs
c527d1f49a Merge remote-tracking branch 'theme/master' 
Added translations for some tooltips
Updated translations
 2019-01-12 09:01:08 +01:00
hexeth
4ace3a5e27
test 2019-01-11 14:13:09 -08:00
leram84
db83fb3bd7
minified 2019-01-11 16:49:45 -05:00
hexeth
883633a045
Remove beta from caliBlur selection 2019-01-11 13:46:19 -08:00
Matt
84fdf9143b Revert "Update web.py" 
This reverts commit a388f03b99.
 2019-01-11 13:44:17 -08:00
Matt
7a069ad72e Revert "Update web.py" 
This reverts commit 1bcc0698d5.
 2019-01-11 13:43:48 -08:00
leram84
f897491070
Update caliBlur.min.css 2019-01-11 16:30:01 -05:00
Ozzieisaacs
f053508013 Fix #764 2019-01-11 22:24:48 +01:00
hexeth
2ab10bb070
Update caliBlur.js 2019-01-11 13:23:12 -08:00
hexeth
1bcc0698d5
Update web.py 2019-01-11 13:21:51 -08:00
hexeth
a388f03b99
Update web.py 2019-01-11 13:20:16 -08:00
hexeth
9c75eb7016
Update caliBlur.js 2019-01-11 13:07:18 -08:00
hexeth
6c37aafae9
Update caliBlur.js 2019-01-11 13:05:22 -08:00
hexeth
550262e651
Further fix 2019-01-11 12:44:29 -08:00
hexeth
edb4cedc65
Update about page to target new body class 2019-01-11 12:43:00 -08:00
hexeth
40e45c7272
Add files via upload 2019-01-11 11:23:49 -08:00
hexeth
7032f311d5
Update caliBlur.js 2019-01-11 10:54:21 -08:00
Ozzieisaacs
66fcd71685 Merge remote-tracking branch 'origin/master' 2019-01-11 08:36:51 +01:00
Ozzieisaacs
36030b559c Choosing Theme is now a global setting 2019-01-11 08:36:28 +01:00
Krakinou
30954cc27f Initial LDAP support 2019-01-10 23:51:01 +01:00
hexeth
e1205b75cd Fix targeting for language support (#761) 
Some other languages use 'description :' instead of 'description:' .
 2019-01-10 18:26:34 +01:00