Merge branch 'Testing' into develop-6.7

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//conf/generate_password_hash.py=utf-8

README.md

@@ -56,7 +56,7 @@ chmod o+rw path/to/library
 
 ## Links
 
- * Report a bug: https://github.com/YunoHost-Apps/calibre_ynh/issues
+ * Report a bug: https://github.com/YunoHost-Apps/calibreweb_ynh/issues
  * App website: https://github.com/janeczku/calibre-web
  * YunoHost website: https://yunohost.org/
 
@@ -65,13 +65,13 @@ chmod o+rw path/to/library
 Developers info
 ----------------
 
-Please do your pull request to the [testing branch](https://github.com/Yunohost-Apps/calibre_ynh/tree/Testing).
+Please do your pull request to the [testing branch](https://github.com/Yunohost-Apps/calibreweb_ynh/tree/Testing).
 
 To try the testing branch, please proceed like that.
 ```
-sudo yunohost app install https://github.com/Yunohost-Apps/calibre_ynh/tree/Testing --debug
+sudo yunohost app install https://github.com/Yunohost-Apps/calibreweb_ynh/tree/Testing --debug
 or
-sudo yunohost app upgrade calibreweb -u https://github.com/Yunohost-Apps/calibre_ynh/tree/Testing --debug
+sudo yunohost app upgrade calibreweb -u https://github.com/Yunohost-Apps/calibreweb_ynh/tree/Testing --debug
 ```
 
 
@@ -90,5 +90,6 @@ sudo yunohost app upgrade calibreweb -u https://github.com/Yunohost-Apps/calibre
 - [ ] Add action to deactivate LDAP et retrieve admin password
 
 
+
 ## LICENSE
 Package and software are GPL 3.0

manifest.json

@@ -65,6 +65,7 @@
             },
             {
                 "name": "language",
+                "type": "string",
                 "optional": true,
                 "type": "string",
                 "ask": {

sources/patches/app-admin.patch

@@ -0,0 +1,11 @@
+--- a/cps/templates/admin.html	2019-02-05 21:21:55.615940498 +0100
++++ b/cps/templates/admin.html	2019-02-05 21:23:29.171461028 +0100
+@@ -129,7 +129,7 @@
+       </table>
+ 
+       <div class="hidden" id="update_error"> <span>{{update_error}}</span></div>
+-      <div class="btn btn-default" id="check_for_update">{{_('Check for update')}}</div>
++      <!--<div class="btn btn-default" id="check_for_update">{{_('Check for update')}}</div>-->
+       <div class="btn btn-default hidden" id="perform_update" data-toggle="modal" data-target="#UpdateprogressDialog">{{_('Perform Update')}}</div>
+     </div>
+   </div>