Merge branch 'stage'

municipio-se · Sep 28, 2023 · bf48fe7 · bf48fe7
2 parents 9259b39 + e4b143b
commit bf48fe7
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 65 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -0,0 +1,9 @@
+mode: MainLine
+major-version-bump-message: "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\\([\\w\\s-]*\\))?(!:|:.*\\n\\n((.+\\n)+\\n)?BREAKING CHANGE:\\s.+)"
+minor-version-bump-message: "^(feat)(\\([\\w\\s-]*\\))?:"
+patch-version-bump-message: "^(build|chore|ci|docs|fix|perf|refactor|revert|style|test)(\\([\\w\\s-]*\\))?:"
+
+branches:
+  main:
+    regex: ^main$|^master$
+    is-release-branch: true
diff --git a/composer.json b/composer.json
@@ -22,10 +22,6 @@
   },
   "minimum-stability" : "dev",
   "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/whitespace-se/broken-link-detector"
-    },
     {
         "type":"composer",
         "url":"https://packagist.org"
@@ -37,67 +33,65 @@
   ],
   "require": {
     "php": ">=7.4",
-    "clark-nikdel-powell/post-type-select-for-acf": "dev-master",
     "composer/installers": "~1.0",
-    "helsingborg-stad/acf-ux-collapse": ">=1.0.0",
-    "helsingborg-stad/active-directory-api-wp-integration": "^2.4.12",
-    "helsingborg-stad/algolia-index": "~1.9",
-    "helsingborg-stad/algolia-index-js-searchpage-addon": "dev-3.0/develop",
-    "helsingborg-stad/algolia-index-modularity-addon": "^1.0",
-    "helsingborg-stad/api-alarm-integration": "dev-3.0/develop",
-    "helsingborg-stad/api-event-manager-integration": "dev-3.0/develop",
-    "helsingborg-stad/api-project-manager-integration": "dev-3.0/develop",
-    "helsingborg-stad/api-volunteer-manager-integration": ">=1.0.0",
-    "helsingborg-stad/attachment-revisions": ">=1.0.0",
-    "helsingborg-stad/better-post-ui": "dev-master",
-    "helsingborg-stad/broken-link-detector": "dev-whitespace",
-    "helsingborg-stad/component-library": "dev-master",
-    "helsingborg-stad/content-scheduler": "^1.2",
-    "helsingborg-stad/custom-short-links": ">=1.0.0",
-    "helsingborg-stad/customer-feedback": "dev-3.0/develop",
-    "helsingborg-stad/easy-to-read-alternative": "dev-3.0/develop",
-    "helsingborg-stad/force-ssl": ">=1.0.0",
-    "helsingborg-stad/gdi-modularity-cases": "dev-main",
-    "helsingborg-stad/gdi-modularity-invoices": "dev-main",
-    "helsingborg-stad/gdi-modularity-my-pages-about-me": "dev-main",
-    "helsingborg-stad/global-blade-engine": "1.3.0",
-    "helsingborg-stad/job-listings": "dev-3.0/develop",
-    "helsingborg-stad/like-posts": "dev-main",
-    "helsingborg-stad/lix-calculator": ">=1.0.1",
-    "helsingborg-stad/media-usage": "^1.0",
-    "helsingborg-stad/mod-my-pages": "dev-main",
-    "helsingborg-stad/modularity": "dev-3.0/develop",
-    "helsingborg-stad/modularity-contact-banner": "dev-3.0/develop",
-    "helsingborg-stad/modularity-entryscape": "^1.0.0",
-    "helsingborg-stad/modularity-form-builder": "dev-3.0/develop",
-    "helsingborg-stad/modularity-guides": "dev-3.0/develop",
-    "helsingborg-stad/modularity-interactive-img-map": "dev-3.0/develop",
-    "helsingborg-stad/modularity-json-render": "dev-3.0/develop",
-    "helsingborg-stad/modularity-local-events": "^1.0",
-    "helsingborg-stad/modularity-open-street-map": "dev-main",
-    "helsingborg-stad/modularity-products": "dev-master",
-    "helsingborg-stad/modularity-recommend": "dev-master",
-    "helsingborg-stad/modularity-sections": "dev-3.0/develop",
-    "helsingborg-stad/modularity-testimonials": "dev-3.0/develop",
-    "helsingborg-stad/modularity-timeline": "dev-3.0/master",
-    "helsingborg-stad/multi-network-urls": "^1.0.1",
-    "helsingborg-stad/multisite-role-propagation": "^1.0",
-    "helsingborg-stad/municipio": "dev-3.0/develop",
-    "helsingborg-stad/redirection-extended": "^1.0",
-    "helsingborg-stad/s3-uploads-custom-endpoint": "^1.0.0",
-    "helsingborg-stad/search-notices": ">=1.0.0",
-    "helsingborg-stad/visit-custom-posttypes-taxonomies": "dev-master",
-    "helsingborg-stad/wp-page-for-post-type": ">=1.0.0",
-    "helsingborg-stad/wp-page-for-term": "^1.0",
-    "helsingborg-stad/wp-search-statistics": ">=0.1.0",
-    "helsingborg-stad/wpmu-acf-google-maps-key": "dev-main",
-    "helsingborg-stad/wpmu-litespeed-common-settings": "^1.0.0",
-    "helsingborg-stad/wpmu-network-admin-url": "dev-master",
+    "helsingborg-stad/acf-ux-collapse": "^2.0.0",
+    "helsingborg-stad/active-directory-api-wp-integration": "^3.0.0",
+    "helsingborg-stad/algolia-index": "^3.0.0",
+    "helsingborg-stad/algolia-index-js-searchpage-addon": "^2.0.0",
+    "helsingborg-stad/algolia-index-modularity-addon": "^3.0.0",
+    "helsingborg-stad/api-alarm-integration": "^2.0.0",
+    "helsingborg-stad/api-event-manager-integration": "^1.0.0",
+    "helsingborg-stad/api-project-manager-integration": "^2.0.0",
+    "helsingborg-stad/api-volunteer-manager-integration": "^2.0.0",
+    "helsingborg-stad/attachment-revisions": "^2.0.0",
+    "helsingborg-stad/better-post-ui": "^2.0.0",
+    "helsingborg-stad/broken-link-detector": "^2.0.0",
+    "helsingborg-stad/component-library": "^2.0.0",
+    "helsingborg-stad/content-scheduler": "^3.0.0",
+    "helsingborg-stad/custom-short-links": "^2.0.0",
+    "helsingborg-stad/customer-feedback": "^3.0.0",
+    "helsingborg-stad/easy-to-read-alternative": "^2.0.0",
+    "helsingborg-stad/force-ssl": "^2.0.0",
+    "helsingborg-stad/gdi-modularity-cases": "^1.0.0",
+    "helsingborg-stad/gdi-modularity-invoices": "^1.0.0",
+    "helsingborg-stad/gdi-modularity-my-pages-about-me": "^1.0.0",
+    "helsingborg-stad/global-blade-engine": "^2.0.0",
+    "helsingborg-stad/job-listings": "^3.0.0",
+    "helsingborg-stad/like-posts": "^1.0.0",
+    "helsingborg-stad/lix-calculator": "^3.0.0",
+    "helsingborg-stad/media-usage": "^3.0.0",
+    "helsingborg-stad/mod-my-pages": "^1.0.0",
+    "helsingborg-stad/modularity": "^3.0.1",
+    "helsingborg-stad/modularity-contact-banner": "^2.0.0",
+    "helsingborg-stad/modularity-entryscape": "^2.0.0",
+    "helsingborg-stad/modularity-form-builder": "^2.0.0",
+    "helsingborg-stad/modularity-guides": "^3.0.0",
+    "helsingborg-stad/modularity-interactive-img-map": "^3.0.0",
+    "helsingborg-stad/modularity-json-render": "^2.0.0",
+    "helsingborg-stad/modularity-local-events": "^2.0.0",
+    "helsingborg-stad/modularity-open-street-map": "^1.0.0",
+    "helsingborg-stad/modularity-products": "^1.0.0",
+    "helsingborg-stad/modularity-recommend": "^1.0.0",
+    "helsingborg-stad/modularity-sections": "^2.0.0",
+    "helsingborg-stad/modularity-testimonials": "^2.0.0",
+    "helsingborg-stad/modularity-timeline": "^2.0.0",
+    "helsingborg-stad/multi-network-urls": "^2.0.0",
+    "helsingborg-stad/multisite-role-propagation": "^2.0.0",
+    "helsingborg-stad/municipio": "^3.0.1",
+    "helsingborg-stad/redirection-extended": "^2.0.0",
+    "helsingborg-stad/s3-uploads-custom-endpoint": "^2.0.0",
+    "helsingborg-stad/search-notices": "^2.0.0",
+    "helsingborg-stad/visit-custom-posttypes-taxonomies": "^1.0.0",
+    "helsingborg-stad/wp-page-for-post-type": "^2.0.0",
+    "helsingborg-stad/wp-page-for-term": "^2.0.0",
+    "helsingborg-stad/wp-search-statistics": "^1.0.0",
+    "helsingborg-stad/wpmu-acf-google-maps-key": "^1.0.0",
+    "helsingborg-stad/wpmu-litespeed-common-settings": "^2.0.0",
+    "helsingborg-stad/wpmu-network-admin-url": "^1.0.0",
     "helsingborg-stad/wpmu-mu-plugins-url-everywhere": "~1.0.0",
     "humanmade/s3-uploads": "^3.0.4",
     "johnpbloch/wordpress": "6.3.1",
-    "municipio-se/modularity-noticeboard": "1.0.0",
-    "municipio/content-insights-for-editors": "dev-master",
+    "municipio-se/modularity-noticeboard": "^1.0.0",
     "wikimedia/composer-merge-plugin": "dev-master",
     "wpackagist-plugin/acf-extended": "0.8.8.7",
     "wpackagist-plugin/autodescription": ">=2.9.0",

diff --git a/index.php b/index.php
@@ -1,9 +1,13 @@
 <?php
 /**
- * Front to the WordPress application. This file doesn't do anything, but loads
- * wp-blog-header.php which does and tells WordPress to load the theme.
- *
- * @package WordPress
+ * Name:              Municipio
+ * URI:               https://getmunicipio.com
+ * Description:       Main installable for Municipio.
+ * Version:           1.0.0
+ * Author:            Sebastian Thulin
+ * Author URI:        https://github.com/helsingborg-stad
+ * License:           MIT
+ * License URI:       https://opensource.org/licenses/MIT
  */
 
 /**