CHANGELOG.md

@@ -16,6 +16,8 @@ bugs in actually-released versions.
 - Job settings: add a description for the `eval` field. This is shown in the tooltip of the 'set to automatic value' button, to make it clear what that button will do.
 - Job settings: make it possible for a setting to be "linked" to its automatic value. For job settings that have this new feature enabled, they will not be editable by default, and the setting will just use its `eval` expression to determine the value. This can be toggled by the user in Blender's submission interface, to still allow manual edits of the value when needed.
 - Database integrity tests. These are always run at startup of Flamenco Manager, and by default run periodically every hour. This can be configured by adding/changing the `database_check_period: 1h` setting in `flamenco-manager.yaml`. Setting it to `0` will disable the periodic check. When a database consistency error is found, Flamenco Manager will immediately shut down.
+- The webapp automatically reloads after a disconnect, when it reconnects to Flamenco Manager and sees the Manager version changed [#104235](https://projects.blender.org/studio/flamenco/pulls/104235).
+- Show the configured Flamenco Manager name in the webapp's browser window title.
 
 
 ## 3.2 - released 2023-02-21

Makefile

@@ -10,14 +10,14 @@ RELEASE_CYCLE := alpha
 # _GIT_DESCRIPTION_OR_TAG is either something like '16-123abc' (when we're 16
 # commits since the last tag) or it's something like `v3.0-beta2` (when exactly
 # on a tagged version).
-_GIT_DESCRIPTION_OR_TAG := $(subst v${VERSION}-,,$(shell git describe --tag --dirty --always))
+_GIT_DESCRIPTION_OR_TAG := $(subst v${VERSION}-,,$(shell git describe --tag --dirty --always --abbrev=9))
 # In the above cases, GITHASH is either `16-123abc` (in the same case above) or
 # `123abc` (when the tag matches the current commit exactly) or `dirty` (when
 # the tag matches the current commit exactly, and there are subsequent
 # uncommitted changes). This is done to prevent repetition of the same tag
 # in the "extended version" of Flamenco, which combines ${VERSION} and
 # ${GITHASH}.
-GITHASH := $(subst v${VERSION},$(shell git rev-parse --short HEAD),${_GIT_DESCRIPTION_OR_TAG})
+GITHASH := $(subst v${VERSION},$(shell git rev-parse --short=9 HEAD),${_GIT_DESCRIPTION_OR_TAG})
 
 LDFLAGS := ${LDFLAGS} -X ${PKG}/internal/appinfo.ApplicationVersion=${VERSION} \
 	-X ${PKG}/internal/appinfo.ApplicationGitHash=${GITHASH} \

internal/manager/api_impl/meta.go

@@ -25,7 +25,7 @@ func (f *Flamenco) GetVersion(e echo.Context) error {
 	return e.JSON(http.StatusOK, api.FlamencoVersion{
 		Version:      appinfo.ExtendedVersion(),
 		Shortversion: appinfo.ApplicationVersion,
-		Name:         appinfo.ApplicationName,
+		Name:         f.config.Get().ManagerName,
 		Git:          appinfo.ApplicationGitHash,
 	})
 }

internal/manager/config/defaults.go

@@ -16,7 +16,7 @@ var defaultConfig = Conf{
 	Base: Base{
 		Meta: ConfMeta{Version: latestConfigVersion},
 
-		ManagerName: "Flamenco Manager",
+		ManagerName: "Flamenco",
 		Listen:      ":8080",
 		// ListenHTTPS:   ":8433",
 		DatabaseDSN:             "flamenco-manager.sqlite",

web/app/src/App.vue

@@ -58,12 +58,12 @@ export default {
 
   },
   methods: {
-    // TODO: also call this when SocketIO reconnects.
     fetchManagerInfo() {
       const metaAPI = new API.MetaApi(getAPIClient());
       metaAPI.getVersion().then((version) => {
         this.flamencoName = version.name;
         this.flamencoVersion = version.version;
+        document.title = version.name;
       })
     },
 

web/project-website/content/development/get-involved/_index.md

@@ -34,7 +34,7 @@ done, take a look at the [workboard][workboard].
 Did you find an issue or a bug in Flamenco? Please [report a bug][bug], it
 helps Flamenco to get better!
 
-[bug]: {{flamenco/reportBugButton}}
+[bug]: https://projects.blender.org/studio/flamenco/issues/new?template=.gitea%2fissue_template%2fbug.yaml
 
 <--->