1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-27 02:20:31 +00:00
Commit Graph

822 Commits

Author SHA1 Message Date
OzzieIsaacs
91cdb5f60f Merge remote-tracking branch 'Upper_case/master' 2017-08-12 19:02:57 +02:00
OzzieIsaacs
2f7177742d Update chinese translation 2017-08-12 18:59:57 +02:00
OzzieIsaacs
dd6c928e2c Merge remote-tracking branch 'translation/master' 2017-08-12 18:55:08 +02:00
OzzieIsaacs
fb8ce693f3 Bugfix mature content
Update german translation
2017-08-12 18:52:56 +02:00
OzzieIsaacs
b596734c36 Merge remote-tracking branch 'adv/mature-content' 2017-08-12 18:16:45 +02:00
idalin
274d0f6577 update Chinese translations 2017-08-11 09:32:01 +08:00
idalin
2b27d6570f Merge branch 'janeczku-master' 2017-08-11 09:26:36 +08:00
idalin
b5cca553b3 update Chinese translations 2017-08-11 09:25:39 +08:00
kyos
9a17a09cc7 Fixed codacy requirements 2017-08-10 12:34:54 +02:00
Ruben Herold
68e3867af3 fix books with uppercase extension 2017-08-10 12:29:08 +02:00
kyos
aa4a5dc3ef Added option to upload a new format to a given book 2017-08-09 19:56:46 +02:00
Jonathan Rehm
6f797ba478 Check if JPEG via response content-type header instead of URL extension
That way we can use dynamic URLs, such as those returned by the "Get Metadata" request.
2017-08-09 10:03:02 -07:00
Jonathan Rehm
aee8aad976 Add option to hide mature content from some users
Uses a configurable list of tags to denote what is mature and hides those books from the user
2017-08-08 10:38:28 -07:00
Carlos Clavero
8f5bc2a484 Merge pull request #9 from Kyosfonica/add_css_separation_for_tags_in_advance_search
Added a 5px separation for all input labels in advanced search
2017-08-01 17:53:07 +02:00
kyos
e948844ea4 Added a 5px separation for all input labels in advanced search to improve readability 2017-08-01 17:51:38 +02:00
Carlos Clavero
1500e0f54f Merge pull request #8 from Kyosfonica/add_css_separation_for_tags_in_advance_search
Added a 5px separation for all input labels in advanced search
2017-08-01 17:50:24 +02:00
kyos
b6f097f673 Added a 5px separation for all input labels in advanced search to improve readability 2017-08-01 17:49:14 +02:00
Carlos Clavero
5f78ec4e83 Merge pull request #7 from Kyosfonica/add_css_separation_for_tags_in_advance_search
Added a 5px separation for all input labels in advanced search
2017-08-01 17:46:13 +02:00
kyos
6048bf3c79 Added a 5px separation for all input labels in advanced search to improve readability 2017-07-31 20:01:55 +02:00
Carlos Clavero
80c021939e Merge pull request #6 from Kyosfonica/master
Update dev with latests changes from master
2017-07-31 18:17:59 +02:00
Carlos Clavero
5b2c18e704 Merge pull request #5 from janeczku/master
Update fork
2017-07-31 18:15:39 +02:00
kyos
51bc0e82a4 Added series and series_index metadata handler 2017-07-31 09:00:09 +02:00
Carlos Clavero
dde3b9b0e7 Merge pull request #4 from Kyosfonica/epub_tags_metadata
Added tags metadata handler for epubs
2017-07-31 08:54:38 +02:00
kyos
4bba3558b7 Added tags metadata handler for epubs 2017-07-31 08:46:29 +02:00
kyos
80873e7726 Merge remote-tracking branch 'origin/dev' into dev 2017-07-30 08:15:12 +02:00
Carlos Clavero
77b3cc2fd0 Revert "Epub series metadata" 2017-07-30 08:13:36 +02:00
kyos
4dc6150d77 Set series_index to 1 when no series_index is provided 2017-07-30 08:13:36 +02:00
kyos
27291ae96f Added new metadata getter for epub files that include series and series_index information 2017-07-30 08:13:36 +02:00
Carlos Clavero
1a11e5d6a5 Merge pull request #3 from janeczku/master
Keep fork updated
2017-07-30 08:00:45 +02:00
Carlos Clavero
fcd69661de Merge pull request #2 from Kyosfonica/revert-1-epub_series_metadata
Revert "Epub series metadata" to keep a clean clone of master
2017-07-30 07:57:50 +02:00
Carlos Clavero
742862869d Revert "Epub series metadata" 2017-07-30 07:57:10 +02:00
OzzieIsaacs
fe52de6b4b Merge remote-tracking branch 'adv/lighthouse-audit' 2017-07-30 06:59:12 +02:00
OzzieIsaacs
cd2e27d7ad Merge remote-tracking branch 'adv/previous-pagination' 2017-07-30 06:51:05 +02:00
OzzieIsaacs
f73b3a0b14 Added unidecode to required dependencys for same behavior as calibre in generating no ascii folder names (fix for #257) 2017-07-30 06:49:55 +02:00
OzzieIsaacs
82165a67a1 Merge remote-tracking branch 'mail/master' 2017-07-30 06:44:10 +02:00
OzzieIsaacs
626e2e393e Merge remote-tracking branch 'adv/edit-publish-date' 2017-07-30 06:37:18 +02:00
Carlos Clavero
063267d7e5 Merge pull request #1 from Kyosfonica/epub_series_metadata
Epub series metadata
2017-07-30 00:34:54 +02:00
kyos
aab32ceee9 Set series_index to 1 when no series_index is provided 2017-07-30 00:30:21 +02:00
kyos
83d07147e6 Added new metadata getter for epub files that include series and series_index information 2017-07-30 00:18:29 +02:00
Mikhail Akushsky
4313910ba0 Fix hmac creation in send_test_email function 2017-07-29 18:06:16 +03:00
Jonathan Rehm
ec118c2254 Move scripts to bottom of body to prevent execution from delaying DOM rendering 2017-07-28 20:07:10 -07:00
Jonathan Rehm
dde4f6afe2 Add missing label 2017-07-28 20:03:43 -07:00
Jonathan Rehm
0b47958fad Add lang attribute to html tag 2017-07-28 20:03:23 -07:00
Jonathan Rehm
c86fa268c2 Fix/remove duplicate id's 2017-07-28 20:02:53 -07:00
Jonathan Rehm
5162e2eed7 Add img alt attributes 2017-07-28 20:01:31 -07:00
Jonathan Rehm
5465b8e8b7 Add "Previous" pagination button
I imagine these buttons are still in use when JavaScript is disabled or not loading.
2017-07-28 07:38:35 -07:00
Ethan Lin
16d80dcb8e Merge pull request #11 from janeczku/master
merge
2017-07-27 09:36:57 +08:00
Jonathan Rehm
0afc8f94da Use TinyMCE's API to update the description's content 2017-07-25 13:16:12 -07:00
Jonathan Rehm
dd124ab356 Make change requested by Codacy 2017-07-23 13:36:21 -07:00
Jonathan Rehm
59afc7eb9f Make changes requested by Codacy 2017-07-23 13:36:21 -07:00