Skip to content
Snippets Groups Projects
  1. Feb 24, 2025
  2. Feb 21, 2025
  3. Feb 20, 2025
  4. Feb 17, 2025
  5. Feb 06, 2025
  6. Dec 10, 2024
  7. Dec 09, 2024
    • Yibo Zhu's avatar
      Merge remote-tracking branch... · 3e9a2f35
      Yibo Zhu authored
      Merge remote-tracking branch 'origin/60-as-a-user-i-want-to-view-and-edit-my-personal-information-on-my-profile-page-so-that-i-can' into 60-as-a-user-i-want-to-view-and-edit-my-personal-information-on-my-profile-page-so-that-i-can
      
      # Conflicts:
      #	src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/UserController.java
      #	src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/UserService.java
      #	src/main/java/uk/ac/cf/spring/demo/sports/Userdetail/UserServiceImpl.java
      #	src/main/resources/application.properties
      #	src/main/resources/schema.sql
      3e9a2f35
    • Haoyu Sun's avatar
      Merge branch... · 4f85fb18
      Haoyu Sun authored
      Merge branch '72-as-a-user-i-want-to-have-a-page-to-upload-and-share-photos-so-that-another-user-can-see-my' into 'main'
      
      Resolve "As a user, I want to have a page to upload and share  photos so that another user can see my stories."
      
      Closes #72
      
      See merge request !53
      4f85fb18
    • Xiemuqing Xiao's avatar
      Merge branch... · 53c80d78
      Xiemuqing Xiao authored
      Merge branch '71-as-an-administrator-i-want-to-generate-the-matches-automatically-so-that-players-are-divided-by' into 'main'
      
      Resolve "As an administrator, I want to generate the matches automatically so that players are divided by the program"
      
      Closes #71
      
      See merge request !54
      53c80d78
    • Haoyu Sun's avatar
      Merge remote-tracking branch... · fb78624d
      Haoyu Sun authored
      Merge remote-tracking branch 'origin/71-as-an-administrator-i-want-to-generate-the-matches-automatically-so-that-players-are-divided-by' into 71-as-an-administrator-i-want-to-generate-the-matches-automatically-so-that-players-are-divided-by
      fb78624d
    • Zhicheng Xu's avatar
      updates link · 71d7bc2f
      Zhicheng Xu authored
      71d7bc2f
    • Zhicheng Xu's avatar
      Merge branch 'main' of... · 0d479324
      Zhicheng Xu authored
      Merge branch 'main' of https://git.cardiff.ac.uk/c24020257/sports-league-application into 72-as-a-user-i-want-to-have-a-page-to-upload-and-share-photos-so-that-another-user-can-see-my
      
      # Conflicts:
      #	src/main/java/uk/ac/cf/spring/demo/sports/security/SecurityConfig.java
      #	src/main/resources/schema.sql
      #	src/main/resources/static/html/ranking.html
      0d479324
    • Xiemuqing Xiao's avatar
      Merge branch 'Xiemuqing-Xiao' into 'main' · 2d9ea21d
      Xiemuqing Xiao authored
      Resolve issue 70
      
      Closes #26, #69, and #60
      
      See merge request !49
      2d9ea21d
    • Zhicheng Xu's avatar
      Merge branch 'main' of... · 11cd5ba9
      Zhicheng Xu authored
      Merge branch 'main' of https://git.cardiff.ac.uk/c24020257/sports-league-application into 69-as-a-user-i-want-a-rules-page-with-a-search-bar-and-three-links-each-link-to-the-rules-of-darts
      
      # Conflicts:
      #	src/main/java/uk/ac/cf/spring/demo/sports/security/SecurityConfig.java
      11cd5ba9
Loading