Commit Graph
237 Commits
Author SHA1 Message Date
Ozzieisaacs a0be02e687 Ldap working 2019-02-17 09:09:20 +01:00
Ozzieisaacs 37007dafee Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
2019-02-16 10:17:46 +01:00
Ozzieisaacs 56826f67fc progressbar during upload thanks to jim3ma 2019-02-16 10:05:51 +01:00
lorek123 d508b909d1 update js and css libs, especially to fix xss in Jquery and Bootstrap 2019-02-10 18:17:33 +01:00
Ozzieisaacs f5235b1d4c Uploader progress bar
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
2019-02-09 18:46:41 +01:00
Ozzieisaacs 5971194678 Merge remote-tracking branch 'audiobook/Branch_c27805b'
# Conflicts:
#	cps/templates/detail.html
#	cps/web.py
#	readme.md
2019-01-27 11:14:38 +01:00
Ozzieisaacs 9128615f48 Fix #424
Fix #425
2019-01-26 09:43:17 +01:00
Ozzieisaacs ec81a3cd92 Fix Authors page pagination
Update infinite scroll plugin
2019-01-25 21:58:19 +01:00
Ozzieisaacs 836c6fd245 Updated translations
Added license texts in flies
2019-01-20 19:37:45 +01:00
Ozzieisaacs bacb6fb561 New updater with default setting -> only stable releases #653 2019-01-20 17:46:26 +01:00
leram84andMatt ae55dd6c27 Update caliBlur.min.css 2019-01-18 14:17:17 -08:00
Matt 7341819606 Revert "Update caliBlur.min.css"
This reverts commit df8806e182.
2019-01-18 14:11:39 -08:00
Matt 68f143dc30 Revert "Create dark-reader.css"
This reverts commit a69e43922a.
2019-01-18 14:11:31 -08:00
Matt 9ee4b7f77c Revert "Not ready for commit"
This reverts commit 6a2ebba85b.
2019-01-18 14:11:17 -08:00
hexethandGitHub 6a2ebba85b Not ready for commit 2019-01-18 14:06:39 -08:00
leram84andGitHub a69e43922a Create dark-reader.css 2019-01-18 16:43:36 -05:00
leram84andGitHub df8806e182 Update caliBlur.min.css 2019-01-18 14:43:04 -05:00
hexethandGitHub 83a905bfe1 Don't remove the dropdown toggle 2019-01-18 11:35:13 -08:00
Matt e01872fc79 Revert "Update caliBlur.min.css"
This reverts commit 2b7b55846b.
2019-01-18 11:27:19 -08:00
leram84andGitHub 2b7b55846b Update caliBlur.min.css 2019-01-18 14:22:48 -05:00
hexethandGitHub c0792b7225 Add .sendtokindle-drop to click-off 2019-01-18 11:10:54 -08:00
Matt 8825352af6 Revert "Add sendtokindle-drop to click-off array"
This reverts commit d83ba315f0.
2019-01-18 11:09:26 -08:00
hexethandGitHub d83ba315f0 Add sendtokindle-drop to click-off array 2019-01-18 11:07:50 -08:00
hexethandGitHub 16e23cb1fe Fix upload tooltip not appearing 2019-01-18 11:04:28 -08:00
leram84andGitHub df2b1ba09d fix for send button dropdown 2019-01-18 14:01:51 -05:00
hexethandGitHub 9a12e60b1c Toggle for dropdown 2019-01-18 11:00:55 -08:00
hexethandGitHub c620453ebf UL positioning 2019-01-18 10:57:42 -08:00
hexethandGitHub 4988e3b631 add tooltip and move UL higher in DOM 2019-01-18 10:50:29 -08:00
Ozzie IsaacsandGitHub 9e5fa45df7 Removed unnecessary wait message 2019-01-16 17:50:51 +01:00
leram84andOzzie Isaacs d5ff3b6a0b smtp setup page (#774)
fix for https://github.com/janeczku/calibre-web/issues/773
2019-01-15 21:20:03 +01:00
Ozzie IsaacsandGitHub cc618ecee7 Fix Limiting domains (related to #773) 2019-01-15 20:08:47 +01:00
Ozzieisaacs 32568c9009 Update testing
Update custom columns unicode enums
2019-01-14 20:27:53 +01:00
Ozzieisaacs c527d1f49a Merge remote-tracking branch 'theme/master'
Added translations for some tooltips
Updated translations
2019-01-12 09:01:08 +01:00
hexethandGitHub 4ace3a5e27 test 2019-01-11 14:13:09 -08:00
leram84andGitHub db83fb3bd7 minified 2019-01-11 16:49:45 -05:00
leram84andGitHub f897491070 Update caliBlur.min.css 2019-01-11 16:30:01 -05:00
hexethandGitHub 2ab10bb070 Update caliBlur.js 2019-01-11 13:23:12 -08:00
hexethandGitHub 9c75eb7016 Update caliBlur.js 2019-01-11 13:07:18 -08:00
hexethandGitHub 6c37aafae9 Update caliBlur.js 2019-01-11 13:05:22 -08:00
hexethandGitHub 550262e651 Further fix 2019-01-11 12:44:29 -08:00
hexethandGitHub edb4cedc65 Update about page to target new body class 2019-01-11 12:43:00 -08:00
hexethandGitHub 40e45c7272 Add files via upload 2019-01-11 11:23:49 -08:00
hexethandGitHub 7032f311d5 Update caliBlur.js 2019-01-11 10:54:21 -08:00
Ozzieisaacs 66fcd71685 Merge remote-tracking branch 'origin/master' 2019-01-11 08:36:51 +01:00
hexethandOzzie Isaacs e1205b75cd Fix targeting for language support (#761)
Some other languages use 'description :' instead of 'description:' .
2019-01-10 18:26:34 +01:00
Ozzieisaacs d5a913e195 Merge remote-tracking branch 'origin/master' 2019-01-10 11:03:48 +01:00
leram84andOzzie Isaacs dba5680121 1.0 for the merge (#758)
Includes many bugfixes, and multi language support updates. I'm making all changes as an unminified addendum to the file for readability, but we can go back and minify it with the rest when everything is smooth.
2019-01-10 09:25:18 +01:00
Ozzieisaacs b03f4bb5e5 Merge remote-tracking branch 'origin/master' 2019-01-09 13:03:55 +01:00
hexethandOzzie Isaacs 418e98d1f8 update .published-date to .publishing-date (#756) 2019-01-08 18:06:29 +01:00
Ozzieisaacs 3b40c83314 Code cleaning
code cosmetics
deleted unused file caliBlur
fixed custom error page
2019-01-08 07:58:22 +01:00