9d5e9b28ae
Enabled editing of "number" custom_columns in books list
3 years ago
cea10d3945
Merge remote-tracking branch 'comic_sort/comic_reader_sort'
3 years ago
fe21d15194
Merge remote-tracking branch 'cn/fix/bootstrap-table-locale'
...
# Conflicts:
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-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-ro.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk.min.js
# cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh_Hans_CN.min.js
3 years ago
6e5d9d7657
Bugfix toggle readstatus in modal dialog
3 years ago
e58eb8dac1
Show checkbox from boolean custom columns on details page with caliblur theme
3 years ago
f3efef1f60
Fix stored css bug in all typeahead functions (update typeahead -> bugfix typeahead)
3 years ago
bad4c01474
Fix stored css bug in all typeahead functions (update typeahead -> bugfix typeahead)
3 years ago
aca5324914
Bugfix arrange shelf
...
Bugfix remote login
Bugfix perform Update
3 years ago
50919d4721
Added handling for missing flask-wtf dependency
...
Added CSRF protection (via flask-wtf)
Moved upload function to js file
Fixed error page in case of csrf failure
3 years ago
1c15e10ac0
Improved csrf protection for remote login
3 years ago
52be2ad4a2
Improved DJVU Reader
3 years ago
43fdef5e53
Improved textreader
3 years ago
ba40c6693e
Merge remote-tracking branch 'filepicker/fix-filemodal'
3 years ago
f6561456f7
New sort for Comic Reader
3 years ago
deb91996a8
fix:bootstrap-table locale
...
Add data-locale in table tag
Add bootstrap-table-locale-all-min-js
Remove bootstrap-table locale dir
3 years ago
46205a1f83
Made long running tasks cancellable. Added cancel button to cancellable tasks in the task list. Added APP_MODE env variable for determining if the app is running in development, test, or production.
3 years ago
781ca7a3f3
Fix filemodal file selection dialog
3 years ago
04a5db5c1d
Resolve merge conflicts
3 years ago
e3db2796c9
Merge branch 'master' into Develop
...
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
3 years ago
ceffa3a108
Removed xss on shelf add/remove action
3 years ago
c0a06eec46
Removed xss on shelf add/remove action
3 years ago
d8bad7394a
Merge remote-tracking branch 'caliblur/master'
3 years ago
10e212fcde
Merge branch 'master' into Develop
3 years ago
1fa267ce1b
Final fix for escaping html special chars in tables
3 years ago
d4cfad6363
Fixed several text problems from tasks
...
Fixed task update
3 years ago
3946ef8f0d
Merge branch 'master' into Develop
...
# Conflicts:
# cps.py
# cps/web.py
3 years ago
91e6d94c83
Improved displaying of username and task title in tasks
3 years ago
e615073893
Add all html special characters to the escaped characters in bootstrap table
3 years ago
d25cfb7499
Fix for #2097 (Quotes are now handled properly in UI-editable tables)
3 years ago
a35c635987
Update python metadata search
3 years ago
aa9fdd2ada
Merge branch 'master' into Develop
3 years ago
b05c17b8bb
Fixed book covers being too wide in search/shelves/discover on mobile
3 years ago
bce69b2dfc
Add pdf.js font file
3 years ago
e68a3f18fa
Merge branch 'master' into Develop
3 years ago
1534827ad7
With merge button disabled it's no longer possible to open merge dialog
3 years ago
b36422bc05
Update list/grid button action (reverse proxy problem)
3 years ago
ceec1051d5
Added option to save books with no nenglish characters
...
Imporvements on metadata search
3 years ago
81ccc11c9c
fixed dropdowns going off screen in caliblur
3 years ago
702e96ddd6
Update load metadata
3 years ago
53603f79bd
Get_meta button unfocused on return to edit books
3 years ago
302679719d
Merge branch 'master' into Develop
...
# Conflicts:
# cps/admin.py
# cps/converter.py
# cps/subproc_wrapper.py
# test/Calibre-Web TestSummary_Linux.html
3 years ago
53dae32897
Fix multiple messages on windows after change config with reboot
3 years ago
3b81ea37f4
Fix entries of user table are visible if database has no tags
3 years ago
15ec6bec95
fix #2014 (User menu dropdown in caliblur is tiny and presents scrollbars)
...
Fix display of nonexistent series_index
Fix caliblur add-to-shelf
3 years ago
ec7803fa76
Update python search Metadata
3 years ago
aa2d3d2b36
Update python search Metadata
3 years ago
d5e9cdc5b7
Search Metadata improvements
3 years ago
1a0bf45c34
Check file/folder permissions before update
3 years ago
67874e07b6
Fix routes for reverse proxy
3 years ago
8c0aa79f78
Fix #1915 (more than 10 books at a time are displayed in books table)
3 years ago
84e1c6e809
Fix for #2004 (pdf viewer buttons missing in safari)
3 years ago
aadd6fd7e0
Possible fix for #2003 (Calibre theme download icon broken)
3 years ago
a79600c81f
Mass change book title and author ( fix #1996 )
3 years ago
b0f48b7f00
Merge branch 'master' into Develop
3 years ago
94b07d05c1
First half of #1996 (editing single books)
3 years ago
4392fec7f5
Added fullscreen cover viewer
3 years ago
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)
3 years ago
98fc1ee0a7
Comic reader code cleaning
3 years ago
010c0bfc7d
Improved error handling for content too long
3 years ago
251780bed6
Added google scholar as metadata provider
3 years ago
decc2a9c79
Merge branch 'master' into Develop
3 years ago
b62d84424e
Merge remote-tracking branch 'comic/comic_viewer_changes' into master
3 years ago
3e5c944365
Changed backend for comic reader, now supports rar5
3 years ago
d95838309e
Added config option for shelf sync behavior
3 years ago
b009dfe4ee
Always use bootstrap datepicker
3 years ago
eba94f430c
Updated js libs
3 years ago
6bc426b21d
Fix edit_books.js
3 years ago
6bf360fbfb
Added "comments" type to supported custom columns
3 years ago
b0cc52e0aa
Enable custom column datetime (adv. search not working yet) #1984
3 years ago
9ef705650b
Access pages with stored order per default ( #1987 )
...
Fix for toggle-text of enable-sort button on shelf page
3 years ago
b97373bf37
Improved error handling for disapearing custom column linked to read status
3 years ago
64696fe973
Bugfixes edit user list ( Fix #1938 )
3 years ago
de7f039b99
Update list user editor ( #1938 )
3 years ago
144c2b5fc7
Renaming ipadress - ip_address
...
Bugfix user table
Result testrun
Updated cn translation
3 years ago
7da40d1c2e
Added option to remove Y-Scrollbar and reset page scroll
3 years ago
97e4707f72
user list column value and tags editor ( #1938 )
...
Bugfixes for massedit in user list (#1938 )
Changed no. of debug messages
3 years ago
450ee43677
Additional logging for emails
3 years ago
bb4749c65b
Result for testrun
...
Added mass delete of users
refactores user table refresh
Bugfix for sorting with selected users
Bugfix delete books #1938
3 years ago
3be5b5f919
Merge remote-tracking branch 'comic_reader/master' into master
3 years ago
04ac5b69ac
Further improvements on user list #1938
3 years ago
755eb1405b
Fix progress bar direction
3 years ago
0138294b36
Fix an issue that space key doesn't work intentionally when inverting reading direction
3 years ago
c0a4addf30
Cancel button in User edit now leads to the right page back #1938
3 years ago
d32b2ca524
Prevent traceback after delete user
...
flash message in case last admin role is removed #1938
3 years ago
d0a895628e
Prevent delete of Guest user #1938
3 years ago
0f95800dde
Update sqlalchemy-utils dependency for oauth
...
Sort for state checkbox in user list and books list working
3 years ago
b6177b27f4
Sorting of users in table according to selection possible
3 years ago
ae97e87506
Delete user working from user table ( #1938 )
...
Comment in helper
3 years ago
2d73f541c0
Bugfix sort books list and user list
...
Prevent transferring password hash to client
3 years ago
7561eabe52
Implement Backend to deny editing Guest rights restriction #1938
3 years ago
78071841cc
After Deleting a book the list page is still displayed #1938
3 years ago
a43021e87c
Fix for #1938
3 years ago
8acd1f1fe4
Code refactoring and improved error handling for edit user list
...
Update teststatus
3 years ago
665210e506
Fixes for book edit with title sort and author sort
3 years ago
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
3 years ago
1c42c4c969
Update bootstrap-table
...
Fixes for book edit
3 years ago
6e406311c3
Fix #1928 (ldap_import_user_filter missing in to_save)
3 years ago
42a23ea23c
removed some dumb graphical inconsistencies
3 years ago
710c31d1ca
Fixed book details not loading after infinite scroll
3 years ago
f637ba4dad
Fixed border display in book details
3 years ago
a7eb547ca4
Renamed brazilian datepicker file
3 years ago
0ceb12f74f
Renamed brazilian datepicker file
3 years ago
4960624de7
Merge branch 'master' into development
3 years ago
2c92f24d89
Added Brazilian translation
3 years ago
f26beec1d3
Updated pdf reader
3 years ago
c4225e29ed
Updated pdf reader
3 years ago
f4e134742b
Fix updater
...
Bugfixes from testruns
Update Testresults
3 years ago
4664b47851
Fixed alphabetical order in list and grid view
...
Completed download section
3 years ago
10731696df
Merge branch 'development' into cover_thumb
...
# Conflicts:
# cps/admin.py
3 years ago
d3f8153b90
Merge branch 'master' into development
3 years ago
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
3 years ago
b070ba142f
Selects are working in user management with generic confirm dialog
3 years ago
bd7c6828bf
Selects are working in user management
3 years ago
d0671ec58c
Merge branch 'master' of https://github.com/janeczku/calibre-web
3 years ago
1e40ffd1cc
merge changes
3 years ago
da2c3e9ed7
Edit user mass change checkbox working
3 years ago
f62d6abb69
Merge branch 'master' into development
...
# Conflicts:
# cps/server.py
# test/Calibre-Web TestSummary_Linux.html
3 years ago
994bc8b0e4
Removed dropdown button on single file listen/read ( Fix #1840 )
3 years ago
2451605033
Merge remote-tracking branch 'djvu/read-djvu' into master
3 years ago
4909ed5ccd
Merge remote-tracking branch 'cliblur/master' into development
...
# Conflicts:
# cps/static/css/style.css
3 years ago
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)
}
3 years ago
d42bf44fad
Added same color for series name and series number
3 years ago
42707a19bd
Code cosmetics
3 years ago
0888706790
Code cosmetics
3 years ago
16453a05f8
Code cosmetics
3 years ago
2fbb7466d3
Code cosmetics
3 years ago
f29f94f45f
Code cosmetics
3 years ago
cd973868fc
Code cosmetics
3 years ago
3c35f02cac
Code cosmetics
3 years ago
22c93e2389
Merge branch 'master' into development
3 years ago
8c751eb532
Some code cosmetics
3 years ago
f52fa41439
Fix restart server
...
Some code cosmetics
3 years ago
f77d72fd86
Merge branch 'master' into development
...
# Conflicts:
# cps/static/css/style.css
3 years ago
9b80c84794
Some code cosmetics
3 years ago
725fc658f8
Some code cosmetics
3 years ago
83474da7b5
fixed being able to click through dropdown in advanced search results
3 years ago
9146e5f287
fixed advanced search mass add to shelves in caliblur
3 years ago
87d6008dfc
Fix for #1870 (png was missing in supported picture formats for comic viewer)
3 years ago
b9c0c8d2dc
Update bootstrap table to 1.18.2
3 years ago
81c30d5fd5
Add missing files from bootstrap editable
...
Added user-table single-select header for locale and default-language
3 years ago
e64a504bb1
Working Locale and default language selection in user table edit
3 years ago
a3a11bdf3f
Changed checkbox states are saved on server
3 years ago
0992bafe30
Bulk User management
3 years ago
251a77c8b4
Merge branch 'master' into Development
...
Improved packaging support
3 years ago
127bfba135
fix wrong path in get_update_status js function
3 years ago
1e5af21000
Fix #1843 (get path to script via html file and known js file instead of randomly picking last one)
3 years ago
33a0a4c173
Changed function for getting path in js file
3 years ago
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
3 years ago
f45ea1a31c
Merge branch 'master' into development
3 years ago
a866dbaa80
Fix mimetype in comic reader
3 years ago
62447d6b89
Basic User edit in tables
3 years ago
b07a97c17e
Merge remote-tracking branch 'webp/comic-webp' into master
3 years ago
41e7d65e2a
Merge remote-tracking branch 'caliblur/master' into master
3 years ago
e6799e7a04
Improved detection of invalid email addresses ( #1831 ) upon registering
3 years ago
0f83f9992c
Added swipe support for epub reader ( fixes #925 )
...
Cleaned reader js include files
3 years ago
d2ad78eb40
Added swipe support for comic reader and txt reader ( #925 )
...
Bugfix for txt file not present on serving file
3 years ago
bc8bdfe385
Merge remote-tracking branch 'upstream/master' into master
3 years ago
682c3b834f
Revert unrar5 experiment
3 years ago
b100d198e8
Merge branch 'master' into Develop
...
Remove relate to referrer for tag/custom column allow / deny dialog
3 years ago
7849f2fb4b
Remove relate to referrer for tag/custom column allow / deny dialog
3 years ago
d33b0587cb
Advanced search tags are now multiselects ( #1240 )
3 years ago
7e0ed537b7
irst steps Advanced search with mulitselects
3 years ago
1a83bddf8c
Merge bubble read status
3 years ago
27dcbcd7e1
paged and orderable shelfs
...
Fix for non writable settings db with non configured calibre-web
3 years ago
f6538b6110
New delete user button
...
refactored confirm dialogs
3 years ago
9a20faf640
Revert accidentally deleted lines in caliblur! theme
3 years ago
123493ee59
Fix #1255 (support webp in comic viewer)
3 years ago
2d498dd138
Preserve publisher links, and fix formatting in custom columns for CaliBlur theme.
3 years ago
d64009e23e
preparation for filtered and ordered shelfs
4 years ago
fd8b642d64
Code cosmetics css
...
Code cosmetics js
Fixes for links with remote_login
4 years ago
9130aceb5a
Changed admin page
4 years ago
b8336c03c3
Changed admin page
4 years ago
d3986ca14a
Server side file browser
4 years ago
2508c1abb2
Started implement server side filechooser
4 years ago
cb1ebc1cd0
Drag 'n drop for files
4 years ago
eed2f0a430
Merge remote-tracking branch 'comic/master' into master
4 years ago
31fe8cd263
Improvement for #1721 (shrinked generic cover)
4 years ago
42c13ae135
Fix for #1718 (fetch of metadata from google without cover leads to exception)
4 years ago
2343c79126
Use djvu_html5 to read djvu format in browser
4 years ago
09a5a69f86
djvu_html5 0.3.0-beta1 static assets
4 years ago
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.
4 years ago
87d60308f2
Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master
4 years ago
e99dd3310c
Exchanged douban apikey
4 years ago
bc52f90ed4
Merge remote-tracking branch 'upstream/master'
4 years ago
ff88e68904
Add missing locale files
4 years ago
37a80b935d
Added greek translation
4 years ago
754b9832e9
fix height container
4 years ago
097ac879ea
render read
4 years ago
da9dfd166d
fixed incorrect cover widths
4 years ago
1be07a42df
Flex display to fix columns issue
4 years ago
2ff286b672
natural solution, pagination is changing on new page
4 years ago
9adcfa99f4
trigger infinite scroll script only on templates where .load-more class is present
4 years ago
e723aaa5f6
fix for history state (+1 not needed)
4 years ago
f574f8faf0
better js check
4 years ago
cedfa90d76
fix for #981
4 years ago
f1e6f6e505
fixes for #1560
4 years ago
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
4 years ago
e1d5c2c578
Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master
4 years ago
49f49632ad
Renamed CalibLur.css
4 years ago
6dadc6fb1e
same fix but hopefully better
4 years ago
Ozzie Isaacs
GarcaMan
xlivevil
mmonkey
Anatolii Fetisov
cbartondock
BuildTools
subdiox
Northguy
andylizi
verglor
Markus Gruber
celogeek
Ghighi