450ee43677
Additional logging for emails
2021-04-22 19:14:56 +02:00
bb4749c65b
Result for testrun
...
Added mass delete of users
refactores user table refresh
Bugfix for sorting with selected users
Bugfix delete books #1938
2021-04-21 19:23:56 +02:00
3be5b5f919
Merge remote-tracking branch 'comic_reader/master' into master
2021-04-18 12:02:21 +02:00
04ac5b69ac
Further improvements on user list #1938
2021-04-18 12:01:11 +02:00
755eb1405b
Fix progress bar direction
2021-04-18 04:25:45 +09:00
0138294b36
Fix an issue that space key doesn't work intentionally when inverting reading direction
2021-04-18 03:20:41 +09:00
c0a4addf30
Cancel button in User edit now leads to the right page back #1938
2021-04-17 18:30:55 +02:00
d32b2ca524
Prevent traceback after delete user
...
flash message in case last admin role is removed #1938
2021-04-12 19:04:27 +02:00
d0a895628e
Prevent delete of Guest user #1938
2021-04-12 18:45:44 +02:00
0f95800dde
Update sqlalchemy-utils dependency for oauth
...
Sort for state checkbox in user list and books list working
2021-04-12 18:23:25 +02:00
b6177b27f4
Sorting of users in table according to selection possible
2021-04-11 19:59:20 +02:00
ae97e87506
Delete user working from user table ( #1938 )
...
Comment in helper
2021-04-10 11:32:25 +02:00
2d73f541c0
Bugfix sort books list and user list
...
Prevent transferring password hash to client
2021-04-08 19:37:08 +02:00
7561eabe52
Implement Backend to deny editing Guest rights restriction #1938
2021-04-07 18:56:17 +02:00
78071841cc
After Deleting a book the list page is still displayed #1938
2021-04-07 18:19:48 +02:00
a43021e87c
Fix for #1938
2021-04-07 17:46:17 +02:00
8acd1f1fe4
Code refactoring and improved error handling for edit user list
...
Update teststatus
2021-04-06 17:29:42 +02:00
665210e506
Fixes for book edit with title sort and author sort
2021-04-04 14:01:06 +02:00
91b9370a21
Merge branch 'master' into development
...
# Conflicts:
# cps/static/css/libs/bootstrap-table.min.css
# cps/static/js/libs/bootstrap-table/bootstrap-table-editable.min.js
# cps/static/js/libs/bootstrap-table/bootstrap-table.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af-ZA.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar-SA.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg-BG.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca-ES.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs-CZ.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da-DK.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de-DE.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el-GR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-en-US.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-AR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CL.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-CR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-ES.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-MX.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-NI.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es-SP.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et-EE.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu-EU.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa-IR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi-FI.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-BE.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-CH.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-FR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr-LU.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he-IL.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr-HR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu-HU.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id-ID.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it-IT.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja-JP.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka-GE.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko-KR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ms-MY.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nb-NO.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-BE.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl-NL.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl-PL.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-BR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt-PT.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro-RO.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru-RU.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk-SK.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Cyrl-RS.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sr-Latn-RS.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv-SE.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-th-TH.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr-TR.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk-UA.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ur-PK.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uz-Latn-UZ.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-vi-VN.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh-TW.min.js
2021-04-02 17:13:22 +02:00
1c42c4c969
Update bootstrap-table
...
Fixes for book edit
2021-04-02 17:11:16 +02:00
6e406311c3
Fix #1928 (ldap_import_user_filter missing in to_save)
2021-04-02 08:40:29 +02:00
42a23ea23c
removed some dumb graphical inconsistencies
2021-03-29 14:35:48 -04:00
710c31d1ca
Fixed book details not loading after infinite scroll
2021-03-29 14:13:22 -04:00
f637ba4dad
Fixed border display in book details
2021-03-29 13:52:09 -04:00
a7eb547ca4
Renamed brazilian datepicker file
2021-03-27 12:40:23 +01:00
0ceb12f74f
Renamed brazilian datepicker file
2021-03-27 12:40:01 +01:00
4960624de7
Merge branch 'master' into development
2021-03-27 12:20:28 +01:00
2c92f24d89
Added Brazilian translation
2021-03-27 12:20:07 +01:00
f26beec1d3
Updated pdf reader
2021-03-25 18:57:40 +01:00
c4225e29ed
Updated pdf reader
2021-03-25 18:57:25 +01:00
f4e134742b
Fix updater
...
Bugfixes from testruns
Update Testresults
2021-03-24 18:46:03 +01:00
4664b47851
Fixed alphabetical order in list and grid view
...
Completed download section
2021-03-21 19:31:32 +01:00
10731696df
Merge branch 'development' into cover_thumb
...
# Conflicts:
# cps/admin.py
2021-03-21 07:29:35 +01:00
d3f8153b90
Merge branch 'master' into development
2021-03-20 19:34:16 +01:00
dd30ac4fbd
Added thumbnails
...
Merge remote-tracking branch 'cover/thumbnails' into development
# Conflicts:
# cps/admin.py
# cps/templates/layout.html
# cps/ub.py
# cps/web.py
Update join for sqlalchemy 1.4
2021-03-20 11:32:50 +01:00
b070ba142f
Selects are working in user management with generic confirm dialog
2021-03-16 15:52:31 +01:00
bd7c6828bf
Selects are working in user management
2021-03-16 15:03:38 +01:00
d0671ec58c
Merge branch 'master' of https://github.com/janeczku/calibre-web
2021-03-15 21:09:51 -04:00
1e40ffd1cc
merge changes
2021-03-15 21:08:41 -04:00
da2c3e9ed7
Edit user mass change checkbox working
2021-03-15 16:46:27 +01:00
f62d6abb69
Merge branch 'master' into development
...
# Conflicts:
# cps/server.py
# test/Calibre-Web TestSummary_Linux.html
2021-03-15 13:53:23 +01:00
994bc8b0e4
Removed dropdown button on single file listen/read ( Fix #1840 )
2021-03-15 09:06:40 +01:00
2451605033
Merge remote-tracking branch 'djvu/read-djvu' into master
2021-03-15 08:43:25 +01:00
4909ed5ccd
Merge remote-tracking branch 'cliblur/master' into development
...
# Conflicts:
# cps/static/css/style.css
2021-03-15 08:21:44 +01:00
bfe36d3f4a
change in color definition
...
Making color the same as in:
.container-fluid .book .meta .author, .container-fluid .book .meta .author > a {
color: hsla(0, 0%, 100%, .45)
}
2021-03-15 00:12:02 +01:00
d42bf44fad
Added same color for series name and series number
2021-03-14 23:46:33 +01:00
42707a19bd
Code cosmetics
2021-03-14 16:57:33 +01:00
0888706790
Code cosmetics
2021-03-14 16:53:01 +01:00
16453a05f8
Code cosmetics
2021-03-14 16:02:37 +01:00
2fbb7466d3
Code cosmetics
2021-03-14 15:44:40 +01:00
f29f94f45f
Code cosmetics
2021-03-14 15:41:36 +01:00
cd973868fc
Code cosmetics
2021-03-14 15:29:34 +01:00
3c35f02cac
Code cosmetics
2021-03-14 15:18:45 +01:00
22c93e2389
Merge branch 'master' into development
2021-03-14 15:06:20 +01:00
8c751eb532
Some code cosmetics
2021-03-14 15:06:09 +01:00
f52fa41439
Fix restart server
...
Some code cosmetics
2021-03-14 14:29:40 +01:00
f77d72fd86
Merge branch 'master' into development
...
# Conflicts:
# cps/static/css/style.css
2021-03-14 14:06:33 +01:00
9b80c84794
Some code cosmetics
2021-03-14 14:05:36 +01:00
725fc658f8
Some code cosmetics
2021-03-14 13:28:52 +01:00
83474da7b5
fixed being able to click through dropdown in advanced search results
2021-03-07 22:54:34 -05:00
9146e5f287
fixed advanced search mass add to shelves in caliblur
2021-03-07 19:53:54 -05:00
87d6008dfc
Fix for #1870 (png was missing in supported picture formats for comic viewer)
2021-02-27 09:23:34 +01:00
b9c0c8d2dc
Update bootstrap table to 1.18.2
2021-02-20 20:03:39 +01:00
81c30d5fd5
Add missing files from bootstrap editable
...
Added user-table single-select header for locale and default-language
2021-02-20 19:55:51 +01:00
e64a504bb1
Working Locale and default language selection in user table edit
2021-02-20 14:18:27 +01:00
a3a11bdf3f
Changed checkbox states are saved on server
2021-02-14 17:49:40 +01:00
0992bafe30
Bulk User management
2021-02-13 13:17:02 +01:00
251a77c8b4
Merge branch 'master' into Development
...
Improved packaging support
2021-02-07 08:54:29 +01:00
127bfba135
fix wrong path in get_update_status js function
2021-02-01 19:00:10 +01:00
1e5af21000
Fix #1843 (get path to script via html file and known js file instead of randomly picking last one)
2021-01-31 19:01:34 +01:00
33a0a4c173
Changed function for getting path in js file
2021-01-31 18:55:32 +01:00
eeb7974e05
User table:
...
Added button for single user edit
Added delete-trash-icon (not working)
Roles are displayed correct per user
Guest user is not visible if anonymous browsing is disabled
2021-01-31 14:54:45 +01:00
f45ea1a31c
Merge branch 'master' into development
2021-01-31 13:21:47 +01:00
a866dbaa80
Fix mimetype in comic reader
2021-01-31 11:21:09 +01:00
62447d6b89
Basic User edit in tables
2021-01-31 10:17:57 +01:00
b07a97c17e
Merge remote-tracking branch 'webp/comic-webp' into master
2021-01-30 14:56:26 +01:00
41e7d65e2a
Merge remote-tracking branch 'caliblur/master' into master
2021-01-30 14:54:16 +01:00
e6799e7a04
Improved detection of invalid email addresses ( #1831 ) upon registering
2021-01-27 19:18:40 +01:00
0f83f9992c
Added swipe support for epub reader ( fixes #925 )
...
Cleaned reader js include files
2021-01-24 14:19:46 +01:00
d2ad78eb40
Added swipe support for comic reader and txt reader ( #925 )
...
Bugfix for txt file not present on serving file
2021-01-24 11:28:17 +01:00
bc8bdfe385
Merge remote-tracking branch 'upstream/master' into master
2021-01-02 20:21:15 -06:00
682c3b834f
Revert unrar5 experiment
2021-01-02 15:32:06 +01:00
b100d198e8
Merge branch 'master' into Develop
...
Remove relate to referrer for tag/custom column allow / deny dialog
2020-12-31 15:12:37 +01:00
7849f2fb4b
Remove relate to referrer for tag/custom column allow / deny dialog
2020-12-31 15:08:56 +01:00
d33b0587cb
Advanced search tags are now multiselects ( #1240 )
2020-12-28 13:44:17 +01:00
7e0ed537b7
irst steps Advanced search with mulitselects
2020-12-27 19:12:27 +01:00
1a83bddf8c
Merge bubble read status
2020-12-27 13:53:21 +01:00
27dcbcd7e1
paged and orderable shelfs
...
Fix for non writable settings db with non configured calibre-web
2020-12-27 10:24:51 +01:00
f6538b6110
New delete user button
...
refactored confirm dialogs
2020-12-21 19:50:12 +01:00
9a20faf640
Revert accidentally deleted lines in caliblur! theme
2020-12-17 19:10:02 +01:00
123493ee59
Fix #1255 (support webp in comic viewer)
2020-12-17 23:54:06 +08:00
2d498dd138
Preserve publisher links, and fix formatting in custom columns for CaliBlur theme.
2020-12-16 00:58:45 -06:00
d64009e23e
preparation for filtered and ordered shelfs
2020-12-13 13:54:09 +01:00
fd8b642d64
Code cosmetics css
...
Code cosmetics js
Fixes for links with remote_login
2020-12-13 09:53:18 +01:00
9130aceb5a
Changed admin page
2020-12-11 20:55:09 +01:00
b8336c03c3
Changed admin page
2020-12-11 20:54:24 +01:00
d3986ca14a
Server side file browser
2020-12-11 08:37:37 +01:00
2508c1abb2
Started implement server side filechooser
2020-12-10 14:41:45 +01:00
cb1ebc1cd0
Drag 'n drop for files
2020-12-01 13:52:41 +01:00
eed2f0a430
Merge remote-tracking branch 'comic/master' into master
2020-11-22 08:45:02 +01:00
31fe8cd263
Improvement for #1721 (shrinked generic cover)
2020-11-22 08:28:52 +01:00
42c13ae135
Fix for #1718 (fetch of metadata from google without cover leads to exception)
2020-11-20 20:35:07 +01:00
2343c79126
Use djvu_html5 to read djvu format in browser
2020-11-15 13:19:37 +01:00
09a5a69f86
djvu_html5 0.3.0-beta1 static assets
2020-11-15 13:09:32 +01:00
f2c52fd278
Update jszip to 3.5.0. Update epub.js to 0.3.88.
...
Fixes several problems when viewing EPUBs in a browser, for example when jumping to a certain chapter in the table of contents does not work.
2020-11-09 15:47:27 +01:00
87d60308f2
Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master
2020-11-08 19:29:10 +01:00
e99dd3310c
Exchanged douban apikey
2020-11-07 12:18:33 +01:00
bc52f90ed4
Merge remote-tracking branch 'upstream/master'
2020-11-02 11:36:45 -05:00
ff88e68904
Add missing locale files
2020-10-31 19:58:22 +01:00
37a80b935d
Added greek translation
2020-10-31 19:20:00 +01:00
754b9832e9
fix height container
2020-10-17 13:30:19 +02:00
097ac879ea
render read
2020-10-17 13:24:46 +02:00
da9dfd166d
fixed incorrect cover widths
2020-10-16 13:51:48 -04:00
1be07a42df
Flex display to fix columns issue
2020-10-16 13:41:48 -04:00
2ff286b672
natural solution, pagination is changing on new page
2020-10-16 00:43:57 +03:00
9adcfa99f4
trigger infinite scroll script only on templates where .load-more class is present
2020-10-11 22:35:56 +03:00
e723aaa5f6
fix for history state (+1 not needed)
2020-10-11 21:56:49 +03:00
f574f8faf0
better js check
2020-10-10 18:34:55 +03:00
cedfa90d76
fix for #981
2020-10-10 17:51:46 +03:00
f1e6f6e505
fixes for #1560
2020-10-10 14:58:06 +03:00
52489a484a
Merge remote-tracking branch 'Knepherbird/master' into master
...
# Conflicts:
# cps/jinjia.py
# cps/templates/detail.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/web.py
2020-10-10 12:47:49 +02:00
e1d5c2c578
Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master
2020-10-10 12:29:30 +02:00
49f49632ad
Renamed CalibLur.css
2020-10-10 12:22:52 +02:00
6dadc6fb1e
same fix but hopefully better
2020-10-10 13:15:02 +03:00
a58a2f5fe4
Added missing file for tr locale of datepicker
2020-10-10 11:53:15 +02:00
c33c6bbff0
fix for #1594
2020-10-10 12:39:52 +03:00
20ffa325d3
Fix #1642
2020-10-10 10:53:08 +02:00
6e6f144b7a
Paginated search and advanced search
...
Wraparound on books list deactivated
2020-10-04 19:23:06 +02:00
cc0b0196f4
Store UI settings in flask session for guest user
2020-09-27 19:12:10 +02:00
497fbdcdfc
Save view settings
2020-09-27 12:37:41 +02:00
861f1b2ca3
Merge branch 'master' into Develop
...
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
2020-09-27 08:54:32 +02:00
a6002a2c6c
1622_updated_css
2020-09-20 23:41:20 -04:00
7ba014ba49
Fix "is not a valid language" on upload of comic books
...
Fix metadata excration of comic books
updated bootstrap table
updated handling of upload formats restrictions
2020-09-20 15:05:52 +02:00
98494c610a
Merge branch 'master' into Develop
2020-08-30 08:31:35 +02:00
28733179d2
Merge remote-tracking branch 'caliblur/editMetaFix' into Develop
2020-08-30 08:25:17 +02:00
3e378bd665
Some more clean up
2020-08-29 21:04:49 -04:00
c120138f26
Fixes for pagination ugliness for caliBlur! style
2020-08-29 20:58:30 -04:00
31b20362ec
caliBlur! style: Fixes issue with edit metadata button not getting styled correctly
2020-08-29 18:45:23 -04:00
4c38b0ab10
Prepare for save name sort order
2020-08-23 10:56:00 +02:00
f2add3f788
Migration of view settings working in User database
...
Book Merge gives now feedback on what is done
2020-08-22 10:27:09 +02:00
4c6f5096be
get metadata, typo, if no result from google, it will display the noresult msg, regardless of the others results.
2020-08-01 15:12:20 +08:00
f8139f3198
Store last selected view for sidebar (not for categories, series, publishers, ..)
...
Started making search paged
2020-07-11 12:09:34 +02:00
2f833dc457
Fix login with remember me token
2020-06-20 13:46:12 +02:00
22344a3971
Improvements for delete book
2020-06-18 20:39:45 +02:00
8dde6ba60f
UI improvements table buttons
2020-06-12 21:40:09 +02:00
d44f283a05
View status in books table is stored
2020-06-12 16:15:54 +02:00
c18d5786dd
Improved validation check
2020-06-12 13:45:07 +02:00
f26ccfe16c
Table edit: validator routine to prevent empty fields working
2020-06-11 21:36:12 +02:00
1c681ee378
Improvements for books table editor
2020-06-11 21:19:09 +02:00
7b4306b1d6
UI improvements (same colors of buttons, etc.)
...
Changed Editable default value
2020-06-09 20:46:02 +02:00
4038cb5b85
Internal paged Search prepared
...
Search for table list is working
2020-06-08 17:34:03 +02:00
0dd0605a1f
Book list for merging
2020-06-06 21:21:10 +02:00
94592b74a6
Merge branch 'master' into Develop
2020-06-03 20:15:55 +02:00
eef2112e1e
#1430 (changed color of rating stars)
2020-06-03 20:14:07 +02:00
54cf3652b0
Add series name and index to book cover info
2020-05-27 21:57:59 -07:00
b852fb0e26
Merge branch 'Develop'
2020-05-25 21:30:21 +02:00
5cceeb6ef2
Fix: correct property typo
...
Correcting 'box-sizeing' to 'box-sizing'
2020-05-19 13:10:25 -07:00
38c28f4358
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
# cps/constants.py
# cps/static/css/caliBlur.min.css
# cps/uploader.py
2020-05-17 16:22:58 +02:00
e325c3dbf6
fixed div selection in caliBlur.js
2020-05-14 12:29:52 +02:00
b3fef625a8
Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view
2020-05-14 11:57:38 +02:00
e787f9dd9f
Automatic username ( #1172 )
2020-05-12 17:23:58 +02:00
f5e12328dc
Fix for #1382 (Restrictions with "&" in it can't be deleted)
2020-05-11 18:41:34 +02:00
486c0f2937
Fix for #1382 (Restrictions with "&" in it can't be deleted)
2020-05-11 18:41:16 +02:00
16a3deec2c
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
2020-05-10 19:24:55 +02:00
fe88010a72
Merge remote-tracking branch 'sec_fixes/minor_fix_caliblur'
2020-05-10 14:57:19 +02:00
99ae4be2c2
Merge remote-tracking branch 'sec_fixes/bump_jquery'
2020-05-10 10:43:20 +02:00
30c9aa3df9
Minor fixes to caliBlur.js
...
- Add alt attributes to images
- Fix a broken tag
2020-05-09 17:07:22 +02:00
688184e255
Bump jquery
2020-05-09 17:00:03 +02:00
264b4b669e
Bump underscorejs version from 1.9.1 to 1.12.2
2020-05-09 16:54:21 +02:00
e1439b529b
Config Options for limiting email size, change username to e-mail adress, use kepubify
...
Added work on Unrar5 decompression (breaks comic reader totally)
2020-05-04 18:19:30 +02:00
fcefd8031a
Fix #985 (png and webp are extracted as cover files from comic files)
2020-05-02 11:24:30 +02:00
0a92d79ec0
Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop
...
# Conflicts:
# cps/static/css/style.css
# cps/ub.py
# cps/web.py
2020-05-01 17:25:13 +02:00
b160a8de0b
Merge branch 'master' into Develop
...
# Conflicts:
# cps/__init__.py
# cps/comic.py
# cps/editbooks.py
# cps/helper.py
# cps/kobo.py
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/ub.py
# cps/uploader.py
# cps/web.py
2020-04-30 18:08:28 +02:00
806a5f209f
Fix two minor xss
2020-04-29 11:33:33 +02:00
ce6b689147
Code cosmetics
2020-04-27 20:22:55 +02:00
2d92818613
Code cosmetics
2020-04-27 20:01:13 +02:00
b4d7733e0a
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/list.html
# cps/translations/cs/LC_MESSAGES/messages.po
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fi/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/hu/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# messages.pot
2020-04-25 20:06:25 +02:00
063ee5e855
Merge remote-tracking branch 'remove_usage_local_var_undeclared'
...
Code cosmetics
2020-04-24 21:05:56 +02:00
d8bf540db2
Remove an undeclared and useless local variable
2020-04-24 18:04:27 +02:00
b90048d72e
fix badge color on grid view to match list view
2020-04-18 23:41:01 -04:00
38bb10d36b
apply suggestion from @OzzieIsaacs that fixes sorting with caliblur theme.
...
@OzzieIsaacs : I have no idea what the consequences are about this CSS style change. I played around in caliblur and did not notice anything weird, but I'm no calibre-web hardcore user
2020-04-18 23:23:56 -04:00
58943bb156
update filtering so that it also uses isotope everywhere.
...
Fix asc/desc that did not match list view
2020-04-18 23:23:56 -04:00
5222e157cb
fix standard theme badges so that they stand on top left corner instead of top right: each element's width in the list seems to be double the size of the image, so right alignment gets tricky. https://github.com/janeczku/calibre-web/pull/986#issuecomment-517999218 suggests top-left alignment which does make a lot of sense. Using this for now. Maintainer might have a better idea to fix it
2020-04-18 23:23:55 -04:00
1e3a948977
fix linter errors
...
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
2020-04-18 23:22:51 -04:00
9e159ed5ab
Merge branch 'master' into Develop
...
# Conflicts:
# cps/config_sql.py
# cps/ub.py
# cps/web.py
2020-04-16 20:12:27 +02:00
a194216568
Merge remote-tracking branch 'origin/master'
2020-04-05 19:10:27 +02:00
8bee424cc0
Merge remote-tracking branch 'ldap/master'
...
# Conflicts:
# cps/admin.py
# cps/templates/admin.html
# cps/templates/config_edit.html
# cps/web.py
2020-04-05 17:31:41 +02:00
587174b771
Fix #1272
2020-04-04 08:53:22 +02:00
5864637f1c
Merge branch 'master' into Develop
2020-04-04 06:22:17 +02:00
da42c51af2
Updated to exclude new modules
2020-03-31 08:42:08 -07:00
f6c04b9b84
Merge branch 'master' into Develop
2020-03-29 16:48:56 +02:00
4eacb21259
Update updater
...
Update change logfile
code cosmetics js files
2020-03-29 16:44:24 +02:00
f243515261
Fix #950 (sorting order in comics)
2020-03-14 07:15:15 +01:00
09e7d76c6f
Merge remote-tracking branch 'kobo_book_delete' into Develop
...
# Conflicts:
# cps/kobo.py
# cps/services/SyncToken.py
# cps/templates/book_edit.html
# cps/ub.py
2020-03-12 20:43:39 +01:00
a0535aa3db
Add ComicVine Api
...
Fetching Metadata for comicBook with ComicVine API
2020-02-28 16:04:07 +01:00
146068c936
Merge branch 'Develop'
...
# Conflicts:
# cps/db.py
# cps/templates/user_edit.html
2020-02-23 13:15:30 +01:00
3b8c5ef21a
Merge remote-tracking branch 'get_metadata/patch-1'
...
Fix #1210 Load multiple authors correct via get metadata
2020-02-23 13:14:12 +01:00
7c89f0b5b9
Merge with branch develop
...
Release version
2020-02-23 09:08:01 +01:00
371097eb4d
Update Updater
2020-02-23 07:54:58 +01:00
29cb8bfec4
Fix #1210
2020-02-21 18:25:02 -03:00
Ozzie Isaacs