Ozzie Isaacs
8c0aa79f78
Fix #1915 (more than 10 books at a time are displayed in books table)
2021-06-05 18:41:52 +02:00
Ozzie Isaacs
84e1c6e809
Fix for #2004 (pdf viewer buttons missing in safari)
2021-06-05 08:08:08 +02:00
Ozzie Isaacs
aadd6fd7e0
Possible fix for #2003 (Calibre theme download icon broken)
2021-06-03 12:35:09 +02:00
Ozzie Isaacs
a79600c81f
Mass change book title and author ( fix #1996 )
2021-05-28 18:22:29 +02:00
Ozzie Isaacs
b0f48b7f00
Merge branch 'master' into Develop
2021-05-26 19:58:10 +02:00
Ozzie Isaacs
94b07d05c1
First half of #1996 (editing single books)
2021-05-26 19:57:58 +02:00
Ozzie Isaacs
4392fec7f5
Added fullscreen cover viewer
2021-05-26 19:40:41 +02:00
Ozzie Isaacs
a47d6cd937
Fix confirm dialog database change
...
Gdrive setup basically working again
Moved basicconfig behind login
Database setup separated from other setup
Config page is using ajax (flask >2 and slow computers)
2021-05-26 14:50:44 +02:00
Ozzie Isaacs
98fc1ee0a7
Comic reader code cleaning
2021-05-22 19:28:30 +02:00
Ozzie Isaacs
010c0bfc7d
Improved error handling for content too long
2021-05-16 14:07:16 +02:00
Ozzie Isaacs
251780bed6
Added google scholar as metadata provider
2021-05-16 13:24:42 +02:00
Ozzie Isaacs
decc2a9c79
Merge branch 'master' into Develop
2021-05-16 13:19:38 +02:00
Ozzie Isaacs
b62d84424e
Merge remote-tracking branch 'comic/comic_viewer_changes' into master
2021-05-16 13:19:28 +02:00
Ozzie Isaacs
3e5c944365
Changed backend for comic reader, now supports rar5
2021-05-16 08:35:20 +02:00
Ozzie Isaacs
d95838309e
Added config option for shelf sync behavior
2021-05-15 10:45:51 +02:00
Ozzie Isaacs
b009dfe4ee
Always use bootstrap datepicker
2021-05-14 19:58:06 +02:00
Ozzie Isaacs
eba94f430c
Updated js libs
2021-05-14 09:29:24 +02:00
Ozzie Isaacs
6bc426b21d
Fix edit_books.js
2021-05-14 07:29:48 +02:00
Ozzie Isaacs
6bf360fbfb
Added "comments" type to supported custom columns
2021-05-13 14:00:01 +02:00
Ozzie Isaacs
b0cc52e0aa
Enable custom column datetime (adv. search not working yet) #1984
2021-05-13 10:39:36 +02:00
Ozzie Isaacs
9ef705650b
Access pages with stored order per default ( #1987 )
...
Fix for toggle-text of enable-sort button on shelf page
2021-05-13 09:41:27 +02:00
Ozzieisaacs
b97373bf37
Improved error handling for disapearing custom column linked to read status
2021-05-01 18:42:57 +02:00
Ozzie Isaacs
64696fe973
Bugfixes edit user list ( Fix #1938 )
2021-05-01 08:36:39 +02:00
Ozzie Isaacs
de7f039b99
Update list user editor ( #1938 )
2021-04-27 20:01:17 +02:00
Ozzie Isaacs
144c2b5fc7
Renaming ipadress - ip_address
...
Bugfix user table
Result testrun
Updated cn translation
2021-04-26 19:03:01 +02:00
GarcaMan
7da40d1c2e
Added option to remove Y-Scrollbar and reset page scroll
2021-04-25 19:59:53 +00:00
Ozzie Isaacs
97e4707f72
user list column value and tags editor ( #1938 )
...
Bugfixes for massedit in user list (#1938 )
Changed no. of debug messages
2021-04-25 10:43:01 +02:00
Ozzie Isaacs
450ee43677
Additional logging for emails
2021-04-22 19:14:56 +02:00
Ozzie Isaacs
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
Ozzie Isaacs
3be5b5f919
Merge remote-tracking branch 'comic_reader/master' into master
2021-04-18 12:02:21 +02:00
Ozzie Isaacs
04ac5b69ac
Further improvements on user list #1938
2021-04-18 12:01:11 +02:00
BuildTools
755eb1405b
Fix progress bar direction
2021-04-18 04:25:45 +09:00
subdiox
0138294b36
Fix an issue that space key doesn't work intentionally when inverting reading direction
2021-04-18 03:20:41 +09:00
Ozzie Isaacs
c0a4addf30
Cancel button in User edit now leads to the right page back #1938
2021-04-17 18:30:55 +02:00
Ozzie Isaacs
d32b2ca524
Prevent traceback after delete user
...
flash message in case last admin role is removed #1938
2021-04-12 19:04:27 +02:00
Ozzie Isaacs
d0a895628e
Prevent delete of Guest user #1938
2021-04-12 18:45:44 +02:00
Ozzie Isaacs
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
Ozzieisaacs
b6177b27f4
Sorting of users in table according to selection possible
2021-04-11 19:59:20 +02:00
Ozzieisaacs
ae97e87506
Delete user working from user table ( #1938 )
...
Comment in helper
2021-04-10 11:32:25 +02:00
Ozzie Isaacs
2d73f541c0
Bugfix sort books list and user list
...
Prevent transferring password hash to client
2021-04-08 19:37:08 +02:00
Ozzie Isaacs
7561eabe52
Implement Backend to deny editing Guest rights restriction #1938
2021-04-07 18:56:17 +02:00
Ozzie Isaacs
78071841cc
After Deleting a book the list page is still displayed #1938
2021-04-07 18:19:48 +02:00
Ozzie Isaacs
a43021e87c
Fix for #1938
2021-04-07 17:46:17 +02:00
Ozzie Isaacs
8acd1f1fe4
Code refactoring and improved error handling for edit user list
...
Update teststatus
2021-04-06 17:29:42 +02:00
Ozzie Isaacs
665210e506
Fixes for book edit with title sort and author sort
2021-04-04 14:01:06 +02:00
Ozzie Isaacs
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
Ozzie Isaacs
1c42c4c969
Update bootstrap-table
...
Fixes for book edit
2021-04-02 17:11:16 +02:00
Ozzie Isaacs
6e406311c3
Fix #1928 (ldap_import_user_filter missing in to_save)
2021-04-02 08:40:29 +02:00
cbartondock
42a23ea23c
removed some dumb graphical inconsistencies
2021-03-29 14:35:48 -04:00
cbartondock
710c31d1ca
Fixed book details not loading after infinite scroll
2021-03-29 14:13:22 -04:00
cbartondock
f637ba4dad
Fixed border display in book details
2021-03-29 13:52:09 -04:00
Ozzie Isaacs
a7eb547ca4
Renamed brazilian datepicker file
2021-03-27 12:40:23 +01:00
Ozzie Isaacs
0ceb12f74f
Renamed brazilian datepicker file
2021-03-27 12:40:01 +01:00
Ozzie Isaacs
4960624de7
Merge branch 'master' into development
2021-03-27 12:20:28 +01:00
Ozzie Isaacs
2c92f24d89
Added Brazilian translation
2021-03-27 12:20:07 +01:00
Ozzie Isaacs
f26beec1d3
Updated pdf reader
2021-03-25 18:57:40 +01:00
Ozzie Isaacs
c4225e29ed
Updated pdf reader
2021-03-25 18:57:25 +01:00
Ozzie Isaacs
f4e134742b
Fix updater
...
Bugfixes from testruns
Update Testresults
2021-03-24 18:46:03 +01:00
Ozzie Isaacs
4664b47851
Fixed alphabetical order in list and grid view
...
Completed download section
2021-03-21 19:31:32 +01:00
Ozzie Isaacs
d3f8153b90
Merge branch 'master' into development
2021-03-20 19:34:16 +01:00
Ozzie Isaacs
b070ba142f
Selects are working in user management with generic confirm dialog
2021-03-16 15:52:31 +01:00
Ozzie Isaacs
bd7c6828bf
Selects are working in user management
2021-03-16 15:03:38 +01:00
cbartondock
d0671ec58c
Merge branch 'master' of https://github.com/janeczku/calibre-web
2021-03-15 21:09:51 -04:00
cbartondock
1e40ffd1cc
merge changes
2021-03-15 21:08:41 -04:00
Ozzie Isaacs
da2c3e9ed7
Edit user mass change checkbox working
2021-03-15 16:46:27 +01:00
Ozzie Isaacs
f62d6abb69
Merge branch 'master' into development
...
# Conflicts:
# cps/server.py
# test/Calibre-Web TestSummary_Linux.html
2021-03-15 13:53:23 +01:00
Ozzie Isaacs
994bc8b0e4
Removed dropdown button on single file listen/read ( Fix #1840 )
2021-03-15 09:06:40 +01:00
Ozzie Isaacs
2451605033
Merge remote-tracking branch 'djvu/read-djvu' into master
2021-03-15 08:43:25 +01:00
Ozzie Isaacs
4909ed5ccd
Merge remote-tracking branch 'cliblur/master' into development
...
# Conflicts:
# cps/static/css/style.css
2021-03-15 08:21:44 +01:00
Northguy
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
Northguy
d42bf44fad
Added same color for series name and series number
2021-03-14 23:46:33 +01:00
Ozzie Isaacs
42707a19bd
Code cosmetics
2021-03-14 16:57:33 +01:00
Ozzie Isaacs
0888706790
Code cosmetics
2021-03-14 16:53:01 +01:00
Ozzie Isaacs
16453a05f8
Code cosmetics
2021-03-14 16:02:37 +01:00
Ozzie Isaacs
2fbb7466d3
Code cosmetics
2021-03-14 15:44:40 +01:00
Ozzie Isaacs
f29f94f45f
Code cosmetics
2021-03-14 15:41:36 +01:00
Ozzie Isaacs
cd973868fc
Code cosmetics
2021-03-14 15:29:34 +01:00
Ozzie Isaacs
3c35f02cac
Code cosmetics
2021-03-14 15:18:45 +01:00
Ozzie Isaacs
22c93e2389
Merge branch 'master' into development
2021-03-14 15:06:20 +01:00
Ozzie Isaacs
8c751eb532
Some code cosmetics
2021-03-14 15:06:09 +01:00
Ozzie Isaacs
f52fa41439
Fix restart server
...
Some code cosmetics
2021-03-14 14:29:40 +01:00
Ozzie Isaacs
f77d72fd86
Merge branch 'master' into development
...
# Conflicts:
# cps/static/css/style.css
2021-03-14 14:06:33 +01:00
Ozzie Isaacs
9b80c84794
Some code cosmetics
2021-03-14 14:05:36 +01:00
Ozzie Isaacs
725fc658f8
Some code cosmetics
2021-03-14 13:28:52 +01:00
cbartondock
83474da7b5
fixed being able to click through dropdown in advanced search results
2021-03-07 22:54:34 -05:00
cbartondock
9146e5f287
fixed advanced search mass add to shelves in caliblur
2021-03-07 19:53:54 -05:00
Ozzie Isaacs
87d6008dfc
Fix for #1870 (png was missing in supported picture formats for comic viewer)
2021-02-27 09:23:34 +01:00
Ozzie Isaacs
b9c0c8d2dc
Update bootstrap table to 1.18.2
2021-02-20 20:03:39 +01:00
Ozzie Isaacs
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
Ozzie Isaacs
e64a504bb1
Working Locale and default language selection in user table edit
2021-02-20 14:18:27 +01:00
Ozzie Isaacs
a3a11bdf3f
Changed checkbox states are saved on server
2021-02-14 17:49:40 +01:00
Ozzie Isaacs
0992bafe30
Bulk User management
2021-02-13 13:17:02 +01:00
Ozzie Isaacs
251a77c8b4
Merge branch 'master' into Development
...
Improved packaging support
2021-02-07 08:54:29 +01:00
Ozzie Isaacs
127bfba135
fix wrong path in get_update_status js function
2021-02-01 19:00:10 +01:00
Ozzie Isaacs
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
Ozzie Isaacs
33a0a4c173
Changed function for getting path in js file
2021-01-31 18:55:32 +01:00
Ozzie Isaacs
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
Ozzie Isaacs
f45ea1a31c
Merge branch 'master' into development
2021-01-31 13:21:47 +01:00
Ozzie Isaacs
a866dbaa80
Fix mimetype in comic reader
2021-01-31 11:21:09 +01:00
Ozzie Isaacs
62447d6b89
Basic User edit in tables
2021-01-31 10:17:57 +01:00
Ozzie Isaacs
b07a97c17e
Merge remote-tracking branch 'webp/comic-webp' into master
2021-01-30 14:56:26 +01:00
Ozzie Isaacs
41e7d65e2a
Merge remote-tracking branch 'caliblur/master' into master
2021-01-30 14:54:16 +01:00
Ozzie Isaacs
e6799e7a04
Improved detection of invalid email addresses ( #1831 ) upon registering
2021-01-27 19:18:40 +01:00
Ozzie Isaacs
0f83f9992c
Added swipe support for epub reader ( fixes #925 )
...
Cleaned reader js include files
2021-01-24 14:19:46 +01:00
Ozzie Isaacs
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
mmonkey
bc8bdfe385
Merge remote-tracking branch 'upstream/master' into master
2021-01-02 20:21:15 -06:00
OzzieIsaacs
682c3b834f
Revert unrar5 experiment
2021-01-02 15:32:06 +01:00
Ozzieisaacs
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
Ozzieisaacs
7849f2fb4b
Remove relate to referrer for tag/custom column allow / deny dialog
2020-12-31 15:08:56 +01:00
Ozzieisaacs
d33b0587cb
Advanced search tags are now multiselects ( #1240 )
2020-12-28 13:44:17 +01:00
Ozzieisaacs
7e0ed537b7
irst steps Advanced search with mulitselects
2020-12-27 19:12:27 +01:00
Ozzieisaacs
1a83bddf8c
Merge bubble read status
2020-12-27 13:53:21 +01:00
Ozzieisaacs
27dcbcd7e1
paged and orderable shelfs
...
Fix for non writable settings db with non configured calibre-web
2020-12-27 10:24:51 +01:00
Ozzieisaacs
f6538b6110
New delete user button
...
refactored confirm dialogs
2020-12-21 19:50:12 +01:00
Ozzieisaacs
9a20faf640
Revert accidentally deleted lines in caliblur! theme
2020-12-17 19:10:02 +01:00
andylizi
123493ee59
Fix #1255 (support webp in comic viewer)
2020-12-17 23:54:06 +08:00
mmonkey
2d498dd138
Preserve publisher links, and fix formatting in custom columns for CaliBlur theme.
2020-12-16 00:58:45 -06:00
Ozzieisaacs
d64009e23e
preparation for filtered and ordered shelfs
2020-12-13 13:54:09 +01:00
Ozzieisaacs
fd8b642d64
Code cosmetics css
...
Code cosmetics js
Fixes for links with remote_login
2020-12-13 09:53:18 +01:00
Ozzieisaacs
9130aceb5a
Changed admin page
2020-12-11 20:55:09 +01:00
Ozzieisaacs
b8336c03c3
Changed admin page
2020-12-11 20:54:24 +01:00
Ozzieisaacs
d3986ca14a
Server side file browser
2020-12-11 08:37:37 +01:00
Ozzieisaacs
2508c1abb2
Started implement server side filechooser
2020-12-10 14:41:45 +01:00
Ozzieisaacs
cb1ebc1cd0
Drag 'n drop for files
2020-12-01 13:52:41 +01:00
Ozzieisaacs
eed2f0a430
Merge remote-tracking branch 'comic/master' into master
2020-11-22 08:45:02 +01:00
Ozzieisaacs
31fe8cd263
Improvement for #1721 (shrinked generic cover)
2020-11-22 08:28:52 +01:00
Ozzieisaacs
42c13ae135
Fix for #1718 (fetch of metadata from google without cover leads to exception)
2020-11-20 20:35:07 +01:00
verglor
2343c79126
Use djvu_html5 to read djvu format in browser
2020-11-15 13:19:37 +01:00
verglor
09a5a69f86
djvu_html5 0.3.0-beta1 static assets
2020-11-15 13:09:32 +01:00
Markus Gruber
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
Ozzieisaacs
87d60308f2
Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master
2020-11-08 19:29:10 +01:00
Ozzieisaacs
e99dd3310c
Exchanged douban apikey
2020-11-07 12:18:33 +01:00
cbartondock
bc52f90ed4
Merge remote-tracking branch 'upstream/master'
2020-11-02 11:36:45 -05:00
Ozzieisaacs
ff88e68904
Add missing locale files
2020-10-31 19:58:22 +01:00
Ozzieisaacs
37a80b935d
Added greek translation
2020-10-31 19:20:00 +01:00
celogeek
754b9832e9
fix height container
2020-10-17 13:30:19 +02:00
celogeek
097ac879ea
render read
2020-10-17 13:24:46 +02:00
cbartondock
da9dfd166d
fixed incorrect cover widths
2020-10-16 13:51:48 -04:00
cbartondock
1be07a42df
Flex display to fix columns issue
2020-10-16 13:41:48 -04:00
Ghighi
2ff286b672
natural solution, pagination is changing on new page
2020-10-16 00:43:57 +03:00
Ghighi Eftimie
9adcfa99f4
trigger infinite scroll script only on templates where .load-more class is present
2020-10-11 22:35:56 +03:00
Ghighi Eftimie
e723aaa5f6
fix for history state (+1 not needed)
2020-10-11 21:56:49 +03:00
Ghighi Eftimie
f574f8faf0
better js check
2020-10-10 18:34:55 +03:00
Ghighi Eftimie
cedfa90d76
fix for #981
2020-10-10 17:51:46 +03:00
Ghighi Eftimie
f1e6f6e505
fixes for #1560
2020-10-10 14:58:06 +03:00
Ozzieisaacs
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
Ozzieisaacs
e1d5c2c578
Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master
2020-10-10 12:29:30 +02:00
Ozzieisaacs
49f49632ad
Renamed CalibLur.css
2020-10-10 12:22:52 +02:00
Ghighi Eftimie
6dadc6fb1e
same fix but hopefully better
2020-10-10 13:15:02 +03:00
Ozzieisaacs
a58a2f5fe4
Added missing file for tr locale of datepicker
2020-10-10 11:53:15 +02:00