Merge branch 'devel' into runr_full_implementation_draft

# Conflicts: # DESCRIPTION # R/iSEEindex.R # man/iSEEindex-pkg.Rd
iSEE · Sep 11, 2024 · e2df998 · e2df998
2 parents 66a53ee + 853cbfb
commit e2df998
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,14 +1,17 @@
 Package: iSEEindex
 Title: iSEE extension for a landing page to a custom collection of data sets
-Version: 1.1.0
-Date: 2022-07-06
+Version: 1.1.2
+Date: 2024-02-21
 Authors@R: 
     c(person("Kevin", "Rue-Albrecht", email = "kevinrue67@gmail.com",
              role = c("aut", "cre"),
              comment = c(ORCID = "0000-0003-3899-3872")),
     person("Thomas", "Sandmann", email = "tomsing1@gmail.com",
              role = c("ctb"),
              comment = c(ORCID = "0000-0002-6601-8890")),
+    person("Federico", "Marini", email="marinif@uni-mainz.de",
+             role="aut",
+             comment = c(ORCID = '0000-0003-3252-7758')),
     person("Denali Therapeutics", role = c("fnd")))
 Description: This package provides an interface to any collection of data sets
     within a single iSEE web-application. The main functionality of this package is

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# iSEEindex 1.1.1
+
+* Add possibility to customise the title of the app.
+
 # iSEEindex 0.99.13
 
 * Added possibility to inject custom header and footer in landing page.

diff --git a/R/iSEEindex-pkg.R → R/iSEEindex-package.R b/R/iSEEindex-pkg.R → R/iSEEindex-package.R
@@ -4,7 +4,7 @@
 #' single iSEE web-application.
 #' The main functionality of this package is to define a custom landing page
 #' allowing app maintainers to list a custom collection of data sets that users
-#' can selected from and directly load objects into an iSEE web-application.
+#' can select from and directly load objects into an iSEE web-application.
 #' 
 #' @seealso 
 #' Useful links:
@@ -13,6 +13,5 @@
 #' - Report bugs at <https://support.bioconductor.org/t/iSEEindex>
 #' 
 #' @keywords internal
-#' @name iSEEindex-pkg
-#' @docType package
-NULL
+#' @aliases iSEEindex-package NULL
+"_PACKAGE"
diff --git a/R/iSEEindex.R b/R/iSEEindex.R
@@ -140,7 +140,7 @@ iSEEindex <- function(bfc, FUN.datasets, FUN.initial = NULL, default.add = TRUE,
     }
 
     if (is.null(app.title)) {
-        app.title <- sprintf("iSEEindex - v%s|powered by iSEE - v%s",
+        app.title <- sprintf("iSEEindex - v%s | powered by iSEE - v%s",
                              packageVersion("iSEEindex"),
                              packageVersion("iSEE"))
     }

diff --git a/man/iSEEindex-pkg.Rd → man/iSEEindex-package.Rd b/man/iSEEindex-pkg.Rd → man/iSEEindex-package.Rd