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
Ozzie Isaacs
3593f904dc
Fixed spelling error readme
2019-02-13 19:55:56 +01:00
lorek123
7f3e98b477
Merge branch 'master' of github.com:lorek123/calibre-web
2019-02-10 18:30:22 +01:00
lorek123
83a06fa6c9
Merge branch 'master' of github.com:lorek123/calibre-web
2019-02-10 18:18:13 +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
Lorek
6842a8ac91
update js and css libs, especially to fix xss in Jquery and Bootstrap
2019-02-10 18:04:15 +01:00
Ozzieisaacs
1dc6f44828
Merge branch 'master' into Develop
2019-02-10 07:56:18 +01:00
Ozzie Isaacs
47b5a5652b
Update converter section
2019-02-10 07:54:57 +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
6661be91ff
Update readme
2019-02-03 17:29:27 +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
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 fb7bd0c49bae55dd6c27
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
