Skip to content

Commit

Permalink
Merge branch 'main' into 25-homework-teacher-feature-homework-in-cale…
Browse files Browse the repository at this point in the history
…ndar
  • Loading branch information
Dk1080 authored Nov 6, 2024
2 parents cabc285 + 2824530 commit 7b709d6
Show file tree
Hide file tree
Showing 62 changed files with 11,724 additions and 426 deletions.
Binary file modified .DS_Store
Binary file not shown.
11 changes: 9 additions & 2 deletions .github/workflows/codesniffer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: Codesniffer for Moodle Homework Plugin
on:
push:
branches: [ "main" ]
pull_request:
types: [opened, reopened, synchronize]

jobs:
homework-plugin-codesniffer:
Expand Down Expand Up @@ -32,5 +34,10 @@ jobs:
EOT
# Run PHP_CodeSniffer
- name: Run Code Sniffer
run: phpcs server/moodle/mod/homework/
- name: Run Code Sniffer on mod_homework
if: always()
run: phpcs --runtime-set ignore_warnings_on_exit 1 server/moodle/mod/homework/

- name: Run Code Sniffer on block_homework
if: always()
run: phpcs --runtime-set ignore_warnings_on_exit 1 server/moodle/blocks/homework/
13 changes: 10 additions & 3 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: PHPUnit Tests for Moodle Homework Plugin
on:
push:
branches: [ "main" ]
pull_request:
types: [opened, reopened, synchronize]

jobs:
homework-plugin-test:
Expand Down Expand Up @@ -270,11 +272,16 @@ jobs:
php admin/tool/phpunit/cli/init.php
- name: Run tests
- name: Run tests on mod_homework
if: always()
run: |
pwd
cd server/moodle
vendor/bin/phpunit --testsuite mod_homework_testsuite
- name: Run tests on block_homework
if: always()
run: |
pwd
cd server/moodle
vendor/bin/phpunit --testsuite block_homework_testsuite
229 changes: 81 additions & 148 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,152 +1,85 @@

# Apache Logs
server/apache/logs/access.log
server/apache/logs/error.log

# Installer System Files
server/install/install.sys
server/mysql/data/aria_log.00000001
server/mysql/data/aria_log_control
server/mysql/data/ib_buffer_pool
server/mysql/data/ib_logfile0
server/mysql/data/ibdata1
server/mysql/data/mysql_error.log
/server/xampp_stop.exe
/server/mysql_stop.bat
/server/mysql/
/server/readme_en.txt
/server/setup_xampp.bat
/server/apache_stop.bat
/server/apache_start.bat
/server/php/

# MySQL/MariaDB Data and Logs
server/mysql/*

#Other DB
server/performance_schema
server/sys
server/mysql
server/multi-master.info

# Adminer tool
adminer.php

# Logs and sensitive data
logs/
*.log
*.sys
*.pid

# Moodle specific ignores
/config.php
/tags
/TAGS
/cscope.*
/.patches/
/.idea/
.phpstorm.*
!/.phpstorm.meta.php/
/.phpstorm.meta.php/*
!/.phpstorm.meta.php/di.php
/nbproject/
CVS
.DS_Store
/.settings/
/.project
/.buildpath
/.cache
.phpunit.result.cache
phpunit.xml

# Composer support
composer.phar
/vendor/
/behat.yml

# YUI coverage files
*/yui/build/*/*-coverage.js
/lib/yuilib/*/build/*/*-coverage.js
/lib/yuilib/*/*/*-coverage.js

# Other
atlassian-ide-plugin.xml
/node_modules/
/.vscode/
moodle-plugin-ci.phar
.eslintignore
.stylelintignore
/jsdoc
/admin/tool/componentlibrary/docs
/admin/tool/componentlibrary/hugo/site/data/my-index.json
.hugo_build.lock
phpcs.xml
jsconfig.json
UPGRADING-CURRENT.md
.idea
.idea/*

# Swap files (vim)
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p]

# Temporary files including undo
*~
/server/moodledata/
/server/mysql_start.bat
/server/tmp/
/server/xampp-control.ini
/server/readme_de.txt
/server/sendmail/
/server/xampp_start.exe
/server/xampp-control.exe
/server/locale/
/server/licenses/
/server/install/
/server/cgi-bin/
/server/apache/
/server/moodle/.grunt/
/server/moodle/calendar/
/server/moodle/grade/
/server/moodle/enrol/
/server/moodle/auth/
/server/moodle/course/
/server/moodle/.upgradenotes/
/server/moodle/competency/
/server/moodle/cache/
/server/moodle/contentbank/
/server/moodle/badges/
/server/moodle/.phpstorm.meta.php/
/server/moodle/completion/
/server/moodle/dataformat/
/server/moodle/comment/
/server/moodle/files/
/server/moodle/backup/
/server/moodle/analytics/
/server/moodle/availability/
/server/moodle/cohort/
/server/moodle/error/
/server/moodle/customfield/
/server/moodle/filter/
/server/moodle/admin/
/server/moodle/blog/
/server/moodle/favourites/
/server/moodle/communication/
/server/moodle/media/
/server/moodle/local/
/server/moodle/group/
/server/moodle/login/
/server/moodle/install/
/server/moodle/lib/
/server/moodle/mnet/
/server/moodle/lang/
/server/moodle/message/
/server/moodle/h5p/
/server/moodle/iplookup/
/server/moodle/notes/
/server/moodle/.shifter.json
/server/moodle/draftfile.php
/server/moodle/editmode.php
/server/moodle/.gitignore
/server/moodle/index.php
/server/moodle/security.txt
/server/moodle/help.php
/server/moodle/behat.yml.dist
/server/moodle/README.md
/server/moodle/.stylelintrc
/server/moodle/search/
/server/moodle/moodlenet/
/server/moodle/tag/
/server/moodle/.gherkin-lintrc
/server/moodle/Gruntfile.js
/server/moodle/config-dist.php
/server/moodle/INSTALL.txt
/server/moodle/CONTRIBUTING.md
/server/moodle/composer.json
/server/moodle/COPYING.txt
/server/moodle/phpcs.xml.dist
/server/moodle/package.json
/server/moodle/file.php
/server/moodle/payment/
/server/moodle/brokenfile.php
/server/moodle/TRADEMARK.txt
/server/moodle/r.php
/server/moodle/webservice/
/server/moodle/.eslintrc
/server/moodle/user/
/server/moodle/rss/
/server/moodle/plagiarism/
/server/moodle/userpix/
/server/moodle/pluginfile.php
/server/moodle/tokenpluginfile.php
/server/moodle/.nvmrc
/server/moodle/reportbuilder/
/server/moodle/npm-shrinkwrap.json
/server/moodle/repository/
/server/moodle/report/
/server/moodle/version.php
/server/moodle/portfolio/
/server/moodle/theme/
/server/moodle/githash.php
/server/moodle/rating/
/server/moodle/question/
/server/moodle/UPGRADING.md
/server/moodle/privacy/
/server/moodle/install.php
/server/moodle/config.php
/server/moodle/phpunit.xml.dist
/server/moodle/help_ajax.php
/server/moodle/composer.lock
/server/moodle/pix/
/server/moodle/.jshintrc
/server/moodle/my/
/server/moodle/.jshintignore
/server/moodle/mod/bigbluebuttonbn/
/server/moodle/mod/lti/
/server/moodle/mod/index.html
/server/moodle/mod/chat/
/server/moodle/mod/data/
/server/moodle/mod/imscp/
/server/moodle/mod/book/
/server/moodle/mod/label/
/server/moodle/mod/resource/
/server/moodle/mod/quiz/
/server/moodle/mod/scorm/
/server/moodle/mod/choice/
/server/moodle/mod/forum/
/server/moodle/mod/h5pactivity/
/server/moodle/mod/folder/
/server/moodle/mod/survey/
/server/moodle/mod/feedback/
/server/moodle/mod/url/
/server/moodle/mod/wiki/
/server/moodle/mod/subsection/
/server/moodle/mod/page/
/server/moodle/mod/glossary/
/server/moodle/mod/workshop/
/server/moodle/mod/lesson/
/server/moodle/mod/assign/
/server/moodledata/*
custom_php.ini
9 changes: 7 additions & 2 deletions .idea/moodle-2.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7b709d6

Please sign in to comment.