Merge remote-tracking branch 'upstream/master' into GH-4980

Author: christianbeeznest

.github/workflows/behat.yml

@@ -14,7 +14,7 @@ jobs:
                 php-versions: ['8.2', '8.3']
         steps:
             - name: Checkout
-              uses: actions/checkout@v4
+              uses: actions/checkout@v6
 
             - name: Setup apache
               run: |
@@ -113,7 +113,7 @@ jobs:
                 sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 & # optional
 
             - name: Set up JDK
-              uses: actions/setup-java@v4
+              uses: actions/setup-java@v5
               with:
                   distribution: 'temurin'
                   java-version: '17'

.github/workflows/format_code.yml

@@ -17,7 +17,7 @@ jobs:
                 php-versions: ['8.2']
         steps:
             - name: Checkout
-              uses: actions/checkout@v4
+              uses: actions/checkout@v6
 
             - name: Setup PHP, with composer and extensions
               uses: shivammathur/setup-php@v2

.github/workflows/php_analysis.yml

@@ -14,7 +14,7 @@ jobs:
                 php-versions: ['8.2']
         steps:
             - name: Checkout
-              uses: actions/checkout@v4
+              uses: actions/checkout@v6
 
             - name: Setup PHP, with composer and extensions
               uses: shivammathur/setup-php@v2

.github/workflows/phpunit.yml

@@ -17,7 +17,7 @@ jobs:
                 php-versions: ['8.2']
         steps:
             - name: Checkout
-              uses: actions/checkout@v4
+              uses: actions/checkout@v6
 
             - name: Setup node
               run: |

.yarn/releases/yarn-4.10.3.cjs .yarn/releases/yarn-4.11.0.cjs.yarn/releases/yarn-4.10.3.cjs renamed to .yarn/releases/yarn-4.11.0.cjs

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.10.3.cjs
+yarnPath: .yarn/releases/yarn-4.11.0.cjs

.yarnrc.yml

@@ -59,9 +59,9 @@ Install the software stack and Chamilo using the commands below.
 apt update && apt -y upgrade
 apt install -y apache2 libapache2-mod-php mariadb-client mariadb-server redis php-pear php-{apcu,bcmath,cli,curl,dev,gd,intl,ldap,mbstring,mysql,redis,soap,xml,zip} git unzip curl certbot
 mysql -e "GRANT ALL PRIVILEGES ON chamilo2.* TO chamilo2@localhost IDENTIFIED BY 'chamilo2';"
-cd /var/www && wget https://github.com/chamilo/chamilo-lms/releases/download/v2.0.0-alpha.2/chamilo-2.0.0-alpha.2.tar.gz
-tar zxf chamilo-2.0.0-alpha.2.tar.gz
-mv chamilo-2.0.0-alpha.2 chamilo
+cd /var/www && wget https://github.com/chamilo/chamilo-lms/releases/download/v2.0.0-beta.1/chamilo-2.0.0-beta.1.tar.gz
+tar zxf chamilo-2.0.0-beta.1.tar.gz
+mv chamilo-2.0.0-beta.1 chamilo
 cd chamilo
 cp public/main/install/apache.dist.conf /etc/apache2/sites-available/my.chamilo.net.conf
 a2ensite my.chamilo.net

README.md

@@ -985,6 +985,34 @@ img.course-tool__icon {
 }
 .app-breadcrumb .p-breadcrumb-separator { padding-inline: .25rem; }
 
+// Glossary auto-highlighted term
+.glossary-term {
+  position: relative;
+  cursor: help;
+  font-weight: 500;
+  color: #2563eb;
+  border-bottom: 1px dotted currentColor;
+  text-decoration: none;
+
+  &::after {
+    content: "ⓘ";
+    font-size: 0.7em;
+    margin-left: 0.15rem;
+    vertical-align: super;
+    opacity: 0.7;
+  }
+
+  &:hover {
+    color: #1d4ed8;
+    border-bottom-style: solid;
+  }
+
+  &:focus-visible {
+    outline: 2px solid currentColor;
+    outline-offset: 2px;
+  }
+}
+
 @import "~@fancyapps/fancybox/dist/jquery.fancybox.css";
 @import "~timepicker/jquery.timepicker.min.css";
 @import "~qtip2/dist/jquery.qtip.min.css";

assets/css/app.scss

@@ -1,13 +1,20 @@
 .admin-index {
-  @apply gap-4 grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3;
-  //@apply gap-4 lg:columns-2 xl:columns-3 space-y-4;
+  @apply grid gap-4 grid-cols-1 md:grid-cols-2 xl:grid-cols-3 items-start;
+
+  &__block-container {
+    @apply h-full;
+  }
 
   &__block {
-    @apply flex flex-col p-4 gap-4 rounded-lg shadow-lg border border-solid border-gray-25 break-inside-avoid-column;
+    @apply flex flex-col h-full p-4 gap-4 rounded-lg shadow-md border border-solid border-gray-25 bg-white;
+  }
+
+  &__block-container--full {
+    @apply col-span-1 md:col-span-2 xl:col-span-3;
   }
 
   .p-menu {
-    @apply border-none border-0 m-0 p-0 w-full;
+    @apply border-none m-0 p-0 w-full;
   }
 }