1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-29 11:30:31 +00:00
Commit Graph

141 Commits

Author SHA1 Message Date
Cervinko Cera
8159cf6b1a Merge remote-tracking branch 'upstream/master'
merge with upstream
2016-08-07 22:29:21 +02:00
Cervinko Cera
829e926770 Add PyPDF2 to vendor 2016-08-07 22:12:32 +02:00
Cervinko Cera
2b2d485730 upload more than pdf fixes 2016-08-07 22:10:00 +02:00
Cervinko Cera
fee60bb21d Merge branch 'lemmsh-upload_more_than_pdf'
Merging PR #30
2016-08-07 18:47:00 +02:00
Cervinko Cera
f5773cc75f resolve conflicts with PR 30 2016-08-07 18:46:38 +02:00
cervinko
f02ea3b880 Merge pull request #38 from jgillman/update-google-font-protocol
Update Google Font protocol to HTTPS
2016-08-07 14:05:38 +02:00
Joel Gillman
a7117228aa
Update Google Font protocol to HTTPS 2016-07-18 11:10:45 -07:00
janeczku
d051a1dbeb Fix login/logout redirect with reverse proxy 2016-07-15 14:29:57 +02:00
janeczku
f95ac38c54 Fix redirects with reverse proxy
See #36
2016-07-15 01:28:12 +02:00
janeczku
34e11fab79 Support reverse proxy subdirectory
Closes #19
2016-07-14 02:12:21 +02:00
janeczku
d0c9bf9e0e Add shebang
Closes #29
2016-07-14 01:52:06 +02:00
Pavel Yakunin
8a9c97bf69 fb2 uploading 2016-06-18 16:51:16 +03:00
Pavel Yakunin
8b5bd61467 fb2 uploading 2016-06-18 16:50:32 +03:00
janeczku
82574d2118 Support SMTP without authentication 2016-06-17 21:32:00 +02:00
janeczku
91eb7129ac Update epub.js 2016-06-17 21:22:09 +02:00
janeczku
62f9120a0f Merge branch 'zip-check' 2016-06-17 21:08:59 +02:00
janeczku
e42f768909 Check if epub file exists before trying to extract 2016-06-17 20:59:44 +02:00
janeczku
bd686ad6ed Merge branch 'disable-autocomplete' 2016-06-17 20:01:53 +02:00
janeczku
374cfd866d Disable autocomplete in user edit 2016-06-17 20:01:44 +02:00
janeczku
46c83bbe8b Fix recursive path creation 2016-06-17 20:01:27 +02:00
janeczku
062dc4649e Merge branch 'fix-kindle' 2016-06-17 14:43:02 +02:00
janeczku
af1691f919 Fix missing import 2016-06-17 14:42:39 +02:00
Pavel Yakunin
43d6077815 cleanup 2016-06-05 22:32:26 +03:00
Pavel Yakunin
18e341d650 epub uploading 2016-06-05 22:28:30 +03:00
Pavel Yakunin
dc5074a865 default upload logic 2016-06-05 19:52:28 +03:00
Pavel Yakunin
44df873f33 logging, tmp cleanup 2016-06-05 19:42:18 +03:00
Pavel Yakunin
027e103ce3 refactoring to make adding new formats possible 2016-06-05 18:41:47 +03:00
Jan B
db70e47557 Merge pull request #18 from cervinko/feature-advanced-search
add advanced search
2016-05-22 14:05:40 +02:00
Cervinko Cera
c26eb6aa08 add exclude tags to advanced search 2016-05-03 14:27:38 +02:00
Cervinko Cera
80c3c19c01 some fixes for advanced search 2016-05-03 11:00:45 +02:00
Cervinko Cera
7fce28790d add search_form.html 2016-05-02 23:25:21 +02:00
Cervinko Cera
431b6009a5 add advanced search 2016-05-02 22:43:50 +02:00
janeczku
1e2a6f2ffb Fix session.rollback on admin account creation 2016-04-29 22:54:38 +02:00
janeczku
3719b7e4eb Add ANON_BROWSE configuration option 2016-04-29 22:36:36 +02:00
Jan B
554bc6aaf5 Merge pull request #17 from cervinko/feature-rights-management
add user-permission management
2016-04-29 22:17:30 +02:00
Cervinko Cera
3833079973 assign admin all rights in create_admin_user() 2016-04-27 19:50:04 +02:00
Cervinko Cera
8f4c444929 add basic auth for feed sites 2016-04-27 18:29:45 +02:00
janeczku
f7e868044e Move vendored libraries to vendor directory 2016-04-27 17:47:31 +02:00
janeczku
f6cf9ac7f7 Update readme.md 2016-04-27 17:37:19 +02:00
janeczku
fe1ab44a58 Add GPL v3 License 2016-04-27 17:29:57 +02:00
Cervinko Cera
f66d7ce29b add permission for changing own password 2016-04-27 16:00:58 +02:00
Cervinko Cera
bc35250f28 permission fix in user_edit.html 2016-04-27 10:39:52 +02:00
Cervinko Cera
c7b7b3866e add user-permission management 2016-04-27 10:35:23 +02:00
janeczku
5d6f18f4c3 Merge branch 'fix-gitignore' 2016-04-21 23:15:47 +02:00
janeczku
727a49db6f Add gitignore, config.ini.example 2016-04-21 23:13:41 +02:00
Jan B
7424418cdf Merge pull request #16 from cervinko/feature-custom_columns
Feature custom columns
2016-04-21 23:00:00 +02:00
Cervinko Cera
0e4574da91 revert config.ini 2016-04-21 20:55:08 +02:00
Cervinko Cera
b2146ba4b9 add support for is_multiple custom columns 2016-04-21 19:18:52 +02:00
Cervinko Cera
3f1a54ea59 fix typo in detail.html 2016-04-21 14:46:19 +02:00
Cervinko Cera
6359ab73a7 remove config.ini 2016-04-21 14:42:30 +02:00