changes made for 46 release

sheltermanager · Jan 30, 2023 · 0341597 · 0341597
1 parent 8d91031
commit 0341597
Show file tree

Hide file tree

Showing 43 changed files with 80 additions and 83 deletions.
diff --git a/RELEASE b/RELEASE
@@ -18,10 +18,6 @@
 
 *. Mark milestone complete in github
 
-*. Update twitter and facebook
-
-*. Update manual with lulu
-
 *. Commit any changes made so far
 
 *. run "git tag -f -a 41" to create a tag for the release number, followed by "git push && git push -f --tags" 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-46u
+46
diff --git a/doc/manual/conf.py b/doc/manual/conf.py
@@ -52,9 +52,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '46u'
+version = '46'
 # The full version, including alpha/beta/rc tags.
-release = '46u'
+release = '46'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/install/deb/makedeb.sh b/install/deb/makedeb.sh
@@ -79,6 +79,7 @@ python3 cron.py all
 chmod +x sheltermanager3/etc/cron.daily/sheltermanager3
 
 # Build the deb package
-dpkg -b sheltermanager3 sheltermanager3_`cat ../../VERSION`_all.deb
-
+# NOTE: -Zxz is specify xz compression for compatibility with Debian systems, Ubuntu uses zstd compression by default
+PKGNAME=sheltermanager3_`cat ../../VERSION`_all.deb
+dpkg-deb -b -Zxz sheltermanager3 $PKGNAME
 
diff --git a/scripts/asm3.conf.example b/scripts/asm3.conf.example
@@ -53,7 +53,7 @@ session_debug = false
 # The host/port that memcached is running on if it is to be used.
 # If memcache is not available, an in memory dictionary will be
 # used instead.
-# memcached_server = 127.0.0.1:11211
+memcached_server = 127.0.0.1:11211
 
 # Where to store media files.
 # database - media files are base64 encoded in the dbfs.content db column

diff --git a/src/asm3/i18n.py b/src/asm3/i18n.py
@@ -7,8 +7,8 @@
 from asm3.locales import *
 
 
-VERSION = "46u [Sat 28 Jan 11:06:09 GMT 2023]"
-BUILD = "01281106"
+VERSION = "46 [Mon 30 Jan 11:02:07 GMT 2023]"
+BUILD = "01301102"
 
 DMY = ( "%d/%m/%Y", "%d/%m/%y" )
 HDMY = ( "%d-%m-%Y", "%d-%m-%y" )

diff --git a/src/static/pages/manual/_static/documentation_options.js b/src/static/pages/manual/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '46u',
+    VERSION: '46',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

diff --git a/src/static/pages/manual/accounts.html b/src/static/pages/manual/accounts.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Accounts &mdash; ASM 46u documentation</title>
+  <title>Accounts &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/animalcontrol.html b/src/static/pages/manual/animalcontrol.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Animal Control &mdash; ASM 46u documentation</title>
+  <title>Animal Control &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/animals.html b/src/static/pages/manual/animals.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Animals &mdash; ASM 46u documentation</title>
+  <title>Animals &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/clinic.html b/src/static/pages/manual/clinic.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Clinic &mdash; ASM 46u documentation</title>
+  <title>Clinic &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/configuration.html b/src/static/pages/manual/configuration.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Configuration &mdash; ASM 46u documentation</title>
+  <title>Configuration &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/csvimportfields.html b/src/static/pages/manual/csvimportfields.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Appendix: CSV file import fields &mdash; ASM 46u documentation</title>
+  <title>Appendix: CSV file import fields &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/databasetables.html b/src/static/pages/manual/databasetables.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Appendix: Database Tables/Columns &mdash; ASM 46u documentation</title>
+  <title>Appendix: Database Tables/Columns &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/documents.html b/src/static/pages/manual/documents.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Documents &mdash; ASM 46u documentation</title>
+  <title>Documents &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/faq.html b/src/static/pages/manual/faq.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Appendix: Frequently Asked Questions &mdash; ASM 46u documentation</title>
+  <title>Appendix: Frequently Asked Questions &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/foreword.html b/src/static/pages/manual/foreword.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Foreword &mdash; ASM 46u documentation</title>
+  <title>Foreword &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/generaldiary.html b/src/static/pages/manual/generaldiary.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>General Diary &mdash; ASM 46u documentation</title>
+  <title>General Diary &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/genindex.html b/src/static/pages/manual/genindex.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Index &mdash; ASM 46u documentation</title>
+  <title>Index &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -24,7 +24,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/gettingstarted.html b/src/static/pages/manual/gettingstarted.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Getting Started &mdash; ASM 46u documentation</title>
+  <title>Getting Started &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/index.html b/src/static/pages/manual/index.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Index &mdash; ASM 46u documentation</title>
+  <title>Index &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -25,7 +25,7 @@
             <a href="#" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/litters.html b/src/static/pages/manual/litters.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Litters &mdash; ASM 46u documentation</title>
+  <title>Litters &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/lostandfound.html b/src/static/pages/manual/lostandfound.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Lost and Found &mdash; ASM 46u documentation</title>
+  <title>Lost and Found &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/mailmerge.html b/src/static/pages/manual/mailmerge.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Mail Merge Sources &mdash; ASM 46u documentation</title>
+  <title>Mail Merge Sources &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">

diff --git a/src/static/pages/manual/mobile.html b/src/static/pages/manual/mobile.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Mobile Interface &mdash; ASM 46u documentation</title>
+  <title>Mobile Interface &mdash; ASM 46 documentation</title>
       <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
       <link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
 
@@ -26,7 +26,7 @@
             <a href="index.html" class="icon icon-home"> ASM
           </a>
               <div class="version">
-                46u
+                46
               </div>
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="search.html" method="get">