Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
weblate committed Jul 8, 2023
2 parents 1c3398c + 0ac02bf commit 24f3725
Show file tree
Hide file tree
Showing 113 changed files with 36,008 additions and 15,823 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ dashboard/public/js/bootstrap.min.js
dashboard/public/js/Chart.min.js
dashboard/public/js/jquery-3.1.0.min.js
dashboard/public/js/jquery-ui-1-11-4.js
dashboard/public/js/jquery.datetimepicker.full.js
dashboard/public/js/jquery.ui.sortable-animation.js
dashboard/public/js/jquery.multi-select.js
dashboard/public/js/jquery.searchable.js
Expand All @@ -16,6 +17,7 @@ dashboard/public/js/pace.min.js
dashboard/public/js/qrcodegen.js
dashboard/public/js/FileSaver.js
dashboard/public/js/select2.min.js
api/controller/utils/qrCodeUtil.js

docs/

Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/testingWorkflow.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: CI
on:
push:
branches: [dev,master]
pull_request:
branches: [dev,master]
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [15.x]
mongodb-version: [6.0]
steps:
- name: Checking Repository
uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- name: Start MongoDB
uses: supercharge/[email protected]
with:
mongodb-version: ${{ matrix.mongodb-version }}
mongodb-port: 27017
- name: Cloning Sugarizer Repository
run: git clone https://github.com/llaske/sugarizer.git ../sugarizer
- name: Running Clean Install
run: npm ci
- name: Running Eslint
run: npm run lint
- name: Unit Testing
run: npm run test
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ build/

*.csv
tmp/

.nyc_output/
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,36 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]
### Added
- Add an export button to assignment deliveries #366

## [1.5.0] - 2023-02-15
### Added
- Assignments feature: API and Dashboard
- Code coverage

### Changed
- MongoDB minimal version is now 3.2+
- Updated to MongoDB 5.0 in docker image
- Store activities list in database

### Fixed
- Padding from left in language selection menu list #294
- Fix required in sidebar to achieve consistency #348


## [1.4.0] - 2021-11-21
### Added
- Two factor authentication
- Expose presence and server on the same port #232
- Add privacy settings

### Changed
- node.js minimal version is now 10+

### Fixed
- Unit tests are broken for activities #273
- Warning: Accessing non-existent property with node.js #272
- Error retrieving content when stored in UTF-16 #286


## [1.3.0] - 2020-10-11
Expand Down
Loading

0 comments on commit 24f3725

Please sign in to comment.