mirror of
				https://gitlab.com/animath/si/plateforme.git
				synced 2025-11-04 11:52:20 +01:00 
			
		
		
		
	Merge branch '2-add-a-home-page'
# Conflicts: # docker-compose.yml # server_files/config.php # server_files/views/connexion.php # setup/create_database.sql
This commit is contained in:
		@@ -55,7 +55,7 @@ foreach ($solutions as $sol) {
 | 
			
		||||
	$file_id = $sol->getFileId();
 | 
			
		||||
	$problem = $sol->getProblem();
 | 
			
		||||
	$version = $sol->getVersion();
 | 
			
		||||
	echo "Problème $problem (Version $version) : <a href=\"$URL_BASE/file/$file_id\">Télécharger</a><br />";
 | 
			
		||||
	echo "Problème $problem (Version $version) : <a href=\"/file/$file_id\">Télécharger</a><br />";
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
if ($team->isSelectedForFinal()) { ?>
 | 
			
		||||
@@ -68,7 +68,7 @@ if ($team->isSelectedForFinal()) { ?>
 | 
			
		||||
		$file_id = $sol->getFileId();
 | 
			
		||||
		$problem = $sol->getProblem();
 | 
			
		||||
		$version = $sol->getVersion();
 | 
			
		||||
		echo "Problème $problem (Version $version) : <a href=\"$URL_BASE/file/$file_id\">Télécharger</a><br />";
 | 
			
		||||
		echo "Problème $problem (Version $version) : <a href=\"/file/$file_id\">Télécharger</a><br />";
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user