Merge pull request #14 from aXenDeveloper/10014

Build 1.2.2 version
aXenDeveloper · Jun 7, 2021 · 480493e · 480493e
2 parents e860c59 + 7c1e33e
commit 480493e
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 15 deletions.
diff --git a/data/acpmenu.json b/data/acpmenu.json
@@ -1,18 +1,16 @@
 {
     "servers": {
-        "settings": {
-            "tab": "axenserverlist",
-            "controller": "settings",
-            "do": "",
-            "restriction": "settings_manage",
-            "subcontrollers": ""
-        },
         "servers": {
-            "tab": "axenserverlist",
+            "tab": "community",
             "controller": "servers",
             "do": "",
-            "restriction": "servers_manage",
-            "subcontrollers": ""
+            "restriction": "servers_manage"
+        },
+        "settings": {
+            "tab": "community",
+            "controller": "settings",
+            "do": "",
+            "restriction": "settings_manage"
         }
     }
 }
diff --git a/data/javascript.xml b/data/javascript.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <javascript app="axenserverlist">
- <file javascript_app="axenserverlist" javascript_location="front" javascript_path="controllers/axenserverlist" javascript_name="aXenServerList.js" javascript_type="controller" javascript_version="10013" javascript_position="1000050"><![CDATA[const COOKIE_AXENSERVERLIST_HIDE = 'aXenServerList_widget_hide';
+ <file javascript_app="axenserverlist" javascript_location="front" javascript_path="controllers/axenserverlist" javascript_name="aXenServerList.js" javascript_type="controller" javascript_version="10014" javascript_position="1000050"><![CDATA[const COOKIE_AXENSERVERLIST_HIDE = 'aXenServerList_widget_hide';
 const COOKIE_AXENSERVERLIST_SCROLL = 'aXenServerList_widget_scroll';
 const COOKIE_AXENSERVERLIST_FULLWIDTH = 'aXenServerList_widget_fullWidth';
 

diff --git a/data/lang.xml b/data/lang.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language>
- <app key="axenserverlist" version="10013">
+ <app key="axenserverlist" version="10014">
   <word key="__app_axenserverlist" js="0">(aXen) Advanced Server List</word>
   <word key="menutab__axenserverlist_icon" js="0">server</word>
-  <word key="menutab__axenserverlist" js="0">Advanced Server List</word>
   <word key="menu__axenserverlist_servers" js="0">Servers management</word>
   <word key="menu__axenserverlist_servers_settings" js="0">Settings</word>
   <word key="menu__axenserverlist_servers_servers" js="0">Servers</word>

diff --git a/data/versions.json b/data/versions.json
@@ -12,5 +12,6 @@
     "10010": "1.1.0",
     "10011": "1.1.1",
     "10012": "1.2.0",
-    "10013": "1.2.1"
+    "10013": "1.2.1",
+    "10014": "1.2.2"
 }
diff --git a/dev/lang.php b/dev/lang.php
@@ -3,7 +3,6 @@
 $lang = array(
 	'__app_axenserverlist'	=>  '(aXen) Advanced Server List',
 	'menutab__axenserverlist_icon' => 'server',
-	'menutab__axenserverlist' => 'Advanced Server List',
 	'menu__axenserverlist_servers' => 'Servers management',
 	'menu__axenserverlist_servers_settings' => 'Settings',
 	'menu__axenserverlist_servers_servers' => 'Servers',

diff --git a/setup/upg_10014/data.json b/setup/upg_10014/data.json
@@ -0,0 +1,24 @@
+{
+    "id": 10014,
+    "name": "1.2.2",
+    "steps": {
+        "queries": false,
+        "lang": true,
+        "theme": true,
+        "themeSettings": false,
+        "javascript": true,
+        "emailTemplates": false,
+        "hooks": false,
+        "acpSearchKeywords": false,
+        "settings": false,
+        "tasks": false,
+        "modules": false,
+        "widgets": false,
+        "whatsnew": false,
+        "customOptions": false,
+        "customRoutines": false
+    },
+    "forceMainUpgrader": false,
+    "forceManualDownloadNoCiC": false,
+    "forceManualDownloadCiC": false
+}
diff --git a/setup/upg_10014/javascript.json b/setup/upg_10014/javascript.json
@@ -0,0 +1,15 @@
+{
+    "files": {
+        "added": [],
+        "edited": [
+            "axenserverlist\/front\/controllers\/axenserverlist\/aXenServerList.js",
+            "axenserverlist\/front\/controllers\/axenserverlist\/aXenServerList.js"
+        ],
+        "removed": []
+    },
+    "orders": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}
diff --git a/setup/upg_10014/lang.json b/setup/upg_10014/lang.json
@@ -0,0 +1,14 @@
+{
+    "normal": {
+        "added": [],
+        "edited": [],
+        "removed": [
+            "menutab__axenserverlist"
+        ]
+    },
+    "js": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}
diff --git a/setup/upg_10014/theme.json b/setup/upg_10014/theme.json
@@ -0,0 +1,35 @@
+{
+    "html": {
+        "added": [],
+        "edited": [
+            "front\/pages\/aXenServerListPage",
+            "front\/servers\/debugTotal",
+            "front\/servers\/footer",
+            "front\/servers\/more",
+            "front\/servers\/row",
+            "front\/servers\/title",
+            "front\/widgets\/aXenServerListWidget",
+            "front\/pages\/aXenServerListPage",
+            "front\/servers\/debugTotal",
+            "front\/servers\/footer",
+            "front\/servers\/more",
+            "front\/servers\/row",
+            "front\/servers\/title",
+            "front\/widgets\/aXenServerListWidget"
+        ],
+        "removed": []
+    },
+    "css": {
+        "added": [],
+        "edited": [
+            "front\/widget.css",
+            "front\/widget.css"
+        ],
+        "removed": []
+    },
+    "resources": {
+        "added": [],
+        "edited": [],
+        "removed": []
+    }
+}