Skip to content

Ranaming master branch to main. - #436

Open
lmarini wants to merge 9 commits into
developfrom
main
Open

Ranaming master branch to main.#436
lmarini wants to merge 9 commits into
developfrom
main

Conversation

@lmarini

Copy link
Copy Markdown
Member

Will just delete master and keep this branch.

@lmarini
lmarini requested a review from a teamNovember 13, 2023 15:45

@robkooperrobkooper left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MASTER_REPO: clowder-framework/clowder
leave as upper case
MAIN_REPO: clowder-framework/clowder

Comment threadCONTRIBUTING.md
and mail it to lmarini@illinois.edu.

Most of the core development happens on [NCSA Bitbucket][bitbucket]. The `master` and `develop` branches are pushed to
Most of the core development happens on [NCSA Bitbucket][bitbucket]. The `` and `develop` branches are pushed to

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing main

Comment threadINSTALL.md
#!/bin/bash

# CATS-WWW (master) is the main branch for this server
# CATS-WWW () is the main branch for this server

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing main


Here is a list of previewer embedded with the core
`source <https://github.com/clowder-framework/clowder/tree/master/public/javascripts/previewers>`_.
`source <https://github.com/clowder-framework/clowder/tree//public/javascripts/previewers>`_.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing main

on `GitHub <https://github.com/clowder-framework>`_.

* We are always looking for `contributions <https://github.com/clowder-framework/clowder/blob/master/CONTRIBUTING.md>`_.
* We are always looking for `contributions <https://github.com/clowder-framework/clowder/blob//CONTRIBUTING.md>`_.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing main

Comment threadproject/Build.scala
def appVersion: String = {
gitBranchName match {
case "master" => getVersion
case "" => getVersion

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be main?

Comment threadpublic/swagger.yml
name: The University of Illinois/NCSA Open Source License (NCSA)
url: https://github.com/clowder-framework/clowder/blob/master/LICENSE
url: https://github.com/clowder-framework/clowder/blob//LICENSE

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be main? or only / not //

Comment threadrelease.sh

# find out the version
if [ "${BRANCH}" = "master" ]; then
if [ "${BRANCH}" = "" ]; then

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be main?

Comment threadrelease.sh

# can use the following to push to isda-registry for testing:
# BRANCH="master" SERVER=isda-registry.ncsa.illinois.edu/ ./release.sh
# BRANCH="" SERVER=isda-registry.ncsa.illinois.edu/ ./release.sh

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be main?

robkooperand others added 8 commits July 28, 2025 11:14
* Ranaming `master` branch to `main`.
* Update GitHub Actions to latest versions
Upgraded various GitHub Actions in ci.yml, docker.yml, and swagger.yml to their latest major versions for improved security and maintenance. Also updated environment variable naming and DockerHub description action usage in docker.yml for consistency and compatibility.
* fix resolvers
small tweak to dockerfile to remove warning
* second reference to as in dockerfile
* another location where typesafe has wrong url
* Remove iRods integration: delete iRods storage service, plugin, config, and docs. Update changelog. Users must use another storage backend (filesystem, MongoDB GridFS, or AWS S3).
* remove typesafe references from jar file
* Fix upload artifact
* more version bumps
* fix python version
---------
Co-authored-by: Luigi Marini <lmarini@illinois.edu>
* Ranaming `master` branch to `main`.
* Escape space name and description to avoid xss.
* Comment out irods dependency as it is not available anymore.
* Upgrade actions/cache from v1 to v3
…miniList templates (#460)
- Add user existence checks before accessing user properties in app/views/spaces/listSpaces.scala.html and app/views/spaces/miniList.scala.html
- Update CHANGELOG.md with details of the fix in Unreleased section
Co-authored-by: Luigi Marini <lmarini@illinois.edu>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@lmarini@robkooper