From 15c5886264918dc92769d40b546100b811dcd0ea Mon Sep 17 00:00:00 2001 From: Stylix58 <63605602+Stylix58@users.noreply.github.com> Date: Thu, 27 May 2021 22:15:25 +0200 Subject: [PATCH 1/8] change to v1.0.0 archive see https://discuss.flarum.org/d/27394-flarum-100-released --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 44afba3..f477cfe 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/flarum/flarum/archive/v0.1.0-beta.16.zip -SOURCE_SUM=CB4B892AA0C59C1DAF48812EC0EC842E5D9B1C99ED7D90F30D0A1DB3B411993A +SOURCE_URL=https://github.com/flarum/flarum/archive/v1.0.0.zip +SOURCE_SUM=32cd6f0cc71f61299b3849f483b96dcea0d3d987b17c6617ae2ff9cf4bf41dec SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true From 571b3b5c5cda9d68ca2cb4c1393f76024965f283 Mon Sep 17 00:00:00 2001 From: Stylix58 <63605602+Stylix58@users.noreply.github.com> Date: Thu, 27 May 2021 22:26:54 +0200 Subject: [PATCH 2/8] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 42fd680..fdc0df4 100644 --- a/manifest.json +++ b/manifest.json @@ -7,7 +7,7 @@ "fr": "Un forum de nouvelle génération, simplement.", "de": "Forum der nächsten Generation leicht gemacht." }, - "version": "0.1.0.16~ynh4", + "version": "1.0.0~ynh4", "url": "http://flarum.org/", "upstream": { "license": "MIT", From 75507ef6f40ef18367a4b7057959e71e5d548fe9 Mon Sep 17 00:00:00 2001 From: Stylix58 <63605602+Stylix58@users.noreply.github.com> Date: Fri, 28 May 2021 08:46:53 +0200 Subject: [PATCH 3/8] Update _common.sh --- scripts/_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 264bb9b..de4c7a7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -13,8 +13,8 @@ YNH_COMPOSER_VERSION="2.0.13" extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo-mysql php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-zip" # Version numbers -project_version="~0.1.0-beta.16" -core_version="~0.1.0-beta.16" +project_version="~0.1.0" +core_version="~0.1.0" ldap_version="~0.1.0-beta.16-1" #================================================= From 1b0dc2bd81365451c71d936b3d0c18d7d3601891 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 6 Jun 2021 01:46:14 +0200 Subject: [PATCH 4/8] Update dependencies to v1.0.0 --- scripts/_common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index de4c7a7..ed6c97c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -13,9 +13,9 @@ YNH_COMPOSER_VERSION="2.0.13" extra_php_dependencies="php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pdo-mysql php${YNH_PHP_VERSION}-tokenizer php${YNH_PHP_VERSION}-zip" # Version numbers -project_version="~0.1.0" -core_version="~0.1.0" -ldap_version="~0.1.0-beta.16-1" +project_version="~1.0.0" +core_version="~1.0.0" +ldap_version="~1.0.0-p1" #================================================= # PERSONAL HELPERS From 68b19eb94968877c1e77fc87618ce63110f4af75 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 6 Jun 2021 11:13:48 +0200 Subject: [PATCH 5/8] Update language dependencies to v1.0.0 --- scripts/install | 4 ++-- scripts/upgrade | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 8bfc12c..612e72e 100644 --- a/scripts/install +++ b/scripts/install @@ -172,14 +172,14 @@ ynh_mysql_connect_as --user=$app --password="$db_pwd" --database=$db_name < ../c case $language in fr) ynh_script_progression --message="Installing French extension..." --weight=2 - ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:1.10\" + ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:^2.0.0" activate_flarum_extension $db_name "qiaeru-lang-french" sql_command="UPDATE \`settings\` SET \`value\` = 'fr' WHERE \`settings\`.\`key\` = 'default_locale'" ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name ;; de) ynh_script_progression --message="Installing German extension..." --weight=2 - ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:0.14.3\" + ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:^1.0.0" activate_flarum_extension $db_name "kakifrucht-de" sql_command="UPDATE \`settings\` SET \`value\` = 'de' WHERE \`settings\`.\`key\` = 'default_locale'" ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name diff --git a/scripts/upgrade b/scripts/upgrade index b9b2bdf..edd3334 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -210,14 +210,14 @@ fi case $language in fr) ynh_script_progression --message="Installing French extension..." --weight=2 - ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:1.10\" + ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:^2.0.0" activate_flarum_extension $db_name "qiaeru-lang-french" sql_command="UPDATE \`settings\` SET \`value\` = 'fr' WHERE \`settings\`.\`key\` = 'default_locale'" ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name ;; de) ynh_script_progression --message="Installing German extension..." --weight=2 - ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:0.14.3\" + ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:^1.0.0" activate_flarum_extension $db_name "kakifrucht-de" sql_command="UPDATE \`settings\` SET \`value\` = 'de' WHERE \`settings\`.\`key\` = 'default_locale'" ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name From 5b031ccb790689cf26a3a5b849e50bb3a150c3c8 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 6 Jun 2021 11:14:18 +0200 Subject: [PATCH 6/8] Do not hide standard login method by default --- conf/ldap.sql.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/ldap.sql.template b/conf/ldap.sql.template index 3aaca50..8558904 100644 --- a/conf/ldap.sql.template +++ b/conf/ldap.sql.template @@ -6,7 +6,7 @@ INSERT INTO `settings` (`key`, `value`) VALUES ('tituspijean-auth-ldap.follow_referrals', '0'), ('tituspijean-auth-ldap.hosts', 'localhost'), ('tituspijean-auth-ldap.method_name', 'YunoHost'), -('tituspijean-auth-ldap.onlyUse', '1'), +('tituspijean-auth-ldap.onlyUse', '0'), ('tituspijean-auth-ldap.port', '389'), ('tituspijean-auth-ldap.search_user_fields', 'uid,mail'), ('tituspijean-auth-ldap.use_ssl', ''), From aa138f0e218823a721e97e89d5e4224524e4d945 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 6 Jun 2021 12:17:34 +0200 Subject: [PATCH 7/8] Fix typo --- scripts/install | 4 ++-- scripts/upgrade | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 612e72e..7eb09f4 100644 --- a/scripts/install +++ b/scripts/install @@ -172,14 +172,14 @@ ynh_mysql_connect_as --user=$app --password="$db_pwd" --database=$db_name < ../c case $language in fr) ynh_script_progression --message="Installing French extension..." --weight=2 - ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:^2.0.0" + ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:^2.0.0\" activate_flarum_extension $db_name "qiaeru-lang-french" sql_command="UPDATE \`settings\` SET \`value\` = 'fr' WHERE \`settings\`.\`key\` = 'default_locale'" ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name ;; de) ynh_script_progression --message="Installing German extension..." --weight=2 - ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:^1.0.0" + ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:^1.0.0\" activate_flarum_extension $db_name "kakifrucht-de" sql_command="UPDATE \`settings\` SET \`value\` = 'de' WHERE \`settings\`.\`key\` = 'default_locale'" ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name diff --git a/scripts/upgrade b/scripts/upgrade index edd3334..b74b3a9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -210,14 +210,14 @@ fi case $language in fr) ynh_script_progression --message="Installing French extension..." --weight=2 - ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:^2.0.0" + ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require qiaeru/lang-french:^2.0.0\" activate_flarum_extension $db_name "qiaeru-lang-french" sql_command="UPDATE \`settings\` SET \`value\` = 'fr' WHERE \`settings\`.\`key\` = 'default_locale'" ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name ;; de) ynh_script_progression --message="Installing German extension..." --weight=2 - ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:^1.0.0" + ynh_exec_warn_less ynh_composer_exec --phpversion=$phpversion --workdir=$final_path --commands=\"require kakifrucht/flarum-de:^1.0.0\" activate_flarum_extension $db_name "kakifrucht-de" sql_command="UPDATE \`settings\` SET \`value\` = 'de' WHERE \`settings\`.\`key\` = 'default_locale'" ynh_mysql_execute_as_root --sql="$sql_command" --database=$db_name From ae198914cfe1f37eb83d08d2e4686fff6658baf5 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 7 Jun 2021 09:41:32 +0000 Subject: [PATCH 8/8] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f8a6776..1cf636b 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Next-generation forum made simple. -**Shipped version:** 0.1.0.16~ynh5 +**Shipped version:** 1.0.0~ynh5 **Demo:** https://discuss.flarum.org/d/21101-demos-come-to-flarum diff --git a/README_fr.md b/README_fr.md index 209602b..7b59d4a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Un forum de nouvelle génération, simplement. -**Version incluse :** 0.1.0.16~ynh5 +**Version incluse :** 1.0.0~ynh5 **Démo :** https://discuss.flarum.org/d/21101-demos-come-to-flarum