Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#12048] Update v9 course migration feature branch #13112

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
186a97a
Enable CI on account request form branch
ziqing26 Mar 12, 2024
17866eb
[#11843] Create FeedbackSessionLog entity and cron job action (#12895)
dishenggg Mar 18, 2024
395bdd7
[#11878] Remove AccountRequest unique constraint (#12899)
jayasting98 Mar 18, 2024
fc1342f
[#11878] Add status and comments to AccountRequest (#12898)
jayasting98 Mar 18, 2024
24a914d
[#11878] Add new account request alert email for admins (#12926)
jayasting98 Mar 25, 2024
126d2c4
[#11878] Add GetAllPendingAccountRequests API (#12927)
EuniceSim142 Mar 25, 2024
cb29108
[#11878] Modify CreateAccountRequestAction (#12913)
jayasting98 Mar 25, 2024
f7eaa61
[#11878] Upgrade instructor request form UI (#12929)
xenosf Mar 27, 2024
40613df
[#11878] Update Admin Home Page UI for ARF (#12933)
domoberzin Mar 27, 2024
5618370
[#11878] Admin Search UI Update for ARF (#12945)
domoberzin Mar 27, 2024
0aa7dfb
[#11878] Add methods to get an account request by ID (#12953)
jayasting98 Mar 28, 2024
ccad41b
[#11843] Create Logic and Db layer for FeedbackSessionLogs (#12914)
dishenggg Mar 28, 2024
f6329eb
[#11878] Add snapshot tests for instructor request form UI (#12942)
xenosf Mar 28, 2024
6049c81
[#11878] Foundation for getting by ID in account request endpoints (#…
jayasting98 Mar 29, 2024
9f0ca34
Get account requests by ID in storage update method (#12955)
jayasting98 Mar 29, 2024
9794b8a
Get an account request by ID in SQL injection tests (#12956)
jayasting98 Mar 29, 2024
00b85ce
[#11878] Create instructor request acknowledgement email (#12944)
xenosf Mar 30, 2024
99eeac7
[#11878] Merge master into account-request-form (#12972)
ziqing26 Mar 31, 2024
7ec74c7
[#11878] Change institute length limit (#12974)
xenosf Apr 2, 2024
0b07036
[#11878] Update SearchAccountRequests endpoint (#12950)
EuniceSim142 Apr 2, 2024
de3181a
[#11878] Integrate instructor request form with API (#12943)
xenosf Apr 4, 2024
a98630d
[#11843] Update GetFeedbackSessionLogsAction to use SQL db (#12938)
dishenggg Apr 5, 2024
5779d2f
[#11878] Create Update Account Request Action (#12982)
domoberzin Apr 5, 2024
028c953
[#12048] Update liquibase configuration (#12930)
NicolasCwy Apr 6, 2024
4a54001
[#11878] Fix Account Request Update Search Indexing (#12984)
domoberzin Apr 6, 2024
62750b0
[#11878] Add Edit and Approve Account Requests functionality (#12975)
domoberzin Apr 7, 2024
96e5abd
[#11878] Add AccountRequest Rejection email generator. (#12987)
EuniceSim142 Apr 8, 2024
1e9ccb0
[#12048] Migrate AccountRequestsLogicTest (#12780)
xenosf Apr 8, 2024
84ed244
[#12048] Migrate AdminSearchPageE2ETest SQL (#12811)
domoberzin Apr 8, 2024
db0fd94
[#12995] Create documentation for unit tests (#12996)
cedricongjh Apr 8, 2024
fb0ba19
[#11878] Create reject account request endpoint (#12985)
xenosf Apr 9, 2024
6c420fa
[#12048] Remove feedbackSession attributes @fetch annotation (#12992)
NicolasCwy Apr 9, 2024
cfff21d
Remove unused modal (#12998)
dishenggg Apr 9, 2024
50c87bc
use transactions for reject account request action (#13001)
domoberzin Apr 9, 2024
8f43cc8
[#12048] create skeleton for sql LNP tests (#12994)
cedricongjh Apr 9, 2024
b9ccd4f
[#12048] Migrate FeedbackNumScaleQuestionE2ETest (#12940)
marquestye Apr 9, 2024
a36ecf7
[#11878] Create Rejection Modal for Account Requests (#12989)
domoberzin Apr 10, 2024
2354975
Add v9.0.0 tag to liquibase changelog (#13005)
NicolasCwy Apr 11, 2024
6de9607
[#11878] Update DeleteAccountRequest to reference by ID (#12997)
dishenggg Apr 11, 2024
e0beb08
[#11878] Update ResetAccountRequest to reference by ID (#13002)
dishenggg Apr 11, 2024
ce75a0a
[#11878] Add Error Message for Approving Existing Account (#13004)
domoberzin Apr 11, 2024
fb7c4e8
sort courses by id before comparison (#13003)
cedricongjh Apr 11, 2024
41524a5
[#11878] Get account request by uuid (#13007)
cedricongjh Apr 12, 2024
451a25a
[#11878] Handle Duplicate Approved Account Requests (#13009)
domoberzin Apr 12, 2024
2bd06e2
[#11878] Merge master into feature (#13011)
ziqing26 Apr 13, 2024
8d506a1
[#11843] Update front end for session activity logs (#12973)
dishenggg Apr 13, 2024
4682dff
[#11878] Add tests for Account Request Table (#12977)
domoberzin Apr 14, 2024
c6b8642
[#11878] Reference account requests by ID in tests (#13017)
jayasting98 Apr 14, 2024
f0e2af3
[#11878] Fix Approval Email Bug (#13027)
domoberzin Apr 14, 2024
589ba08
[#11878] Fix reject email content (#13029)
ziqing26 Apr 14, 2024
9431906
Merge branch 'master' into account-request-form
ziqing26 Apr 14, 2024
0f0fd05
[#11878] Add Toasts (#13028)
domoberzin Apr 14, 2024
bb261f4
[#11878] Remove mention of home page URL from confirmation email (#13…
xenosf Apr 14, 2024
98d9044
Initial commit (#13024)
mingyuanc Apr 15, 2024
20c29e5
fix highlighting and null statuses (#13031)
domoberzin Apr 15, 2024
3dab1dc
[#11878] Fix Overlapping Tooltip (#13026)
domoberzin Apr 15, 2024
665752c
[#11878] Check if account request is not created by admin before send…
xenosf Apr 15, 2024
7b05fec
[#11878] Add sort by created_at for getAllPendingRequests (#13038)
EuniceSim142 Apr 16, 2024
16f7767
[#11878] Request Page E2E (#13015)
dishenggg Apr 16, 2024
735afbd
[#12954] CreateAccountAction seems to have redundant code (#13039)
eraldprifti03 Apr 16, 2024
f852286
[#12048] Fix getSessionResultAction bugs (#13023)
mingyuanc Apr 17, 2024
3915b8c
Remove method from logic and db (#13044)
dishenggg Apr 17, 2024
ab22022
[#11878] Migrate AccountRequestsLogic unit tests (#13043)
xenosf Apr 17, 2024
68a4fbf
[#11878] Add Admin E2E Tests (#13020)
domoberzin Apr 17, 2024
78e49b7
Merge branch 'master' into account-request-form
ziqing26 Apr 17, 2024
2cc6ef8
[#11878] Add SQLI tests (#13047)
xenosf Apr 17, 2024
5378b66
Revert "Enable CI on account request form branch" (#13049)
ziqing26 Apr 17, 2024
9a51e2a
[#11843] Fix front end bugs (#13037)
dishenggg Apr 18, 2024
000e8b7
Merge branch 'master' into student-activity-logs
FergusMok Apr 18, 2024
c76df68
Merge pull request #13051 from TEAMMATES/account-request-form
ziqing26 Apr 18, 2024
6fe8c8d
Fixed moderate response bug (#12964)
eraysozer20 Apr 18, 2024
3e25beb
Merge branch 'master' into student-activity-logs
cedricongjh Apr 18, 2024
8ec6989
[#12048] Migrate committers (#13052)
ziqing26 Apr 18, 2024
d241a78
fix lint issues
cedricongjh Apr 18, 2024
63b3209
[#12048] Migrate InstructorStudentRecordsPageE2ETest (#13013)
cedricongjh Apr 18, 2024
14344cf
Merge pull request #13041 from TEAMMATES/student-activity-logs
cedricongjh Apr 18, 2024
acc16f2
[#12725] Update backend libraries versions, support Java 21 (#12885)
wkurniawan07 Apr 18, 2024
ce839ab
fix edit (#13056)
domoberzin Apr 18, 2024
4aa2af7
[#12048] Migrate InstructorStudentListPageE2ETest (#13014)
cedricongjh Apr 18, 2024
c665348
[#12048] Migrate instructor home page e2e test (#13016)
cedricongjh Apr 18, 2024
1027334
migrate StudentCourseJoinConfirmationPageE2ETest (#13008)
cedricongjh Apr 19, 2024
f8bae93
[#11878] Fix console errors (#13058)
domoberzin Apr 19, 2024
ba6979e
[#11878] Fix Rejection Modal (#13059)
domoberzin Apr 19, 2024
498efdc
Add composite index for data migration (#13057)
marquestye Apr 19, 2024
81eae17
[#13060] Add beta 5 liquibase changelog and developers json (#13061)
ziqing26 Apr 19, 2024
0a0e7c9
[#12048] Update changelog docs and changelog name (#13062)
NicolasCwy Apr 20, 2024
10e96cb
[#12048] Migrate StudentCourseDetailsPageE2ETest (#13012)
cedricongjh Apr 20, 2024
76db4cc
[#11878] Account Request Indexing Script (#13076)
domoberzin Apr 22, 2024
6b83e4f
[#11878] Add CAPTCHA to ARF (#13081)
xenosf Apr 23, 2024
e738e25
[#13064] Use AccountRequestUpdateRequest as parameter (#13068)
Stain19 Apr 24, 2024
a2a9ef3
[#12048] Migrate FeedbackRubricQuestionsE2E (#13078)
yuanxi1 Apr 28, 2024
34248a0
[#12048] Migrate SubmitFeedbackResponseAction tests (#13033)
FergusMok May 2, 2024
96ffa94
Merge branch 'master' into v9-course-migration
NicolasCwy May 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions .github/workflows/axe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ jobs:
matrix:
browser: [firefox]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
distribution: temurin
java-version: 11
- name: Cache Gradle packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/comment-goodfirstissue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Add comment
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ jobs:
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: '0'
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
distribution: temurin
java-version: 11
- name: Cache Gradle packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -40,15 +40,15 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-
- name: Cache eslint
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./.eslintcache
key: ${{ runner.os }}-eslint-${{ hashFiles('.eslintcache') }}
restore-keys: |
${{ runner.os }}-eslint-
- name: Cache stylelint
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
./.stylelintcache
Expand All @@ -68,17 +68,17 @@ jobs:
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
distribution: temurin
java-version: 11
- name: Cache Gradle packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/dev-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ jobs:
shell: bash
working-directory: docs
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'temurin'
java-version: 11
distribution: temurin
- name: Install Graphviz
run: sudo apt install graphviz
- run: npm ci
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/e2e-sql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ jobs:
browser: [firefox]
tests: [stable, unstable]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
distribution: temurin
java-version: 11
- name: Cache Gradle packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -53,4 +53,4 @@ jobs:
./gradlew serverRun &
./wait-for-server.sh
- name: Start Tests
run: xvfb-run --server-args="-screen 0 1024x768x24" ./gradlew -P${{ matrix.tests }} e2eTestsSql
run: xvfb-run --server-args="-screen 0 1024x768x24" ./gradlew -P${{ matrix.tests }} e2eTestsSql
13 changes: 6 additions & 7 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@ jobs:
browser: [firefox]
tests: [stable, unstable]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
distribution: temurin
java-version: 11
- name: Cache Gradle packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand All @@ -54,4 +54,3 @@ jobs:
./wait-for-server.sh
- name: Start Tests
run: xvfb-run --server-args="-screen 0 1024x768x24" ./gradlew -P${{ matrix.tests }} e2eTests

8 changes: 4 additions & 4 deletions .github/workflows/jdk17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
Expand All @@ -20,9 +20,9 @@ jobs:
component-testing:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/jdk21.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Component Tests (JDK 21)

on:
push:
branches:
- master

jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
- name: Run Backend Linting
run: ./gradlew lint --continue
component-testing:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
- name: Update Property File
run: mv src/test/resources/test.ci-ubuntu-latest.properties src/test/resources/test.properties
- name: Run Solr search service
run: docker-compose run -d -p 8983:8983 solr
- name: Run Backend Tests
run: ./gradlew createConfigs componentTests
10 changes: 5 additions & 5 deletions .github/workflows/lnp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ jobs:
LnP-testing:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '11'
distribution: temurin
java-version: 11
- name: Cache Gradle packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.gradle/caches
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
permissions:
pull-requests: write
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@v7
with:
script: |
const pr = await github.rest.pulls.get({
Expand Down
Loading