Merge branch 'staging' into laravel

public/app/calendar/history.html

@@ -75,6 +75,24 @@
 						description:
 							"online class + online translation; word by word teaching get more and more acknowledge",
 					},
+                    {
+						name: "Nissaya digitization project start",
+						label: "2022 Feb.",
+						description:
+							"Nissaya digitization project start",
+					},
+                    {
+						name: "wikipāli 2.0 rebuild start",
+						label: "2022 Oct.",
+						description:
+							"Rebuild frontend and backend by popular framework.Further and user-friendly.",
+					},
+                    {
+						name: "wikipāli 2.0 rebuild test",
+						label: "2023 Jun.",
+						description:
+							"Rebuild test.",
+					},
 				],
 			},
 		],

public/app/config.sample.php

@@ -1,11 +1,13 @@
-<?php 
+<?php
 
 
 #域名设置
 
 define("RPC_SERVER","https://rpc.wikipali.org");
 define("ASSETS_SERVER","https://assets-hk.wikipali.org");
-
+define("HELP_SERVER","https://help-hk.wikipali.org");
+define("GRAMMAR_SERVER","https://grammar-hk.wikipali.org");
+define('APP_KEY','base64:QHiqLcUthgo1V7Hj4UyoFxpCr1UmKJQu4cUr55z5zGc=');
 /*
 电子邮件设置
 PHPMailer
@@ -59,4 +61,4 @@ require_once __DIR__."/config.dir.php";
 require_once __DIR__."/config.table.php";
 
 
-?>
+?>