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.

Sign up for GitHub

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

Jump to bottom

Integrating changes into master branch #40

Merged
merged 155 commits into from
May 23, 2024
Merged

Integrating changes into master branch #40

merged 155 commits into from
May 23, 2024

Conversation

Yinnii
Copy link
Contributor

@Yinnii Yinnii commented May 23, 2024

A lot of changes have been made over the past years.

  • Add Callback function, taskNr, and multiple Resources
  • Add LRS credentials
  • Update Gradle to v7.3
  • New xapi URLs
  • Update las2peer bundle
  • Add LLM-feedback generation

@AlexanderNeumann
Merge pull request #13 from rwth-acis/las2peer/1.2.3
62f1ad2 
bump version
@AlexanderNeumann
Merge pull request #14 from rwth-acis/master
25008ed 
Merge WS change
@AlexanderNeumann
Merge pull request #16 from rwth-acis/refactor
229d754 
Refactor functions
@AlexanderNeumann
Merge pull request #18 from rwth-acis/refactor
bfd6c48 
Fix token
@AlexanderNeumann
fix method not found
a0ff65e
@AlexanderNeumann
Merge pull request #19 from rwth-acis/refactor
48815c5 
fix method not found
@AlexanderNeumann
missing toString()
7a23bff
@AlexanderNeumann
Merge pull request #20 from rwth-acis/refactor
105cf00 
missing toString()
@AlexanderNeumann
update gitignore
32adc98
@AlexanderNeumann
Start refactoring again
528a317
@AlexanderNeumann
Merge pull request #21 from rwth-acis/refactor
6de0ec2 
Refactor
@AlexanderNeumann
create start files if not existing
2090563
@AlexanderNeumann
Delete i5.las2peer.services.tmitocar-1.0.0.jar
2c664d4
@AlexanderNeumann
Merge pull request #22 from rwth-acis/refactor
0652acf 
Refactor
@AlexanderNeumann
Still trying to fix the no such file or directory error.
eded8de
@AlexanderNeumann
Merge pull request #23 from rwth-acis/refactor
dd3f4a7 
Still trying to fix the no such file or directory error.
@AlexanderNeumann
generated docs
be001f1
@AlexanderNeumann
further documentation
047387b
@AlexanderNeumann
fix svg not found
14b5f6a
@AlexanderNeumann
Merge pull request #24 from rwth-acis/refactor
0ef43fb 
Refactor
@AlexanderNeumann
fix file name for comparison
f5865f7
@AlexanderNeumann
Merge pull request #25 from rwth-acis/refactor
946418d 
fix file name for comparison
@AlexanderNeumann
Refactor methods
480c3be
@AlexanderNeumann
Merge pull request #26 from rwth-acis/refactor
542dbc1 
Refactor methods
@AlexanderNeumann
Update Dockerfile
ce399ed
@AlexanderNeumann
Merge pull request #27 from rwth-acis/refactor
251077c 
Update Dockerfile
@AlexanderNeumann
Fix path issue
6f5efa6
@AlexanderNeumann
Merge pull request #28 from rwth-acis/refactor
37780b3 
Fix path issue
@AlexanderNeumann
Fix paths
ea75e30
@AlexanderNeumann
Merge pull request #29 from rwth-acis/refactor
22ea7b8 
Fix paths
Yinnii and others added 27 commits March 27, 2024 10:56
@Yinnii
Merge pull request #39 from rwth-acis/xapi
0504926 
change xAPI Definitions and rename variables
@Yinnii
test llm-generated feedback
d07feb2
@Yinnii
fix errors
979c6be
@Yinnii
add UriBuilder
3a278a4
@Yinnii
add llm-feedback function
93ef829
@Yinnii
fix storefile
b218b15
@Yinnii
update Path and API operation
07b367c
@Yinnii
change md path
0171005
@Yinnii
change feedback md name
1c53ad4
@Yinnii
delete md file after converting to pdf
7a440aa
@Yinnii
get keywords from json
7f9b68d
@Yinnii
remove some logs
e980114
@Yinnii
add log for nexText
76994f1
@Yinnii
add textcontent if usertext exists
7e0ca16
@Yinnii
fix string
4069f00
@Yinnii
get cleaned text
7d7203e
@Yinnii
set correct path
1ac4d39
@Yinnii
check pdf, set correct path
11d527f
@Yinnii
add and remove some logs
d237e34
@Yinnii
check if file exists instead of type
7eda888
@Yinnii
rename file after send to service
afdad16
@Yinnii
preserve markdown
2d550de
@Yinnii
remove Posttest
eacfb51
@Yinnii
Revert "remove Posttest"
66f3cfc 
This reverts commit eacfb51.
@Yinnii
replace \n with \n\n in llm feedback response
c695b3f
@Yinnii
update las2peer package
8d5387f
@Yinnii
add basiscourseid to llm-feedback
0d66aad
@Yinnii Yinnii requested a review from AlexanderNeumann May 23, 2024 10:19
AlexanderNeumann
AlexanderNeumann approved these changes May 23, 2024
View reviewed changes
Copy link
Member

@AlexanderNeumann AlexanderNeumann left a comment

Choose a reason for hiding this comment

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

Looks good, also thank you for cleaning up the files

@Yinnii Yinnii merged commit b7574ee into master May 23, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AlexanderNeumann AlexanderNeumann AlexanderNeumann approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Yinnii @AlexanderNeumann @Aran30 @Tobasco99