Commit Graph

646 Commits

Author SHA1 Message Date
Ozzieisaacs
34d3225984 Errorhandling edit identifier 2020-09-05 18:46:11 +02:00
blitzmann
c120138f26 Fixes for pagination ugliness for caliBlur! style 2020-08-29 20:58:30 -04:00
OzzieIsaacs
cdaad2fb4a Merge branch 'master' into Develop 2020-08-23 21:23:00 +02:00
OzzieIsaacs
843279bacb Merge remote-tracking branch 'jef/jef/download-kobo' into master 2020-08-23 21:22:44 +02:00
OzzieIsaacs
a3ae97a5a3 Fix #1574 (author name not shown in change book order in shelfs) 2020-08-22 15:37:40 +02:00
OzzieIsaacs
ed8275a20b Fix #1574 (author name not shown in change book order in shelfs) 2020-08-22 15:35:21 +02:00
OzzieIsaacs
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
OzzieIsaacs
ad144922fb Merge with master 2020-08-22 09:23:29 +02:00
OzzieIsaacs
0cc07362b8 Fix for #1573 2020-08-21 19:26:58 +02:00
Ozzie Isaacs
94ad93ebd7 Added series like custom columns #1501 2020-08-11 18:56:34 +02:00
Ozzie Isaacs
1a1d105fae Fix #1538 (Floating point numbers showing 2 decimals on details page 2020-07-23 19:31:48 +02:00
Clément Poissonnier
1ca4583896 feat(ldap): add a field that allows to override LDAP User Object Filter when a user is imported 2020-07-23 12:12:00 +02:00
Ozzie Isaacs
66acd1821d Update Gdrive integration (Error Handling on Callback and wording) 2020-07-21 18:01:38 +02:00
Jef LeCompte
711a697570
Merge remote-tracking branch 'upstream/master' into jef/download-kobo 2020-07-13 01:50:38 -04:00
Ozzieisaacs
f8139f3198 Store last selected view for sidebar (not for categories, series, publishers, ..)
Started making search paged
2020-07-11 12:09:34 +02:00
Ozzieisaacs
f80c67828b Fix #1500 (Custom ratings of increment 0.5 are allowed) 2020-07-05 14:35:57 +02:00
Ozzieisaacs
d1889a5e06 Fix #1502 (program info only visible in about section if user is admin) 2020-07-05 14:00:40 +02:00
Jef LeCompte
e048388213
feat(api): include external port option
Signed-off-by: Jef LeCompte <jeffreylec@gmail.com>
2020-07-03 12:58:58 -04:00
Michael Knepher
7e0d9fbace series_index filter to show x.0 as x 2020-06-29 23:34:26 -07:00
Ozzieisaacs
ccca5d4d1c Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
2020-06-28 12:11:46 +02:00
Ozzieisaacs
852f252d13 Prevent invalid variable
Make text in kobo_auth_screen consistent
2020-06-28 09:48:05 +02:00
Michael Knepher
67dd4a72b0 Add series info to all book "meta" displays 2020-06-26 12:26:36 -07:00
Ozzieisaacs
a0b8cc21cc Fix #1503 (js error on login screen) 2020-06-23 15:07:14 +02:00
Ozzieisaacs
2f833dc457 Fix login with remember me token 2020-06-20 13:46:12 +02:00
Ozzieisaacs
22344a3971 Improvements for delete book 2020-06-18 20:39:45 +02:00
Ozzieisaacs
8dde6ba60f UI improvements table buttons 2020-06-12 21:40:09 +02:00
Ozzieisaacs
d44f283a05 View status in books table is stored 2020-06-12 16:15:54 +02:00
Ozzieisaacs
c18d5786dd Improved validation check 2020-06-12 13:45:07 +02:00
Ozzieisaacs
f26ccfe16c Table edit: validator routine to prevent empty fields working 2020-06-11 21:36:12 +02:00
Ozzieisaacs
1c681ee378 Improvements for books table editor 2020-06-11 21:19:09 +02:00
Ozzieisaacs
94b5ec91cc Title in table translatable
Edit some elements in table possible
Checkbox state is kept over page change in book table
Fix missing div in layout
2020-06-11 08:48:23 +02:00
Ozzieisaacs
6bfbf3ee41 Update layout 2020-06-11 08:35:23 +02:00
Ozzieisaacs
7b4306b1d6 UI improvements (same colors of buttons, etc.)
Changed Editable default value
2020-06-09 20:46:02 +02:00
Ozzieisaacs
4516cc0d65 Listen button only visible if user has read permissions
Audioformat fix
Table edit functions only available if user has edit rights
2020-06-08 21:57:52 +02:00
Ozzieisaacs
308784c601 Hide listen button if user has no read/listen permissions 2020-06-08 21:56:40 +02:00
Ozzieisaacs
4038cb5b85 Internal paged Search prepared
Search for table list is working
2020-06-08 17:34:03 +02:00
Ozzieisaacs
0dd0605a1f Book list for merging 2020-06-06 21:21:10 +02:00
Ozzieisaacs
827b0c6e50 Changed pubdate to timestamp 2020-06-06 09:52:35 +02:00
Ozzieisaacs
13ae28edab Fix #1449 (Shelf download menu wasn't working for books with more than one format) 2020-06-04 20:34:31 +02:00
Ozzieisaacs
82253219e8 Fix #1449 (Shelf download menu wasn't working for books with more than one format) 2020-06-04 20:33:14 +02:00
Ozzieisaacs
94592b74a6 Merge branch 'master' into Develop 2020-06-03 20:15:55 +02:00
Ozzieisaacs
eef2112e1e #1430 (changed color of rating stars) 2020-06-03 20:14:07 +02:00
Ozzieisaacs
89223760e6 Merge branch 'master' into Develop 2020-06-01 10:58:49 +02:00
Michael Knepher
54cf3652b0 Add series name and index to book cover info 2020-05-27 21:57:59 -07:00
Ozzieisaacs
fec86c2862 Update Grid/list view of series 2020-05-26 15:19:32 +02:00
Ozzieisaacs
b852fb0e26 Merge branch 'Develop' 2020-05-25 21:30:21 +02:00
Ozzieisaacs
0fc18bf3b1 Fix for #1398 (prevent empty series_index field) 2020-05-25 19:34:31 +02:00
Ozzieisaacs
ec3a3a73ef Merge branch 'master' into Develop 2020-05-23 08:50:24 +02:00
Ozzieisaacs
087c4c5929 Merge remote-tracking branch 'opds/master' 2020-05-23 08:48:08 +02:00
Ozzieisaacs
e0ee2e0801 Merge remote-tracking branch 'typo/master' 2020-05-23 08:47:08 +02:00
Michael Knepher
c79a9e9858 Fix typo "Shelfs" to "Shelves" 2020-05-22 11:43:52 -07:00
OzzieIsaacs
b7535b9526 Merging master branch
- fix title sort function
- fix focus on search
2020-05-21 22:31:29 +02:00
Ozzieisaacs
cc856c7cd1 Merge remote-tracking branch 'search_focus/activate-search-focus-if-search-in-progress' 2020-05-21 19:18:02 +02:00
celogeek
051ffdda35
activate search focus if search in progress 2020-05-21 16:42:02 +02:00
Braincoke
22fae51c9d Fix XML parsing error when using OPDS feeds
Using the OPDS feeds with MoonReader yielded the following error:
"Error parsing XML: unbound prefix".
This was due to a missing namespace in the feed.xml template.
See https://github.com/janeczku/calibre-web/issues/1403 for more
information.
2020-05-18 20:07:02 +02:00
Ozzieisaacs
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
Ozzieisaacs
742799b4ac Added missing float custom column to search form 2020-05-17 16:10:10 +02:00
Ozzieisaacs
273572f44c Merge branch 'master' into Develop
# Conflicts:
#	cps/ub.py
2020-05-13 20:03:54 +02:00
Ozzieisaacs
0cc2b49296 Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/book_edit.html
2020-05-12 19:10:19 +02:00
Ozzieisaacs
44d5adc16f Fix #1390 2020-05-12 19:08:51 +02:00
Ozzieisaacs
f749fc641b Temporary fix for #1390 2020-05-12 17:42:24 +02:00
Ozzieisaacs
87c76c09e2 temporary fix for #1390 2020-05-12 17:41:49 +02:00
Ozzieisaacs
e787f9dd9f Automatic username (#1172) 2020-05-12 17:23:58 +02:00
Ozzieisaacs
ec7d5b17ab Added table view for books 2020-05-12 16:32:26 +02:00
Ozzieisaacs
f7269d8df2 Fix for #1385 (Private shelves are listed twice in the "Add to shelf" dropdown menu) 2020-05-12 14:39:13 +02:00
Ozzieisaacs
ce0fab8d2f Fix duplicate shelf names in "search" 2020-05-12 14:37:13 +02:00
Ozzieisaacs
308fd55483 #1141 (Setting for file size limit on email) 2020-05-09 20:29:17 +02:00
Ozzieisaacs
0a02caad04 Improvements 2020-05-09 11:01:00 +02:00
Ozzieisaacs
a437c603c6 Merge remote-tracking branch 'kepubify/Develop' into Develop
# Conflicts:
#	cps/admin.py
#	cps/helper.py
#	cps/templates/config_edit.html
#	cps/web.py
2020-05-08 14:53:21 +02:00
Ozzieisaacs
48f4b12c0e Merge branch 'master' into Develop
# Conflicts:
#	cps/editbooks.py
2020-05-06 18:47:33 +02:00
Ozzieisaacs
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
Ozzieisaacs
0adcd1b3d9 UI Improvements
Added additional restrictions to Calibre DB interface
2020-05-03 10:55:33 +02:00
Ozzieisaacs
0138ff9e16 Added additional config options 2020-05-02 10:18:01 +02:00
Ozzieisaacs
9bc085a23e Fixes for comic reader 2020-05-02 09:35:14 +02:00
Ozzieisaacs
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
Ozzieisaacs
d6f41d8dc0 Fix error 404 on reset password (Fix #1342) 2020-05-01 08:33:50 +02:00
Ozzieisaacs
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
Ozzieisaacs
01ff55c84e Removed non working filters for search 2020-04-29 17:57:53 +02:00
Ozzieisaacs
bea7223a0a Renabled cbrimage extraction (via unrar and rarfile) 2020-04-28 16:50:08 +02:00
Ozzieisaacs
44284ea5fb Merge remote-tracking branch 'opds/master'
# Conflicts:
#	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-26 18:55:23 +02:00
Ozzieisaacs
87ec44aed5 Merge remote-tracking branch 'improve_reaad/keep-focus-on-search-input' 2020-04-26 18:38:09 +02:00
Ozzieisaacs
dc46ad16ae Bugfix view shelfs on book detail page 2020-04-26 11:35:47 +02:00
Ozzieisaacs
456550a943 Bugfix view shelfs on detiled page
bugfix datetime in archive mode
2020-04-26 11:34:10 +02:00
Ozzieisaacs
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
Ozzieisaacs
e29f17ac46 Merge remote-tracking branch 'kobo/shelves' into Develop
# Conflicts:
#	cps/kobo.py
#	cps/shelf.py
2020-04-24 16:56:08 +02:00
Ozzieisaacs
24c743d23d Code cosmetics 2020-04-19 19:08:58 +02:00
celogeek
d093fbb069
Keep previous search value and focus 2020-04-19 13:12:02 +02:00
pthiben
a5fe08e84c Fix button color that now matches HEAD on master
Update name for HTML Series that changed with HEAD
2020-04-18 23:32:15 -04:00
pthiben
ea7058e896 Update button lables: it seems strange to click on 'Grid' to get the list view and vice versa 2020-04-18 23:23:56 -04:00
pthiben
2d66da3cb9 restrict button for grid<->list switch to series lists 2020-04-18 23:23:56 -04:00
pthiben
b7efbf9040 resynced grid view with list view
Changed drop-down menu to button, with same style as the other buttons. I'll probably have to make a last sync with master for final approval
2020-04-18 23:23:56 -04:00
pthiben
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
Ozzieisaacs
902685a197 Fix text in user config section (random books in Detail View) 2020-04-18 21:30:28 +02:00
Ozzieisaacs
c04b146486 Fix #1309 (fix duplicate shelf names in book detail view) 2020-04-18 21:15:02 +02:00
Ozzieisaacs
7bb5afa585 Merge remote-tracking branch 'kobo/shelves' into Develop 2020-04-18 21:12:21 +02:00
Ozzieisaacs
195845ab0c Fix 2020-04-17 18:17:35 +02:00
Ozzieisaacs
81a329f1e7 Fix for #1087 ( Caliblur! Theme button alignment) 2020-04-17 18:16:28 +02:00
Ozzieisaacs
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
Ozzieisaacs
2c42972230 Fix for #1307 (Oauth login not working)
- Changed blueprint reference in Backend from name to id, users can now again be found
- Depending on version of flask-dance the resultcode of authorized is set different to prevent redirect loop with newer versions(>1.3)
- Redirect to login page in case no user is linked to current oauth account
- Flash messages upon successfull login, successsfull linked account
2020-04-16 17:58:42 +02:00
Ozzieisaacs
a784c6bd52 Fixes for oauth login after programming basic tests 2020-04-15 22:03:21 +02:00