Merge pull request #1382 from liveblog/hg/update-plans-data

Update plans data and bump version
liveblog · May 6, 2024 · 9235669 · 9235669
2 parents a2db33d + 3869d5c
commit 9235669
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [Fork](https://github.com/liveblog/liveblog) •
 [License](https://github.com/liveblog/liveblog/blob/master/LICENSE) •
 [Documentation](http://sourcefabric.booktype.pro/live-blog-30-for-journalists/what-is-live-blog/) •
-*Version 3.85.1-rc1*
+*Version 3.86.0-rc1*
 
 [![Liveblog CI](https://github.com/liveblog/liveblog/workflows/Liveblog%20CI/badge.svg)](https://github.com/liveblog/liveblog/actions)
 

diff --git a/client/app/index.html b/client/app/index.html
@@ -52,10 +52,10 @@ <h3 class="modal__heading" translate>About</h3>
             <div class="about-page-text">
                 <p>
                     <div style="font-weight: 700" translate>
-                        Live Blog 3.85.1-rc1
+                        Live Blog 3.86.0-rc1
                     </div>
                     <div translate>
-                        Released on Feb 13, 2024
+                        Released on May 06, 2024
                     </div>
                 </p>
                 <p translate>

diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "liveblog-client",
-  "version": "3.85.1-rc1",
+  "version": "3.86.0-rc1",
   "repository": {
     "type": "git",
     "url": "git@github.com:liveblog/liveblog.git"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "liveblog",
-  "version": "3.85.1-rc1",
+  "version": "3.86.0-rc1",
   "repository": {
     "type": "git",
     "url": "git@github.com:liveblog/liveblog.git"

diff --git a/server/liveblog/auth/db.py b/server/liveblog/auth/db.py
@@ -24,7 +24,7 @@ def _check_subscription_level(self):
             [(AGENT_MODILE_IOS in user_agent), (AGENT_MOBILE_ANDROID in user_agent)]
         )
 
-        if not app.features.is_enabled("mobile-app") and is_mobile_agent:
+        if not app.features.is_enabled("mobile_app") and is_mobile_agent:
             raise SuperdeskApiError.forbiddenError(
                 message="Liveblog mobile can not access on this subscription"
             )

diff --git a/server/liveblog/prepopulate/data_init/instance_settings.json b/server/liveblog/prepopulate/data_init/instance_settings.json
@@ -1,31 +1,43 @@
 [
     {
         "settings": {
-            "one-time-event": {
+            "liveblog-go": {
                 "features": {
-                    "syndication": false,
+                    "syndication": true,
                     "marketplace": false,
-                    "theme_styles": false
+                    "theme_styles": false,
+                    "custom_themes": false,
+                    "change_blog_theme": false,
+                    "freetypes_manager": false,
+                    "archived_blogs_available": false,
+                    "mobile_app": false
                 },
                 "limits": {
                     "blogs": 1,
                     "themes": 1,
-                    "blog_members": 2
+                    "blog_members": 1,
+                    "custom_themes": 0
                 }
             },
             "uni": {
                 "features": {
                     "syndication": true,
                     "marketplace": false,
-                    "theme_styles": false
+                    "theme_styles": false,
+                    "custom_themes": false,
+                    "change_blog_theme": false,
+                    "freetypes_manager": false,
+                    "archived_blogs_available": false,
+                    "mobile_app": false
                 },
                 "limits": {
-                    "blogs": 1,
-                    "themes": 2,
-                    "blog_members": 3
+                    "blogs": 2,
+                    "themes": 1,
+                    "blog_members": 1,
+                    "custom_themes": 0
                 }
             },
-            "solo": {
+            "solo-mobile": {
                 "features": {
                     "syndication": true,
                     "marketplace": false,
@@ -34,7 +46,7 @@
                     "change_blog_theme": false,
                     "freetypes_manager": false,
                     "archived_blogs_available": false,
-                    "mobile-app": false
+                    "mobile_app": true
                 },
                 "limits": {
                     "blogs": 1,
@@ -52,7 +64,7 @@
                     "change_blog_theme": true,
                     "freetypes_manager": true,
                     "archived_blogs_available": true,
-                    "mobile-app": true
+                    "mobile_app": true
                 },
                 "limits": {
                     "blogs": 3,

diff --git a/server/version.py b/server/version.py
@@ -1 +1 @@
-__version__ = "3.85.1-rc1"
+__version__ = "3.86.0-rc1"